diff --git a/Better-Leaves-Lite-1.0.zip b/Better-Leaves-Lite-1.0.zip index d560fe7..a097963 100644 Binary files a/Better-Leaves-Lite-1.0.zip and b/Better-Leaves-Lite-1.0.zip differ diff --git a/assets/betterend/models/item/dragon_tree_leaves.json b/assets/betterend/models/item/dragon_tree_leaves.json new file mode 100644 index 0000000..7ea5a77 --- /dev/null +++ b/assets/betterend/models/item/dragon_tree_leaves.json @@ -0,0 +1,6 @@ +{ + "parent": "betterleaves:block/leaves", + "textures": { + "all": "betterend:block/dragon_tree_leaves" + } +} \ No newline at end of file diff --git a/assets/betterend/models/item/lacugrove_leaves.json b/assets/betterend/models/item/lacugrove_leaves.json new file mode 100644 index 0000000..083cd84 --- /dev/null +++ b/assets/betterend/models/item/lacugrove_leaves.json @@ -0,0 +1,6 @@ +{ + "parent": "betterleaves:block/leaves", + "textures": { + "all": "betterend:block/lacugrove_leaves" + } +} \ No newline at end of file diff --git a/assets/betterend/models/item/pythadendron_leaves.json b/assets/betterend/models/item/pythadendron_leaves.json new file mode 100644 index 0000000..5fb3064 --- /dev/null +++ b/assets/betterend/models/item/pythadendron_leaves.json @@ -0,0 +1,6 @@ +{ + "parent": "betterleaves:block/leaves", + "textures": { + "all": "betterend:block/pythadendron_leaves" + } +} \ No newline at end of file diff --git a/assets/betterend/models/item/shadow_berry_leaves.json b/assets/betterend/models/item/shadow_berry_leaves.json new file mode 100644 index 0000000..24d3d43 --- /dev/null +++ b/assets/betterend/models/item/shadow_berry_leaves.json @@ -0,0 +1,6 @@ +{ + "parent": "betterleaves:block/leaves", + "textures": { + "all": "betterend:block/shadow_berry_leaves" + } +} \ No newline at end of file diff --git a/assets/betterend/models/item/tenanea_leaves.json b/assets/betterend/models/item/tenanea_leaves.json new file mode 100644 index 0000000..56ff4ee --- /dev/null +++ b/assets/betterend/models/item/tenanea_leaves.json @@ -0,0 +1,6 @@ +{ + "parent": "betterleaves:block/leaves", + "textures": { + "all": "betterend:block/tenanea_leaves" + } +} \ No newline at end of file diff --git a/assets/betternether/models/item/ink_bush_leaves.json b/assets/betternether/models/item/ink_bush_leaves.json new file mode 100644 index 0000000..372751f --- /dev/null +++ b/assets/betternether/models/item/ink_bush_leaves.json @@ -0,0 +1,6 @@ +{ + "parent": "betterleaves:block/leaves", + "textures": { + "all": "betternether:block/ink_bush_leaves" + } +} \ No newline at end of file diff --git a/assets/betternether/models/item/rubeus_leaves.json b/assets/betternether/models/item/rubeus_leaves.json new file mode 100644 index 0000000..8947132 --- /dev/null +++ b/assets/betternether/models/item/rubeus_leaves.json @@ -0,0 +1,6 @@ +{ + "parent": "betterleaves:block/leaves", + "textures": { + "all": "betternether:block/rubeus_leaves" + } +} \ No newline at end of file diff --git a/gen_pack.py b/gen_pack.py index 1c5ce52..efd423f 100644 --- a/gen_pack.py +++ b/gen_pack.py @@ -25,6 +25,7 @@ class LeafBlock: base_model = "leaves" has_carpet = False has_no_tint = False + should_generate_item_model = False use_legacy_model = False texture_prefix = "" overlay_texture_id = "" @@ -52,6 +53,7 @@ def autoGen(jsonData, args): block_id_overrides = jsonData["blockIds"] leaves_with_carpet = jsonData["leavesWithCarpet"] dynamictrees_namespaces = jsonData["dynamicTreesNamespaces"] + generate_itemmodels_overrides = jsonData["generateItemModels"] print("Generating assets...") if (os.path.exists("./assets")): shutil.rmtree("./assets") copy_tree("./base/assets/", "./assets/") @@ -124,6 +126,11 @@ def autoGen(jsonData, args): if (leaf.namespace) in dynamictrees_namespaces: leaf.dynamictrees_namespace = dynamictrees_namespaces[leaf.namespace] + # Check if the block should generate an item model + if leaf.getId() in generate_itemmodels_overrides: + leaf.should_generate_item_model = True + printOverride("Also generating item model") + # Generate blockstates & models generateBlockstate(leaf) generateBlockModels(leaf) @@ -310,7 +317,7 @@ def generateItemModel(leaf, override_block_texture=False): with open(block_item_model_file, "w") as f: json.dump(item_model_data, f, indent=4) - if override_block_texture: + if leaf.should_generate_item_model: # Create models folder if it doesn't exist already os.makedirs("assets/{}/models/item/".format(mod_namespace), exist_ok=True) item_model_file = f"assets/{mod_namespace}/models/item/{block_name}.json" diff --git a/input/overrides.json b/input/overrides.json index 6bbc948..41b58fc 100644 --- a/input/overrides.json +++ b/input/overrides.json @@ -30,5 +30,15 @@ "biomesoplenty": "dtbop", "aether": "dtaether", "natures_spirit": "dtnatures_spirit" - } + }, + "generateItemModels": [ + "biomesoplenty:rainbow_birch_leaves", + "betternether:rubeus_leaves", + "betternether:ink_bush_leaves", + "betterend:tenanea_leaves", + "betterend:lacugrove_leaves", + "betterend:dragon_tree_leaves", + "betterend:pythadendron_leaves", + "betterend:shadow_berry_leaves" + ] } \ No newline at end of file