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

Code cleanup

Browse Source
This commit is contained in:
Martin Prokoph
2024-12-24 18:01:46 +01:00
parent b0a167a837
commit 5e7137ff6f
2 changed files with 8 additions and 6 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.

14
gen_pack.py
View File

@@ -25,6 +25,7 @@ class LeafBlock:
base_model = "leaves" base_model = "leaves"
has_carpet = False has_carpet = False
has_no_tint = False has_no_tint = False
has_texture_override = False
should_generate_item_model = False should_generate_item_model = False
use_legacy_model = False use_legacy_model = False
texture_prefix = "" texture_prefix = ""
@@ -102,8 +103,8 @@ def autoGen(jsonData, args):
printOverride("ID Override: "+leaf.getId()) printOverride("ID Override: "+leaf.getId())
# Set texture id and apply overrides # Set texture id and apply overrides
has_texture_override = (leaf.getId()) in block_texture_overrides leaf.has_texture_override = leaf.getId() in block_texture_overrides
if has_texture_override: if leaf.has_texture_override:
leaf.texture_id_override = block_texture_overrides[leaf.getId()] leaf.texture_id_override = block_texture_overrides[leaf.getId()]
printOverride("Texture Override: "+leaf.getTextureId()) printOverride("Texture Override: "+leaf.getTextureId())
@@ -134,7 +135,7 @@ def autoGen(jsonData, args):
# Generate blockstates & models # Generate blockstates & models
generateBlockstate(leaf) generateBlockstate(leaf)
generateBlockModels(leaf) generateBlockModels(leaf)
generateItemModel(leaf, has_texture_override) generateItemModel(leaf)
# Certain mods contain leaf carpets. # Certain mods contain leaf carpets.
# Because we change the leaf texture, we need to fix the carpet models. # Because we change the leaf texture, we need to fix the carpet models.
@@ -287,7 +288,7 @@ def generateBlockModels(leaf):
with open(block_model_file, "w") as f: with open(block_model_file, "w") as f:
json.dump(block_model_data, f, indent=4) json.dump(block_model_data, f, indent=4)
def generateItemModel(leaf, override_block_texture=False): def generateItemModel(leaf):
mod_namespace = leaf.getId().split(":")[0] mod_namespace = leaf.getId().split(":")[0]
block_name = leaf.getId().split(":")[1] block_name = leaf.getId().split(":")[1]
@@ -296,14 +297,14 @@ def generateItemModel(leaf, override_block_texture=False):
block_item_model_file = f"assets/{mod_namespace}/models/block/{block_name}.json" block_item_model_file = f"assets/{mod_namespace}/models/block/{block_name}.json"
if override_block_texture: # Used for items that have a different texture than the block model if leaf.has_texture_override: # Used for items that have a different texture than the block model
item_model_data = { item_model_data = {
"parent": f"betterleaves:block/{leaf.base_model}", "parent": f"betterleaves:block/{leaf.base_model}",
"textures": { "textures": {
"all": f"{mod_namespace}:block/{block_name}" "all": f"{mod_namespace}:block/{block_name}"
} }
} }
else: # By default, the regular block model is used else: # By default, the regular block texture is used
item_model_data = { item_model_data = {
"parent": f"betterleaves:block/{leaf.base_model}", "parent": f"betterleaves:block/{leaf.base_model}",
"textures": { "textures": {
@@ -320,6 +321,7 @@ def generateItemModel(leaf, override_block_texture=False):
if leaf.should_generate_item_model: if leaf.should_generate_item_model:
# Create models folder if it doesn't exist already # Create models folder if it doesn't exist already
os.makedirs("assets/{}/models/item/".format(mod_namespace), exist_ok=True) os.makedirs("assets/{}/models/item/".format(mod_namespace), exist_ok=True)
item_model_file = f"assets/{mod_namespace}/models/item/{block_name}.json" item_model_file = f"assets/{mod_namespace}/models/item/{block_name}.json"
with open(item_model_file, "w") as f: with open(item_model_file, "w") as f:
json.dump(item_model_data, f, indent=4) json.dump(item_model_data, f, indent=4)