From 78eeb659b0580880fd0de77d12809af35f63f6fb Mon Sep 17 00:00:00 2001 From: SHsuperCM Date: Sat, 18 Sep 2021 18:03:51 +0300 Subject: Fixed texture property being ignored when relative assumed model exists Fixes #30 --- .../shsupercm/fabric/citresewn/pack/cits/CITItem.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'src/main/java/shcm/shsupercm/fabric/citresewn') diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/pack/cits/CITItem.java b/src/main/java/shcm/shsupercm/fabric/citresewn/pack/cits/CITItem.java index 650d2d9..c99ba12 100644 --- a/src/main/java/shcm/shsupercm/fabric/citresewn/pack/cits/CITItem.java +++ b/src/main/java/shcm/shsupercm/fabric/citresewn/pack/cits/CITItem.java @@ -52,14 +52,24 @@ public class CITItem extends CIT { if (this.items.size() == 0) throw new Exception("CIT must target at least one item type"); + Identifier assetIdentifier; + boolean containsTexture = false; String modelProp = properties.getProperty("model"); - Identifier assetIdentifier = resolvePath(identifier, modelProp, ".json", id -> pack.resourcePack.contains(ResourceType.CLIENT_RESOURCES, id)); - if (assetIdentifier != null) - assetIdentifiers.put(null, assetIdentifier); - else if (modelProp != null && !modelProp.startsWith("models")) { + if (modelProp == null) + for (Object o : properties.keySet()) + if (o instanceof String property && (property.startsWith("texture") || property.startsWith("tile"))) { + containsTexture = true; + break; + } + if (!containsTexture) { assetIdentifier = resolvePath(identifier, modelProp, ".json", id -> pack.resourcePack.contains(ResourceType.CLIENT_RESOURCES, id)); if (assetIdentifier != null) assetIdentifiers.put(null, assetIdentifier); + else if (modelProp != null) { + assetIdentifier = resolvePath(identifier, modelProp, ".json", id -> pack.resourcePack.contains(ResourceType.CLIENT_RESOURCES, id)); + if (assetIdentifier != null) + assetIdentifiers.put(null, assetIdentifier); + } } for (Object o : properties.keySet()) -- cgit