Motschen/BetterLeavesLite
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/BetterLeavesLite.git synced 2025-12-14 19:55:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

DynamicTrees compat!

Browse Source
This commit is contained in:
Martin Prokoph
2024-12-05 20:25:26 +01:00
parent f3d4bb69fc
commit cdf136dfb7
14 changed files with 747 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Better-Leaves-Lite-1.0.zip
View File

Binary file not shown.

66
assets/dynamictrees/blockstates/acacia_leaves.json Normal file
View File

@@ -0,0 +1,66 @@
{
"variants": {
"": [
{
"model": "minecraft:block/acacia_leaves1"
},
{
"model": "minecraft:block/acacia_leaves1",
"y": 90
},
{
"model": "minecraft:block/acacia_leaves1",
"y": 180
},
{
"model": "minecraft:block/acacia_leaves1",
"y": 270
},
{
"model": "minecraft:block/acacia_leaves2"
},
{
"model": "minecraft:block/acacia_leaves2",
"y": 90
},
{
"model": "minecraft:block/acacia_leaves2",
"y": 180
},
{
"model": "minecraft:block/acacia_leaves2",
"y": 270
},
{
"model": "minecraft:block/acacia_leaves3"
},
{
"model": "minecraft:block/acacia_leaves3",
"y": 90
},
{
"model": "minecraft:block/acacia_leaves3",
"y": 180
},
{
"model": "minecraft:block/acacia_leaves3",
"y": 270
},
{
"model": "minecraft:block/acacia_leaves4"
},
{
"model": "minecraft:block/acacia_leaves4",
"y": 90
},
{
"model": "minecraft:block/acacia_leaves4",
"y": 180
},
{
"model": "minecraft:block/acacia_leaves4",
"y": 270
}
]
}
}

66
assets/dynamictrees/blockstates/azalea_leaves.json Normal file
View File

@@ -0,0 +1,66 @@
{
"variants": {
"": [
{
"model": "minecraft:block/azalea_leaves1"
},
{
"model": "minecraft:block/azalea_leaves1",
"y": 90
},
{
"model": "minecraft:block/azalea_leaves1",
"y": 180
},
{
"model": "minecraft:block/azalea_leaves1",
"y": 270
},
{
"model": "minecraft:block/azalea_leaves2"
},
{
"model": "minecraft:block/azalea_leaves2",
"y": 90
},
{
"model": "minecraft:block/azalea_leaves2",
"y": 180
},
{
"model": "minecraft:block/azalea_leaves2",
"y": 270
},
{
"model": "minecraft:block/azalea_leaves3"
},
{
"model": "minecraft:block/azalea_leaves3",
"y": 90
},
{
"model": "minecraft:block/azalea_leaves3",
"y": 180
},
{
"model": "minecraft:block/azalea_leaves3",
"y": 270
},
{
"model": "minecraft:block/azalea_leaves4"
},
{
"model": "minecraft:block/azalea_leaves4",
"y": 90
},
{
"model": "minecraft:block/azalea_leaves4",
"y": 180
},
{
"model": "minecraft:block/azalea_leaves4",
"y": 270
}
]
}
}

66
assets/dynamictrees/blockstates/birch_leaves.json Normal file
View File

@@ -0,0 +1,66 @@
{
"variants": {
"": [
{
"model": "minecraft:block/birch_leaves1"
},
{
"model": "minecraft:block/birch_leaves1",
"y": 90
},
{
"model": "minecraft:block/birch_leaves1",
"y": 180
},
{
"model": "minecraft:block/birch_leaves1",
"y": 270
},
{
"model": "minecraft:block/birch_leaves2"
},
{
"model": "minecraft:block/birch_leaves2",
"y": 90
},
{
"model": "minecraft:block/birch_leaves2",
"y": 180
},
{
"model": "minecraft:block/birch_leaves2",
"y": 270
},
{
"model": "minecraft:block/birch_leaves3"
},
{
"model": "minecraft:block/birch_leaves3",
"y": 90
},
{
"model": "minecraft:block/birch_leaves3",
"y": 180
},
{
"model": "minecraft:block/birch_leaves3",
"y": 270
},
{
"model": "minecraft:block/birch_leaves4"
},
{
"model": "minecraft:block/birch_leaves4",
"y": 90
},
{
"model": "minecraft:block/birch_leaves4",
"y": 180
},
{
"model": "minecraft:block/birch_leaves4",
"y": 270
}
]
}
}

66
assets/dynamictrees/blockstates/cherry_leaves.json Normal file
View File

@@ -0,0 +1,66 @@
{
"variants": {
"": [
{
"model": "minecraft:block/cherry_leaves1"
},
{
"model": "minecraft:block/cherry_leaves1",
"y": 90
},
{
"model": "minecraft:block/cherry_leaves1",
"y": 180
},
{
"model": "minecraft:block/cherry_leaves1",
"y": 270
},
{
"model": "minecraft:block/cherry_leaves2"
},
{
"model": "minecraft:block/cherry_leaves2",
"y": 90
},
{
"model": "minecraft:block/cherry_leaves2",
"y": 180
},
{
"model": "minecraft:block/cherry_leaves2",
"y": 270
},
{
"model": "minecraft:block/cherry_leaves3"
},
{
"model": "minecraft:block/cherry_leaves3",
"y": 90
},
{
"model": "minecraft:block/cherry_leaves3",
"y": 180
},
{
"model": "minecraft:block/cherry_leaves3",
"y": 270
},
{
"model": "minecraft:block/cherry_leaves4"
},
{
"model": "minecraft:block/cherry_leaves4",
"y": 90
},
{
"model": "minecraft:block/cherry_leaves4",
"y": 180
},
{
"model": "minecraft:block/cherry_leaves4",
"y": 270
}
]
}
}

66
assets/dynamictrees/blockstates/dark_oak_leaves.json Normal file
View File

@@ -0,0 +1,66 @@
{
"variants": {
"": [
{
"model": "minecraft:block/dark_oak_leaves1"
},
{
"model": "minecraft:block/dark_oak_leaves1",
"y": 90
},
{
"model": "minecraft:block/dark_oak_leaves1",
"y": 180
},
{
"model": "minecraft:block/dark_oak_leaves1",
"y": 270
},
{
"model": "minecraft:block/dark_oak_leaves2"
},
{
"model": "minecraft:block/dark_oak_leaves2",
"y": 90
},
{
"model": "minecraft:block/dark_oak_leaves2",
"y": 180
},
{
"model": "minecraft:block/dark_oak_leaves2",
"y": 270
},
{
"model": "minecraft:block/dark_oak_leaves3"
},
{
"model": "minecraft:block/dark_oak_leaves3",
"y": 90
},
{
"model": "minecraft:block/dark_oak_leaves3",
"y": 180
},
{
"model": "minecraft:block/dark_oak_leaves3",
"y": 270
},
{
"model": "minecraft:block/dark_oak_leaves4"
},
{
"model": "minecraft:block/dark_oak_leaves4",
"y": 90
},
{
"model": "minecraft:block/dark_oak_leaves4",
"y": 180
},
{
"model": "minecraft:block/dark_oak_leaves4",
"y": 270
}
]
}
}

66
assets/dynamictrees/blockstates/flowering_azalea_leaves.json Normal file
View File

@@ -0,0 +1,66 @@
{
"variants": {
"": [
{
"model": "minecraft:block/flowering_azalea_leaves1"
},
{
"model": "minecraft:block/flowering_azalea_leaves1",
"y": 90
},
{
"model": "minecraft:block/flowering_azalea_leaves1",
"y": 180
},
{
"model": "minecraft:block/flowering_azalea_leaves1",
"y": 270
},
{
"model": "minecraft:block/flowering_azalea_leaves2"
},
{
"model": "minecraft:block/flowering_azalea_leaves2",
"y": 90
},
{
"model": "minecraft:block/flowering_azalea_leaves2",
"y": 180
},
{
"model": "minecraft:block/flowering_azalea_leaves2",
"y": 270
},
{
"model": "minecraft:block/flowering_azalea_leaves3"
},
{
"model": "minecraft:block/flowering_azalea_leaves3",
"y": 90
},
{
"model": "minecraft:block/flowering_azalea_leaves3",
"y": 180
},
{
"model": "minecraft:block/flowering_azalea_leaves3",
"y": 270
},
{
"model": "minecraft:block/flowering_azalea_leaves4"
},
{
"model": "minecraft:block/flowering_azalea_leaves4",
"y": 90
},
{
"model": "minecraft:block/flowering_azalea_leaves4",
"y": 180
},
{
"model": "minecraft:block/flowering_azalea_leaves4",
"y": 270
}
]
}
}

66
assets/dynamictrees/blockstates/jungle_leaves.json Normal file
View File

@@ -0,0 +1,66 @@
{
"variants": {
"": [
{
"model": "minecraft:block/jungle_leaves1"
},
{
"model": "minecraft:block/jungle_leaves1",
"y": 90
},
{
"model": "minecraft:block/jungle_leaves1",
"y": 180
},
{
"model": "minecraft:block/jungle_leaves1",
"y": 270
},
{
"model": "minecraft:block/jungle_leaves2"
},
{
"model": "minecraft:block/jungle_leaves2",
"y": 90
},
{
"model": "minecraft:block/jungle_leaves2",
"y": 180
},
{
"model": "minecraft:block/jungle_leaves2",
"y": 270
},
{
"model": "minecraft:block/jungle_leaves3"
},
{
"model": "minecraft:block/jungle_leaves3",
"y": 90
},
{
"model": "minecraft:block/jungle_leaves3",
"y": 180
},
{
"model": "minecraft:block/jungle_leaves3",
"y": 270
},
{
"model": "minecraft:block/jungle_leaves4"
},
{
"model": "minecraft:block/jungle_leaves4",
"y": 90
},
{
"model": "minecraft:block/jungle_leaves4",
"y": 180
},
{
"model": "minecraft:block/jungle_leaves4",
"y": 270
}
]
}
}

66
assets/dynamictrees/blockstates/mangrove_leaves.json Normal file
View File

@@ -0,0 +1,66 @@
{
"variants": {
"": [
{
"model": "minecraft:block/mangrove_leaves1"
},
{
"model": "minecraft:block/mangrove_leaves1",
"y": 90
},
{
"model": "minecraft:block/mangrove_leaves1",
"y": 180
},
{
"model": "minecraft:block/mangrove_leaves1",
"y": 270
},
{
"model": "minecraft:block/mangrove_leaves2"
},
{
"model": "minecraft:block/mangrove_leaves2",
"y": 90
},
{
"model": "minecraft:block/mangrove_leaves2",
"y": 180
},
{
"model": "minecraft:block/mangrove_leaves2",
"y": 270
},
{
"model": "minecraft:block/mangrove_leaves3"
},
{
"model": "minecraft:block/mangrove_leaves3",
"y": 90
},
{
"model": "minecraft:block/mangrove_leaves3",
"y": 180
},
{
"model": "minecraft:block/mangrove_leaves3",
"y": 270
},
{
"model": "minecraft:block/mangrove_leaves4"
},
{
"model": "minecraft:block/mangrove_leaves4",
"y": 90
},
{
"model": "minecraft:block/mangrove_leaves4",
"y": 180
},
{
"model": "minecraft:block/mangrove_leaves4",
"y": 270
}
]
}
}

66
assets/dynamictrees/blockstates/oak_leaves.json Normal file
View File

@@ -0,0 +1,66 @@
{
"variants": {
"": [
{
"model": "minecraft:block/oak_leaves1"
},
{
"model": "minecraft:block/oak_leaves1",
"y": 90
},
{
"model": "minecraft:block/oak_leaves1",
"y": 180
},
{
"model": "minecraft:block/oak_leaves1",
"y": 270
},
{
"model": "minecraft:block/oak_leaves2"
},
{
"model": "minecraft:block/oak_leaves2",
"y": 90
},
{
"model": "minecraft:block/oak_leaves2",
"y": 180
},
{
"model": "minecraft:block/oak_leaves2",
"y": 270
},
{
"model": "minecraft:block/oak_leaves3"
},
{
"model": "minecraft:block/oak_leaves3",
"y": 90
},
{
"model": "minecraft:block/oak_leaves3",
"y": 180
},
{
"model": "minecraft:block/oak_leaves3",
"y": 270
},
{
"model": "minecraft:block/oak_leaves4"
},
{
"model": "minecraft:block/oak_leaves4",
"y": 90
},
{
"model": "minecraft:block/oak_leaves4",
"y": 180
},
{
"model": "minecraft:block/oak_leaves4",
"y": 270
}
]
}
}

66
assets/dynamictrees/blockstates/pale_oak_leaves.json Normal file
View File

@@ -0,0 +1,66 @@
{
"variants": {
"": [
{
"model": "minecraft:block/pale_oak_leaves1"
},
{
"model": "minecraft:block/pale_oak_leaves1",
"y": 90
},
{
"model": "minecraft:block/pale_oak_leaves1",
"y": 180
},
{
"model": "minecraft:block/pale_oak_leaves1",
"y": 270
},
{
"model": "minecraft:block/pale_oak_leaves2"
},
{
"model": "minecraft:block/pale_oak_leaves2",
"y": 90
},
{
"model": "minecraft:block/pale_oak_leaves2",
"y": 180
},
{
"model": "minecraft:block/pale_oak_leaves2",
"y": 270
},
{
"model": "minecraft:block/pale_oak_leaves3"
},
{
"model": "minecraft:block/pale_oak_leaves3",
"y": 90
},
{
"model": "minecraft:block/pale_oak_leaves3",
"y": 180
},
{
"model": "minecraft:block/pale_oak_leaves3",
"y": 270
},
{
"model": "minecraft:block/pale_oak_leaves4"
},
{
"model": "minecraft:block/pale_oak_leaves4",
"y": 90
},
{
"model": "minecraft:block/pale_oak_leaves4",
"y": 180
},
{
"model": "minecraft:block/pale_oak_leaves4",
"y": 270
}
]
}
}

66
assets/dynamictrees/blockstates/spruce_leaves.json Normal file
View File

@@ -0,0 +1,66 @@
{
"variants": {
"": [
{
"model": "minecraft:block/spruce_leaves1"
},
{
"model": "minecraft:block/spruce_leaves1",
"y": 90
},
{
"model": "minecraft:block/spruce_leaves1",
"y": 180
},
{
"model": "minecraft:block/spruce_leaves1",
"y": 270
},
{
"model": "minecraft:block/spruce_leaves2"
},
{
"model": "minecraft:block/spruce_leaves2",
"y": 90
},
{
"model": "minecraft:block/spruce_leaves2",
"y": 180
},
{
"model": "minecraft:block/spruce_leaves2",
"y": 270
},
{
"model": "minecraft:block/spruce_leaves3"
},
{
"model": "minecraft:block/spruce_leaves3",
"y": 90
},
{
"model": "minecraft:block/spruce_leaves3",
"y": 180
},
{
"model": "minecraft:block/spruce_leaves3",
"y": 270
},
{
"model": "minecraft:block/spruce_leaves4"
},
{
"model": "minecraft:block/spruce_leaves4",
"y": 90
},
{
"model": "minecraft:block/spruce_leaves4",
"y": 180
},
{
"model": "minecraft:block/spruce_leaves4",
"y": 270
}
]
}
}

20
gen-pack.py
View File

@@ -17,6 +17,7 @@ def autoGen(jsonData):
overlay_textures = jsonData["overlayTextures"] overlay_textures = jsonData["overlayTextures"]
block_id_overrides = jsonData["blockIds"] block_id_overrides = jsonData["blockIds"]
leaves_with_carpet = jsonData["leavesWithCarpet"] leaves_with_carpet = jsonData["leavesWithCarpet"]
dynamictrees_namespaces = jsonData["dynamicTreesNamespaces"]
print("Generating assets...") print("Generating assets...")
if (os.path.exists("./assets")): shutil.rmtree("./assets") if (os.path.exists("./assets")): shutil.rmtree("./assets")
copy_tree("./base/assets/", "./assets/") copy_tree("./base/assets/", "./assets/")
@@ -92,8 +93,12 @@ def autoGen(jsonData):
overlay_texture_id = overlay_textures[block_id] overlay_texture_id = overlay_textures[block_id]
print ("-> Has overlay texture: "+overlay_texture_id) print ("-> Has overlay texture: "+overlay_texture_id)
dynamictrees_namespace = None
if (namespace) in dynamictrees_namespaces:
dynamictrees_namespace = dynamictrees_namespaces[namespace]
# Generate blockstates & models # Generate blockstates & models
generateBlockstateAndModel(block_id, base_model, texture_id, overlay_texture_id) generateBlockstateAndModel(block_id, base_model, texture_id, overlay_texture_id, dynamictrees_namespace)
generateItemModel(block_id, has_texture_override) generateItemModel(block_id, has_texture_override)
if (block_id) in leaves_with_carpet: if (block_id) in leaves_with_carpet:
@@ -101,7 +106,7 @@ def autoGen(jsonData):
generateCarpetAssets(carpet_id, hasNoTint, texture_id) generateCarpetAssets(carpet_id, hasNoTint, texture_id)
print (f"-> Also generating leaf carpet: {carpet_id}") print (f"-> Also generating leaf carpet: {carpet_id}")
def generateBlockstateAndModel(block_id, base_model, texture_id, overlay_texture_id): def generateBlockstateAndModel(block_id, base_model, texture_id, overlay_texture_id, dynamictrees_namespace):
mod_namespace = block_id.split(":")[0] mod_namespace = block_id.split(":")[0]
block_name = block_id.split(":")[1] block_name = block_id.split(":")[1]
@@ -123,6 +128,17 @@ def generateBlockstateAndModel(block_id, base_model, texture_id, overlay_texture
# Write blockstate file # Write blockstate file
with open(block_state_file, "w") as f: with open(block_state_file, "w") as f:
json.dump(block_state_data, f, indent=4) json.dump(block_state_data, f, indent=4)
# Do the same for the dynamic trees namespace
if dynamictrees_namespace != None:
dyntrees_block_state_file = f"assets/{dynamictrees_namespace}/blockstates/{block_name}.json"
# Create blockstates folder if it doesn't exist already
if not os.path.exists("assets/{}/blockstates/".format(dynamictrees_namespace)):
os.makedirs("assets/{}/blockstates/".format(dynamictrees_namespace))
# Write blockstate file
with open(dyntrees_block_state_file, "w") as f:
json.dump(block_state_data, f, indent=4)
# Create models folder if it doesn't exist already # Create models folder if it doesn't exist already

3
input/overrides.json
View File

@@ -21,5 +21,8 @@
"blockIds": { "blockIds": {
"terrestria:japanese_maple_leaves_dark": "terrestria:dark_japanese_maple_leaves", "terrestria:japanese_maple_leaves_dark": "terrestria:dark_japanese_maple_leaves",
"terrestria:japanese_maple_leaves_green": "terrestria:japanese_maple_shrub_leaves" "terrestria:japanese_maple_leaves_green": "terrestria:japanese_maple_shrub_leaves"
},
"dynamicTreesNamespaces": {
"minecraft": "dynamictrees"
} }
} }