diff --git a/src/generated/resources/assets/tconstruct/tinkering/generator_part_textures.json b/src/generated/resources/assets/tconstruct/tinkering/generator_part_textures.json index b55dca05d9..ce9499342a 100644 --- a/src/generated/resources/assets/tconstruct/tinkering/generator_part_textures.json +++ b/src/generated/resources/assets/tconstruct/tinkering/generator_part_textures.json @@ -78,34 +78,42 @@ "stat_type": "tconstruct:wood" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/slime/skull_modifiers/tconstruct_embellishment", "stat_type": "tconstruct:slimesuit" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/slime/skull_modifiers/broken/tconstruct_embellishment", "stat_type": "tconstruct:slimesuit" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/slime/wings_modifiers/tconstruct_embellishment", "stat_type": "tconstruct:slimesuit" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/slime/wings_modifiers/broken/tconstruct_embellishment", "stat_type": "tconstruct:slimesuit" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/slime/shell_modifiers/tconstruct_embellishment", "stat_type": "tconstruct:slimesuit" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/slime/shell_modifiers/broken/tconstruct_embellishment", "stat_type": "tconstruct:slimesuit" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/slime/boot_modifiers/tconstruct_embellishment", "stat_type": "tconstruct:slimesuit" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/slime/boot_modifiers/broken/tconstruct_embellishment", "stat_type": "tconstruct:slimesuit" }, @@ -125,66 +133,82 @@ "stat_type": "tconstruct:slimesuit" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/plate/helmet/plating", "stat_type": "tconstruct:plating_helmet" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/plate/helmet/plating_broken", "stat_type": "tconstruct:plating_helmet" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/plate/helmet/maille", "stat_type": "tconstruct:maille" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/plate/helmet/maille_broken", "stat_type": "tconstruct:maille" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/plate/chestplate/plating", "stat_type": "tconstruct:plating_chestplate" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/plate/chestplate/plating_broken", "stat_type": "tconstruct:plating_chestplate" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/plate/chestplate/maille", "stat_type": "tconstruct:maille" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/plate/chestplate/maille_broken", "stat_type": "tconstruct:maille" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/plate/leggings/plating", "stat_type": "tconstruct:plating_leggings" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/plate/leggings/plating_broken", "stat_type": "tconstruct:plating_leggings" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/plate/leggings/maille", "stat_type": "tconstruct:maille" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/plate/leggings/maille_broken", "stat_type": "tconstruct:maille" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/plate/boots/plating", "stat_type": "tconstruct:plating_boots" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/plate/boots/plating_broken", "stat_type": "tconstruct:plating_boots" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/plate/boots/maille", "stat_type": "tconstruct:maille" }, { + "allow_animated": false, "path": "tconstruct:item/tool/armor/plate/boots/maille_broken", "stat_type": "tconstruct:maille" }, diff --git a/src/main/java/slimeknights/tconstruct/tools/data/sprite/TinkerPartSpriteProvider.java b/src/main/java/slimeknights/tconstruct/tools/data/sprite/TinkerPartSpriteProvider.java index 4d6a6b5767..1669d84068 100644 --- a/src/main/java/slimeknights/tconstruct/tools/data/sprite/TinkerPartSpriteProvider.java +++ b/src/main/java/slimeknights/tconstruct/tools/data/sprite/TinkerPartSpriteProvider.java @@ -44,7 +44,7 @@ protected void addAllSpites() { // plate textures addPart("maille", StatlessMaterialStats.MAILLE.getIdentifier()); for (ArmorItem.Type slot : ArmorItem.Type.values()) { - buildTool("armor/plate/" + slot.getName()) + buildTool("armor/plate/" + slot.getName()).disallowAnimated() // the armor model won't be animated, so don't animate the item .addBreakablePart("plating", PlatingMaterialStats.TYPES.get(slot.ordinal()).getId()) .addBreakablePart("maille", StatlessMaterialStats.MAILLE.getIdentifier()); } @@ -68,15 +68,15 @@ protected void addAllSpites() { addSprite("staff/modifiers/tconstruct_embellishment", WOOD); addSprite("staff/large_modifiers/tconstruct_embellishment", WOOD); - // slimesuit textures - addSprite("armor/slime/skull_modifiers/tconstruct_embellishment", SLIMESUIT); - addSprite("armor/slime/skull_modifiers/broken/tconstruct_embellishment", SLIMESUIT); - addSprite("armor/slime/wings_modifiers/tconstruct_embellishment", SLIMESUIT); - addSprite("armor/slime/wings_modifiers/broken/tconstruct_embellishment", SLIMESUIT); - addSprite("armor/slime/shell_modifiers/tconstruct_embellishment", SLIMESUIT); - addSprite("armor/slime/shell_modifiers/broken/tconstruct_embellishment", SLIMESUIT); - addSprite("armor/slime/boot_modifiers/tconstruct_embellishment", SLIMESUIT); - addSprite("armor/slime/boot_modifiers/broken/tconstruct_embellishment", SLIMESUIT); + // slimesuit textures - the armor model won't be animated, so don't animate the item + addSprite("armor/slime/skull_modifiers/tconstruct_embellishment", SLIMESUIT).disallowAnimated(); + addSprite("armor/slime/skull_modifiers/broken/tconstruct_embellishment", SLIMESUIT).disallowAnimated(); + addSprite("armor/slime/wings_modifiers/tconstruct_embellishment", SLIMESUIT).disallowAnimated(); + addSprite("armor/slime/wings_modifiers/broken/tconstruct_embellishment", SLIMESUIT).disallowAnimated(); + addSprite("armor/slime/shell_modifiers/tconstruct_embellishment", SLIMESUIT).disallowAnimated(); + addSprite("armor/slime/shell_modifiers/broken/tconstruct_embellishment", SLIMESUIT).disallowAnimated(); + addSprite("armor/slime/boot_modifiers/tconstruct_embellishment", SLIMESUIT).disallowAnimated(); + addSprite("armor/slime/boot_modifiers/broken/tconstruct_embellishment", SLIMESUIT).disallowAnimated(); addTexture("tinker_armor/slime/armor", SLIMESUIT).disallowAnimated(); addTexture("tinker_armor/slime/leggings", SLIMESUIT).disallowAnimated(); addTexture("tinker_armor/slime/wings", SLIMESUIT).disallowAnimated();