From 19e8e92439a2c01346553c9bf238495b8ee1623b Mon Sep 17 00:00:00 2001 From: Sara Freimer Date: Thu, 6 Jul 2023 14:01:47 -0500 Subject: [PATCH] Add compat recipes, tags, and similar for vanilla 1.20 features --- .../recipes/enriching/dye/large_cyan.json | 12 + .../recipes/enriching/dye/orange.json | 11 +- .../recipes/enriching/dye/small_pink.json | 11 +- .../pigment_extracting/flower/large_cyan.json | 12 + .../pigment_extracting/flower/orange.json | 11 +- .../pigment_extracting/flower/small_pink.json | 11 +- .../reaction/wood_gasification/planks.json | 11 +- .../wood_gasification/wooden_slabs.json | 11 +- .../wood_gasification/wooden_stairs.json | 11 +- .../mekanism/recipes/sawing/bamboo_block.json | 12 + .../mekanism/recipes/sawing/boat/bamboo.json | 12 + .../mekanism/recipes/sawing/boat/cherry.json | 12 + .../recipes/sawing/chest_boat/bamboo.json | 15 + .../recipes/sawing/chest_boat/cherry.json | 15 + .../recipes/sawing/chiseled_bookshelf.json | 17 + .../mekanism/recipes/sawing/door/bamboo.json | 12 + .../mekanism/recipes/sawing/door/cherry.json | 12 + .../recipes/sawing/fence_gate/bamboo.json | 17 + .../recipes/sawing/fence_gate/cherry.json | 17 + .../mekanism/recipes/sawing/log/cherry.json | 16 + .../recipes/sawing/pressure_plate/bamboo.json | 12 + .../recipes/sawing/pressure_plate/cherry.json | 12 + .../data/mekanism/recipes/sawing/slabs.json | 2 +- .../data/mekanism/recipes/sawing/stairs.json | 2 +- .../recipes/sawing/trapdoor/bamboo.json | 12 + .../recipes/sawing/trapdoor/cherry.json | 12 + .../minecraft/tags/blocks/replaceable.json | 22 ++ .../data/minecraft/tags/items/tools.json | 5 - .../08f2b53f4cfddb5dc20bb23057cbafdfe1cdd910 | 3 +- .../minecraft/tags/blocks/replaceable.json | 8 + .../74946afffd5717edd09cca189d3cabba428fcf6f | 3 +- .../c063a8814316721100515d4b53a904fd54474ddb | 290 ++++++++++++++++-- .../models/item/bronze_boots.json | 62 ++++ .../item/bronze_boots_amethyst_trim.json | 7 + .../models/item/bronze_boots_copper_trim.json | 7 + .../item/bronze_boots_diamond_trim.json | 7 + .../item/bronze_boots_emerald_trim.json | 7 + .../models/item/bronze_boots_gold_trim.json | 7 + .../models/item/bronze_boots_iron_trim.json | 7 + .../models/item/bronze_boots_lapis_trim.json | 7 + .../item/bronze_boots_netherite_trim.json | 7 + .../models/item/bronze_boots_quartz_trim.json | 7 + .../item/bronze_boots_redstone_trim.json | 7 + .../models/item/bronze_chestplate.json | 62 ++++ .../item/bronze_chestplate_amethyst_trim.json | 7 + .../item/bronze_chestplate_copper_trim.json | 7 + .../item/bronze_chestplate_diamond_trim.json | 7 + .../item/bronze_chestplate_emerald_trim.json | 7 + .../item/bronze_chestplate_gold_trim.json | 7 + .../item/bronze_chestplate_iron_trim.json | 7 + .../item/bronze_chestplate_lapis_trim.json | 7 + .../bronze_chestplate_netherite_trim.json | 7 + .../item/bronze_chestplate_quartz_trim.json | 7 + .../item/bronze_chestplate_redstone_trim.json | 7 + .../models/item/bronze_helmet.json | 62 ++++ .../item/bronze_helmet_amethyst_trim.json | 7 + .../item/bronze_helmet_copper_trim.json | 7 + .../item/bronze_helmet_diamond_trim.json | 7 + .../item/bronze_helmet_emerald_trim.json | 7 + .../models/item/bronze_helmet_gold_trim.json | 7 + .../models/item/bronze_helmet_iron_trim.json | 7 + .../models/item/bronze_helmet_lapis_trim.json | 7 + .../item/bronze_helmet_netherite_trim.json | 7 + .../item/bronze_helmet_quartz_trim.json | 7 + .../item/bronze_helmet_redstone_trim.json | 7 + .../models/item/bronze_leggings.json | 62 ++++ .../item/bronze_leggings_amethyst_trim.json | 7 + .../item/bronze_leggings_copper_trim.json | 7 + .../item/bronze_leggings_diamond_trim.json | 7 + .../item/bronze_leggings_emerald_trim.json | 7 + .../item/bronze_leggings_gold_trim.json | 7 + .../item/bronze_leggings_iron_trim.json | 7 + .../item/bronze_leggings_lapis_trim.json | 7 + .../item/bronze_leggings_netherite_trim.json | 7 + .../item/bronze_leggings_quartz_trim.json | 7 + .../item/bronze_leggings_redstone_trim.json | 7 + .../models/item/lapis_lazuli_boots.json | 62 ++++ .../lapis_lazuli_boots_amethyst_trim.json | 7 + .../item/lapis_lazuli_boots_copper_trim.json | 7 + .../item/lapis_lazuli_boots_diamond_trim.json | 7 + .../item/lapis_lazuli_boots_emerald_trim.json | 7 + .../item/lapis_lazuli_boots_gold_trim.json | 7 + .../item/lapis_lazuli_boots_iron_trim.json | 7 + .../item/lapis_lazuli_boots_lapis_trim.json | 7 + .../lapis_lazuli_boots_netherite_trim.json | 7 + .../item/lapis_lazuli_boots_quartz_trim.json | 7 + .../lapis_lazuli_boots_redstone_trim.json | 7 + .../models/item/lapis_lazuli_chestplate.json | 62 ++++ ...lapis_lazuli_chestplate_amethyst_trim.json | 7 + .../lapis_lazuli_chestplate_copper_trim.json | 7 + .../lapis_lazuli_chestplate_diamond_trim.json | 7 + .../lapis_lazuli_chestplate_emerald_trim.json | 7 + .../lapis_lazuli_chestplate_gold_trim.json | 7 + .../lapis_lazuli_chestplate_iron_trim.json | 7 + .../lapis_lazuli_chestplate_lapis_trim.json | 7 + ...apis_lazuli_chestplate_netherite_trim.json | 7 + .../lapis_lazuli_chestplate_quartz_trim.json | 7 + ...lapis_lazuli_chestplate_redstone_trim.json | 7 + .../models/item/lapis_lazuli_helmet.json | 62 ++++ .../lapis_lazuli_helmet_amethyst_trim.json | 7 + .../item/lapis_lazuli_helmet_copper_trim.json | 7 + .../lapis_lazuli_helmet_diamond_trim.json | 7 + .../lapis_lazuli_helmet_emerald_trim.json | 7 + .../item/lapis_lazuli_helmet_gold_trim.json | 7 + .../item/lapis_lazuli_helmet_iron_trim.json | 7 + .../item/lapis_lazuli_helmet_lapis_trim.json | 7 + .../lapis_lazuli_helmet_netherite_trim.json | 7 + .../item/lapis_lazuli_helmet_quartz_trim.json | 7 + .../lapis_lazuli_helmet_redstone_trim.json | 7 + .../models/item/lapis_lazuli_leggings.json | 62 ++++ .../lapis_lazuli_leggings_amethyst_trim.json | 7 + .../lapis_lazuli_leggings_copper_trim.json | 7 + .../lapis_lazuli_leggings_diamond_trim.json | 7 + .../lapis_lazuli_leggings_emerald_trim.json | 7 + .../item/lapis_lazuli_leggings_gold_trim.json | 7 + .../item/lapis_lazuli_leggings_iron_trim.json | 7 + .../lapis_lazuli_leggings_lapis_trim.json | 7 + .../lapis_lazuli_leggings_netherite_trim.json | 7 + .../lapis_lazuli_leggings_quartz_trim.json | 7 + .../lapis_lazuli_leggings_redstone_trim.json | 7 + .../models/item/osmium_boots.json | 62 ++++ .../item/osmium_boots_amethyst_trim.json | 7 + .../models/item/osmium_boots_copper_trim.json | 7 + .../item/osmium_boots_diamond_trim.json | 7 + .../item/osmium_boots_emerald_trim.json | 7 + .../models/item/osmium_boots_gold_trim.json | 7 + .../models/item/osmium_boots_iron_trim.json | 7 + .../models/item/osmium_boots_lapis_trim.json | 7 + .../item/osmium_boots_netherite_trim.json | 7 + .../models/item/osmium_boots_quartz_trim.json | 7 + .../item/osmium_boots_redstone_trim.json | 7 + .../models/item/osmium_chestplate.json | 62 ++++ .../item/osmium_chestplate_amethyst_trim.json | 7 + .../item/osmium_chestplate_copper_trim.json | 7 + .../item/osmium_chestplate_diamond_trim.json | 7 + .../item/osmium_chestplate_emerald_trim.json | 7 + .../item/osmium_chestplate_gold_trim.json | 7 + .../item/osmium_chestplate_iron_trim.json | 7 + .../item/osmium_chestplate_lapis_trim.json | 7 + .../osmium_chestplate_netherite_trim.json | 7 + .../item/osmium_chestplate_quartz_trim.json | 7 + .../item/osmium_chestplate_redstone_trim.json | 7 + .../models/item/osmium_helmet.json | 62 ++++ .../item/osmium_helmet_amethyst_trim.json | 7 + .../item/osmium_helmet_copper_trim.json | 7 + .../item/osmium_helmet_diamond_trim.json | 7 + .../item/osmium_helmet_emerald_trim.json | 7 + .../models/item/osmium_helmet_gold_trim.json | 7 + .../models/item/osmium_helmet_iron_trim.json | 7 + .../models/item/osmium_helmet_lapis_trim.json | 7 + .../item/osmium_helmet_netherite_trim.json | 7 + .../item/osmium_helmet_quartz_trim.json | 7 + .../item/osmium_helmet_redstone_trim.json | 7 + .../models/item/osmium_leggings.json | 62 ++++ .../item/osmium_leggings_amethyst_trim.json | 7 + .../item/osmium_leggings_copper_trim.json | 7 + .../item/osmium_leggings_diamond_trim.json | 7 + .../item/osmium_leggings_emerald_trim.json | 7 + .../item/osmium_leggings_gold_trim.json | 7 + .../item/osmium_leggings_iron_trim.json | 7 + .../item/osmium_leggings_lapis_trim.json | 7 + .../item/osmium_leggings_netherite_trim.json | 7 + .../item/osmium_leggings_quartz_trim.json | 7 + .../item/osmium_leggings_redstone_trim.json | 7 + .../models/item/refined_glowstone_boots.json | 62 ++++ ...refined_glowstone_boots_amethyst_trim.json | 7 + .../refined_glowstone_boots_copper_trim.json | 7 + .../refined_glowstone_boots_diamond_trim.json | 7 + .../refined_glowstone_boots_emerald_trim.json | 7 + .../refined_glowstone_boots_gold_trim.json | 7 + .../refined_glowstone_boots_iron_trim.json | 7 + .../refined_glowstone_boots_lapis_trim.json | 7 + ...efined_glowstone_boots_netherite_trim.json | 7 + .../refined_glowstone_boots_quartz_trim.json | 7 + ...refined_glowstone_boots_redstone_trim.json | 7 + .../item/refined_glowstone_chestplate.json | 62 ++++ ...ed_glowstone_chestplate_amethyst_trim.json | 7 + ...ined_glowstone_chestplate_copper_trim.json | 7 + ...ned_glowstone_chestplate_diamond_trim.json | 7 + ...ned_glowstone_chestplate_emerald_trim.json | 7 + ...efined_glowstone_chestplate_gold_trim.json | 7 + ...efined_glowstone_chestplate_iron_trim.json | 7 + ...fined_glowstone_chestplate_lapis_trim.json | 7 + ...d_glowstone_chestplate_netherite_trim.json | 7 + ...ined_glowstone_chestplate_quartz_trim.json | 7 + ...ed_glowstone_chestplate_redstone_trim.json | 7 + .../models/item/refined_glowstone_helmet.json | 62 ++++ ...efined_glowstone_helmet_amethyst_trim.json | 7 + .../refined_glowstone_helmet_copper_trim.json | 7 + ...refined_glowstone_helmet_diamond_trim.json | 7 + ...refined_glowstone_helmet_emerald_trim.json | 7 + .../refined_glowstone_helmet_gold_trim.json | 7 + .../refined_glowstone_helmet_iron_trim.json | 7 + .../refined_glowstone_helmet_lapis_trim.json | 7 + ...fined_glowstone_helmet_netherite_trim.json | 7 + .../refined_glowstone_helmet_quartz_trim.json | 7 + ...efined_glowstone_helmet_redstone_trim.json | 7 + .../item/refined_glowstone_leggings.json | 62 ++++ ...ined_glowstone_leggings_amethyst_trim.json | 7 + ...efined_glowstone_leggings_copper_trim.json | 7 + ...fined_glowstone_leggings_diamond_trim.json | 7 + ...fined_glowstone_leggings_emerald_trim.json | 7 + .../refined_glowstone_leggings_gold_trim.json | 7 + .../refined_glowstone_leggings_iron_trim.json | 7 + ...refined_glowstone_leggings_lapis_trim.json | 7 + ...ned_glowstone_leggings_netherite_trim.json | 7 + ...efined_glowstone_leggings_quartz_trim.json | 7 + ...ined_glowstone_leggings_redstone_trim.json | 7 + .../models/item/refined_obsidian_boots.json | 62 ++++ .../refined_obsidian_boots_amethyst_trim.json | 7 + .../refined_obsidian_boots_copper_trim.json | 7 + .../refined_obsidian_boots_diamond_trim.json | 7 + .../refined_obsidian_boots_emerald_trim.json | 7 + .../refined_obsidian_boots_gold_trim.json | 7 + .../refined_obsidian_boots_iron_trim.json | 7 + .../refined_obsidian_boots_lapis_trim.json | 7 + ...refined_obsidian_boots_netherite_trim.json | 7 + .../refined_obsidian_boots_quartz_trim.json | 7 + .../refined_obsidian_boots_redstone_trim.json | 7 + .../item/refined_obsidian_chestplate.json | 62 ++++ ...ned_obsidian_chestplate_amethyst_trim.json | 7 + ...fined_obsidian_chestplate_copper_trim.json | 7 + ...ined_obsidian_chestplate_diamond_trim.json | 7 + ...ined_obsidian_chestplate_emerald_trim.json | 7 + ...refined_obsidian_chestplate_gold_trim.json | 7 + ...refined_obsidian_chestplate_iron_trim.json | 7 + ...efined_obsidian_chestplate_lapis_trim.json | 7 + ...ed_obsidian_chestplate_netherite_trim.json | 7 + ...fined_obsidian_chestplate_quartz_trim.json | 7 + ...ned_obsidian_chestplate_redstone_trim.json | 7 + .../models/item/refined_obsidian_helmet.json | 62 ++++ ...refined_obsidian_helmet_amethyst_trim.json | 7 + .../refined_obsidian_helmet_copper_trim.json | 7 + .../refined_obsidian_helmet_diamond_trim.json | 7 + .../refined_obsidian_helmet_emerald_trim.json | 7 + .../refined_obsidian_helmet_gold_trim.json | 7 + .../refined_obsidian_helmet_iron_trim.json | 7 + .../refined_obsidian_helmet_lapis_trim.json | 7 + ...efined_obsidian_helmet_netherite_trim.json | 7 + .../refined_obsidian_helmet_quartz_trim.json | 7 + ...refined_obsidian_helmet_redstone_trim.json | 7 + .../item/refined_obsidian_leggings.json | 62 ++++ ...fined_obsidian_leggings_amethyst_trim.json | 7 + ...refined_obsidian_leggings_copper_trim.json | 7 + ...efined_obsidian_leggings_diamond_trim.json | 7 + ...efined_obsidian_leggings_emerald_trim.json | 7 + .../refined_obsidian_leggings_gold_trim.json | 7 + .../refined_obsidian_leggings_iron_trim.json | 7 + .../refined_obsidian_leggings_lapis_trim.json | 7 + ...ined_obsidian_leggings_netherite_trim.json | 7 + ...refined_obsidian_leggings_quartz_trim.json | 7 + ...fined_obsidian_leggings_redstone_trim.json | 7 + .../models/item/steel_boots.json | 62 ++++ .../item/steel_boots_amethyst_trim.json | 7 + .../models/item/steel_boots_copper_trim.json | 7 + .../models/item/steel_boots_diamond_trim.json | 7 + .../models/item/steel_boots_emerald_trim.json | 7 + .../models/item/steel_boots_gold_trim.json | 7 + .../models/item/steel_boots_iron_trim.json | 7 + .../models/item/steel_boots_lapis_trim.json | 7 + .../item/steel_boots_netherite_trim.json | 7 + .../models/item/steel_boots_quartz_trim.json | 7 + .../item/steel_boots_redstone_trim.json | 7 + .../models/item/steel_chestplate.json | 62 ++++ .../item/steel_chestplate_amethyst_trim.json | 7 + .../item/steel_chestplate_copper_trim.json | 7 + .../item/steel_chestplate_diamond_trim.json | 7 + .../item/steel_chestplate_emerald_trim.json | 7 + .../item/steel_chestplate_gold_trim.json | 7 + .../item/steel_chestplate_iron_trim.json | 7 + .../item/steel_chestplate_lapis_trim.json | 7 + .../item/steel_chestplate_netherite_trim.json | 7 + .../item/steel_chestplate_quartz_trim.json | 7 + .../item/steel_chestplate_redstone_trim.json | 7 + .../models/item/steel_helmet.json | 62 ++++ .../item/steel_helmet_amethyst_trim.json | 7 + .../models/item/steel_helmet_copper_trim.json | 7 + .../item/steel_helmet_diamond_trim.json | 7 + .../item/steel_helmet_emerald_trim.json | 7 + .../models/item/steel_helmet_gold_trim.json | 7 + .../models/item/steel_helmet_iron_trim.json | 7 + .../models/item/steel_helmet_lapis_trim.json | 7 + .../item/steel_helmet_netherite_trim.json | 7 + .../models/item/steel_helmet_quartz_trim.json | 7 + .../item/steel_helmet_redstone_trim.json | 7 + .../models/item/steel_leggings.json | 62 ++++ .../item/steel_leggings_amethyst_trim.json | 7 + .../item/steel_leggings_copper_trim.json | 7 + .../item/steel_leggings_diamond_trim.json | 7 + .../item/steel_leggings_emerald_trim.json | 7 + .../models/item/steel_leggings_gold_trim.json | 7 + .../models/item/steel_leggings_iron_trim.json | 7 + .../item/steel_leggings_lapis_trim.json | 7 + .../item/steel_leggings_netherite_trim.json | 7 + .../item/steel_leggings_quartz_trim.json | 7 + .../item/steel_leggings_redstone_trim.json | 7 + .../minecraft/tags/items/trimmable_armor.json | 28 ++ .../common/GeneratorsTagProvider.java | 6 +- .../client/model/BaseItemModelProvider.java | 56 ++++ .../common/recipe/RecipeProviderUtil.java | 20 +- .../recipe/impl/EnrichingRecipeProvider.java | 15 +- .../impl/PigmentExtractingRecipeProvider.java | 15 +- .../PressurizedReactionRecipeProvider.java | 19 +- .../recipe/impl/SawingRecipeProvider.java | 24 +- .../common/tag/MekanismTagProvider.java | 6 +- .../tools/client/ToolsItemModelProvider.java | 2 +- .../tools/common/ToolsTagProvider.java | 8 + src/main/java/mekanism/common/Mekanism.java | 2 + .../gear/mekatool/ModuleFarmingUnit.java | 3 +- .../common/registries/MekanismGameEvents.java | 17 +- 310 files changed, 3950 insertions(+), 80 deletions(-) create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipes/enriching/dye/large_cyan.json create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipes/pigment_extracting/flower/large_cyan.json create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipes/sawing/bamboo_block.json create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipes/sawing/boat/bamboo.json create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipes/sawing/boat/cherry.json create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipes/sawing/chest_boat/bamboo.json create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipes/sawing/chest_boat/cherry.json create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipes/sawing/chiseled_bookshelf.json create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipes/sawing/door/bamboo.json create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipes/sawing/door/cherry.json create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipes/sawing/fence_gate/bamboo.json create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipes/sawing/fence_gate/cherry.json create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipes/sawing/log/cherry.json create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipes/sawing/pressure_plate/bamboo.json create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipes/sawing/pressure_plate/cherry.json create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipes/sawing/trapdoor/bamboo.json create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipes/sawing/trapdoor/cherry.json create mode 100644 src/datagen/generated/mekanism/data/minecraft/tags/blocks/replaceable.json delete mode 100644 src/datagen/generated/mekanism/data/minecraft/tags/items/tools.json create mode 100644 src/datagen/generated/mekanismgenerators/data/minecraft/tags/blocks/replaceable.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_amethyst_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_copper_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_diamond_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_emerald_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_gold_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_iron_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_lapis_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_netherite_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_quartz_trim.json create mode 100644 src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_redstone_trim.json create mode 100644 src/datagen/generated/mekanismtools/data/minecraft/tags/items/trimmable_armor.json diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/enriching/dye/large_cyan.json b/src/datagen/generated/mekanism/data/mekanism/recipes/enriching/dye/large_cyan.json new file mode 100644 index 00000000000..2477bd3a186 --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/enriching/dye/large_cyan.json @@ -0,0 +1,12 @@ +{ + "type": "mekanism:enriching", + "input": { + "ingredient": { + "item": "minecraft:pitcher_plant" + } + }, + "output": { + "count": 4, + "item": "minecraft:cyan_dye" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/enriching/dye/orange.json b/src/datagen/generated/mekanism/data/mekanism/recipes/enriching/dye/orange.json index ce6416da9d0..7b406efefdd 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipes/enriching/dye/orange.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/enriching/dye/orange.json @@ -1,9 +1,14 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "minecraft:orange_tulip" - } + "ingredient": [ + { + "item": "minecraft:orange_tulip" + }, + { + "item": "minecraft:torchflower" + } + ] }, "output": { "count": 2, diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/enriching/dye/small_pink.json b/src/datagen/generated/mekanism/data/mekanism/recipes/enriching/dye/small_pink.json index 3c37b96996c..6d2a33670ff 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipes/enriching/dye/small_pink.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/enriching/dye/small_pink.json @@ -1,9 +1,14 @@ { "type": "mekanism:enriching", "input": { - "ingredient": { - "item": "minecraft:pink_tulip" - } + "ingredient": [ + { + "item": "minecraft:pink_tulip" + }, + { + "item": "minecraft:pink_petals" + } + ] }, "output": { "count": 2, diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/pigment_extracting/flower/large_cyan.json b/src/datagen/generated/mekanism/data/mekanism/recipes/pigment_extracting/flower/large_cyan.json new file mode 100644 index 00000000000..d3531224651 --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/pigment_extracting/flower/large_cyan.json @@ -0,0 +1,12 @@ +{ + "type": "mekanism:pigment_extracting", + "input": { + "ingredient": { + "item": "minecraft:pitcher_plant" + } + }, + "output": { + "amount": 1536, + "pigment": "mekanism:cyan" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/pigment_extracting/flower/orange.json b/src/datagen/generated/mekanism/data/mekanism/recipes/pigment_extracting/flower/orange.json index 6a8fadb633c..1ce1a389ca4 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipes/pigment_extracting/flower/orange.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/pigment_extracting/flower/orange.json @@ -1,9 +1,14 @@ { "type": "mekanism:pigment_extracting", "input": { - "ingredient": { - "item": "minecraft:orange_tulip" - } + "ingredient": [ + { + "item": "minecraft:orange_tulip" + }, + { + "item": "minecraft:torchflower" + } + ] }, "output": { "amount": 768, diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/pigment_extracting/flower/small_pink.json b/src/datagen/generated/mekanism/data/mekanism/recipes/pigment_extracting/flower/small_pink.json index 38e5685f3df..3881a717008 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipes/pigment_extracting/flower/small_pink.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/pigment_extracting/flower/small_pink.json @@ -1,9 +1,14 @@ { "type": "mekanism:pigment_extracting", "input": { - "ingredient": { - "item": "minecraft:pink_tulip" - } + "ingredient": [ + { + "item": "minecraft:pink_tulip" + }, + { + "item": "minecraft:pink_petals" + } + ] }, "output": { "amount": 768, diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/reaction/wood_gasification/planks.json b/src/datagen/generated/mekanism/data/mekanism/recipes/reaction/wood_gasification/planks.json index 57a70902d1f..951f6916a48 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipes/reaction/wood_gasification/planks.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/reaction/wood_gasification/planks.json @@ -15,9 +15,14 @@ }, "itemInput": { "amount": 20, - "ingredient": { - "tag": "minecraft:planks" - } + "ingredient": [ + { + "tag": "minecraft:planks" + }, + { + "item": "minecraft:bamboo_mosaic" + } + ] }, "itemOutput": { "item": "mekanism:dust_charcoal" diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/reaction/wood_gasification/wooden_slabs.json b/src/datagen/generated/mekanism/data/mekanism/recipes/reaction/wood_gasification/wooden_slabs.json index 1cbee9bd9cf..cd64ec7e087 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipes/reaction/wood_gasification/wooden_slabs.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/reaction/wood_gasification/wooden_slabs.json @@ -14,8 +14,13 @@ "gas": "mekanism:hydrogen" }, "itemInput": { - "ingredient": { - "tag": "minecraft:wooden_slabs" - } + "ingredient": [ + { + "tag": "minecraft:wooden_slabs" + }, + { + "item": "minecraft:bamboo_mosaic_slab" + } + ] } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/reaction/wood_gasification/wooden_stairs.json b/src/datagen/generated/mekanism/data/mekanism/recipes/reaction/wood_gasification/wooden_stairs.json index e427861f6ca..71791ce805c 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipes/reaction/wood_gasification/wooden_stairs.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/reaction/wood_gasification/wooden_stairs.json @@ -14,8 +14,13 @@ "gas": "mekanism:hydrogen" }, "itemInput": { - "ingredient": { - "tag": "minecraft:wooden_stairs" - } + "ingredient": [ + { + "tag": "minecraft:wooden_stairs" + }, + { + "item": "minecraft:bamboo_mosaic_stairs" + } + ] } } \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/bamboo_block.json b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/bamboo_block.json new file mode 100644 index 00000000000..e10626afa65 --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/bamboo_block.json @@ -0,0 +1,12 @@ +{ + "type": "mekanism:sawing", + "input": { + "ingredient": { + "item": "minecraft:bamboo_block" + } + }, + "mainOutput": { + "count": 9, + "item": "minecraft:bamboo" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/boat/bamboo.json b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/boat/bamboo.json new file mode 100644 index 00000000000..dd8dd14c5c5 --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/boat/bamboo.json @@ -0,0 +1,12 @@ +{ + "type": "mekanism:sawing", + "input": { + "ingredient": { + "item": "minecraft:bamboo_raft" + } + }, + "mainOutput": { + "count": 5, + "item": "minecraft:bamboo_planks" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/boat/cherry.json b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/boat/cherry.json new file mode 100644 index 00000000000..fdb40d99c36 --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/boat/cherry.json @@ -0,0 +1,12 @@ +{ + "type": "mekanism:sawing", + "input": { + "ingredient": { + "item": "minecraft:cherry_boat" + } + }, + "mainOutput": { + "count": 5, + "item": "minecraft:cherry_planks" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/chest_boat/bamboo.json b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/chest_boat/bamboo.json new file mode 100644 index 00000000000..2d011764286 --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/chest_boat/bamboo.json @@ -0,0 +1,15 @@ +{ + "type": "mekanism:sawing", + "input": { + "ingredient": { + "item": "minecraft:bamboo_chest_raft" + } + }, + "mainOutput": { + "item": "minecraft:bamboo_raft" + }, + "secondaryChance": 1.0, + "secondaryOutput": { + "item": "minecraft:chest" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/chest_boat/cherry.json b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/chest_boat/cherry.json new file mode 100644 index 00000000000..52d0cbe9c58 --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/chest_boat/cherry.json @@ -0,0 +1,15 @@ +{ + "type": "mekanism:sawing", + "input": { + "ingredient": { + "item": "minecraft:cherry_chest_boat" + } + }, + "mainOutput": { + "item": "minecraft:cherry_boat" + }, + "secondaryChance": 1.0, + "secondaryOutput": { + "item": "minecraft:chest" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/chiseled_bookshelf.json b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/chiseled_bookshelf.json new file mode 100644 index 00000000000..f3f36e1b56a --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/chiseled_bookshelf.json @@ -0,0 +1,17 @@ +{ + "type": "mekanism:sawing", + "input": { + "ingredient": { + "item": "minecraft:chiseled_bookshelf" + } + }, + "mainOutput": { + "count": 6, + "item": "minecraft:oak_planks" + }, + "secondaryChance": 1.0, + "secondaryOutput": { + "count": 3, + "item": "minecraft:oak_slab" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/door/bamboo.json b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/door/bamboo.json new file mode 100644 index 00000000000..d765b72fcc2 --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/door/bamboo.json @@ -0,0 +1,12 @@ +{ + "type": "mekanism:sawing", + "input": { + "ingredient": { + "item": "minecraft:bamboo_door" + } + }, + "mainOutput": { + "count": 2, + "item": "minecraft:bamboo_planks" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/door/cherry.json b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/door/cherry.json new file mode 100644 index 00000000000..b55e245d22b --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/door/cherry.json @@ -0,0 +1,12 @@ +{ + "type": "mekanism:sawing", + "input": { + "ingredient": { + "item": "minecraft:cherry_door" + } + }, + "mainOutput": { + "count": 2, + "item": "minecraft:cherry_planks" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/fence_gate/bamboo.json b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/fence_gate/bamboo.json new file mode 100644 index 00000000000..50b921ff677 --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/fence_gate/bamboo.json @@ -0,0 +1,17 @@ +{ + "type": "mekanism:sawing", + "input": { + "ingredient": { + "item": "minecraft:bamboo_fence_gate" + } + }, + "mainOutput": { + "count": 2, + "item": "minecraft:bamboo_planks" + }, + "secondaryChance": 1.0, + "secondaryOutput": { + "count": 4, + "item": "minecraft:stick" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/fence_gate/cherry.json b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/fence_gate/cherry.json new file mode 100644 index 00000000000..451fd2e1406 --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/fence_gate/cherry.json @@ -0,0 +1,17 @@ +{ + "type": "mekanism:sawing", + "input": { + "ingredient": { + "item": "minecraft:cherry_fence_gate" + } + }, + "mainOutput": { + "count": 2, + "item": "minecraft:cherry_planks" + }, + "secondaryChance": 1.0, + "secondaryOutput": { + "count": 4, + "item": "minecraft:stick" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/log/cherry.json b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/log/cherry.json new file mode 100644 index 00000000000..999c5d29734 --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/log/cherry.json @@ -0,0 +1,16 @@ +{ + "type": "mekanism:sawing", + "input": { + "ingredient": { + "tag": "minecraft:cherry_logs" + } + }, + "mainOutput": { + "count": 6, + "item": "minecraft:cherry_planks" + }, + "secondaryChance": 0.25, + "secondaryOutput": { + "item": "mekanism:sawdust" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/pressure_plate/bamboo.json b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/pressure_plate/bamboo.json new file mode 100644 index 00000000000..5cd507ca959 --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/pressure_plate/bamboo.json @@ -0,0 +1,12 @@ +{ + "type": "mekanism:sawing", + "input": { + "ingredient": { + "item": "minecraft:bamboo_pressure_plate" + } + }, + "mainOutput": { + "count": 2, + "item": "minecraft:bamboo_planks" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/pressure_plate/cherry.json b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/pressure_plate/cherry.json new file mode 100644 index 00000000000..8bb4342eae0 --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/pressure_plate/cherry.json @@ -0,0 +1,12 @@ +{ + "type": "mekanism:sawing", + "input": { + "ingredient": { + "item": "minecraft:cherry_pressure_plate" + } + }, + "mainOutput": { + "count": 2, + "item": "minecraft:cherry_planks" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/slabs.json b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/slabs.json index 071aeb094a7..e3532724735 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/slabs.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/slabs.json @@ -2,7 +2,7 @@ "type": "mekanism:sawing", "input": { "ingredient": { - "tag": "minecraft:wooden_slabs" + "tag": "mekanism:wooden_slabs" } }, "mainOutput": { diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/stairs.json b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/stairs.json index 5aa9869a834..fcc2d2fd3b9 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/stairs.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/stairs.json @@ -2,7 +2,7 @@ "type": "mekanism:sawing", "input": { "ingredient": { - "tag": "minecraft:wooden_stairs" + "tag": "mekanism:wooden_stairs" } }, "mainOutput": { diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/trapdoor/bamboo.json b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/trapdoor/bamboo.json new file mode 100644 index 00000000000..b2d27b45497 --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/trapdoor/bamboo.json @@ -0,0 +1,12 @@ +{ + "type": "mekanism:sawing", + "input": { + "ingredient": { + "item": "minecraft:bamboo_trapdoor" + } + }, + "mainOutput": { + "count": 3, + "item": "minecraft:bamboo_planks" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/trapdoor/cherry.json b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/trapdoor/cherry.json new file mode 100644 index 00000000000..5dc4e2cca91 --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipes/sawing/trapdoor/cherry.json @@ -0,0 +1,12 @@ +{ + "type": "mekanism:sawing", + "input": { + "ingredient": { + "item": "minecraft:cherry_trapdoor" + } + }, + "mainOutput": { + "count": 3, + "item": "minecraft:cherry_planks" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/minecraft/tags/blocks/replaceable.json b/src/datagen/generated/mekanism/data/minecraft/tags/blocks/replaceable.json new file mode 100644 index 00000000000..c9864385be2 --- /dev/null +++ b/src/datagen/generated/mekanism/data/minecraft/tags/blocks/replaceable.json @@ -0,0 +1,22 @@ +{ + "values": [ + "mekanism:hydrogen", + "mekanism:oxygen", + "mekanism:chlorine", + "mekanism:sulfur_dioxide", + "mekanism:sulfur_trioxide", + "mekanism:sulfuric_acid", + "mekanism:hydrogen_chloride", + "mekanism:hydrofluoric_acid", + "mekanism:uranium_oxide", + "mekanism:uranium_hexafluoride", + "mekanism:ethene", + "mekanism:sodium", + "mekanism:superheated_sodium", + "mekanism:brine", + "mekanism:lithium", + "mekanism:steam", + "mekanism:heavy_water", + "mekanism:nutritional_paste" + ] +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/minecraft/tags/items/tools.json b/src/datagen/generated/mekanism/data/minecraft/tags/items/tools.json deleted file mode 100644 index 5cb6cb4b6e2..00000000000 --- a/src/datagen/generated/mekanism/data/minecraft/tags/items/tools.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "#forge:tools/wrench" - ] -} \ No newline at end of file diff --git a/src/datagen/generated/mekanismgenerators/.cache/08f2b53f4cfddb5dc20bb23057cbafdfe1cdd910 b/src/datagen/generated/mekanismgenerators/.cache/08f2b53f4cfddb5dc20bb23057cbafdfe1cdd910 index a9b1edd6b61..84c02b7e51e 100644 --- a/src/datagen/generated/mekanismgenerators/.cache/08f2b53f4cfddb5dc20bb23057cbafdfe1cdd910 +++ b/src/datagen/generated/mekanismgenerators/.cache/08f2b53f4cfddb5dc20bb23057cbafdfe1cdd910 @@ -1,4 +1,4 @@ -// 1.20.1 2023-06-15T18:11:13.9961573 Tags: mekanismgenerators +// 1.20.1 2023-07-06T11:03:22.4476866 Tags: mekanismgenerators 51c625436874fdd2506b20267e03dabf44c090b0 data/create/tags/fluids/no_infinite_draining.json 1fcda8d5db3dac92eb2d3bd6339ec5b91b0c888e data/forge/tags/blocks/enderman_place_on_blacklist.json f30d0458accef4b51831b90f9039c05d00276e48 data/forge/tags/blocks/relocation_not_supported.json @@ -13,3 +13,4 @@ f335abd8b1bb57e1fb2740b6c80d8c5cb80b06c1 data/mekanism/tags/mekanism/gas/fusion_ e7f3de2230470165a4e2f84ad01e7a005ad81e2f data/mekanism/tags/mekanism/gas/tritium.json 974b8e28094a061f02f670ce4f597cb76f95255f data/minecraft/tags/blocks/impermeable.json 0e8259a96fd81c042f2427e5b5a9b4ff39138b10 data/minecraft/tags/blocks/mineable/pickaxe.json +c8217fe7b5f69c23b0511f1a203c7d525a9f9f22 data/minecraft/tags/blocks/replaceable.json diff --git a/src/datagen/generated/mekanismgenerators/data/minecraft/tags/blocks/replaceable.json b/src/datagen/generated/mekanismgenerators/data/minecraft/tags/blocks/replaceable.json new file mode 100644 index 00000000000..d6048013efa --- /dev/null +++ b/src/datagen/generated/mekanismgenerators/data/minecraft/tags/blocks/replaceable.json @@ -0,0 +1,8 @@ +{ + "values": [ + "mekanismgenerators:bioethanol", + "mekanismgenerators:deuterium", + "mekanismgenerators:fusion_fuel", + "mekanismgenerators:tritium" + ] +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/.cache/74946afffd5717edd09cca189d3cabba428fcf6f b/src/datagen/generated/mekanismtools/.cache/74946afffd5717edd09cca189d3cabba428fcf6f index 153973a2f8f..73bc06615e7 100644 --- a/src/datagen/generated/mekanismtools/.cache/74946afffd5717edd09cca189d3cabba428fcf6f +++ b/src/datagen/generated/mekanismtools/.cache/74946afffd5717edd09cca189d3cabba428fcf6f @@ -1,4 +1,4 @@ -// 1.20.1 2023-07-03T16:25:32.8276892 Tags: mekanismtools +// 1.20.1 2023-07-06T11:03:22.3111695 Tags: mekanismtools 13cf1fe06cf159d32d074144254a0d375f6b20e7 data/forge/tags/blocks/mineable/paxel.json 1ab0df6429d1970340ec4569317573a4a9eba83b data/forge/tags/items/armors/boots.json af96c784f584395bc4a681ca629dd189a19e5e70 data/forge/tags/items/armors/boots/bronze.json @@ -93,3 +93,4 @@ d0d1c465cdc61d787cfc2a3550b2815245a41cf5 data/minecraft/tags/items/pickaxes.json 093fcdff8a397f421836cba0e18eca3a8ecba38d data/minecraft/tags/items/shovels.json 380f44893a403d8cdf9e3f090017286b153a7567 data/minecraft/tags/items/swords.json 64dc89347621097fba7e74cca9e2170ac678724a data/minecraft/tags/items/tools.json +24b012fc7c9892521a590536279bdb6bad72db6e data/minecraft/tags/items/trimmable_armor.json diff --git a/src/datagen/generated/mekanismtools/.cache/c063a8814316721100515d4b53a904fd54474ddb b/src/datagen/generated/mekanismtools/.cache/c063a8814316721100515d4b53a904fd54474ddb index e53f96e43ba..c8e64946464 100644 --- a/src/datagen/generated/mekanismtools/.cache/c063a8814316721100515d4b53a904fd54474ddb +++ b/src/datagen/generated/mekanismtools/.cache/c063a8814316721100515d4b53a904fd54474ddb @@ -1,10 +1,50 @@ -// 1.20.1 2023-06-15T18:11:13.8821571 Item model provider: mekanismtools +// 1.20.1 2023-07-06T13:38:37.291248 Item model provider: mekanismtools d10b10a2f9c7d5828b145eee92a2311a12f4de4e assets/mekanismtools/models/item/bronze_axe.json -4a23861071ebbd3abe221cfd9e75ce962baa06a3 assets/mekanismtools/models/item/bronze_boots.json -cfdcdd94b5e929a62d0fc2b2fae0b23afdc4249a assets/mekanismtools/models/item/bronze_chestplate.json -0e59261a83c05d13a9564cc9108db076f9c50fcb assets/mekanismtools/models/item/bronze_helmet.json +dd6eba2ca134942ef1f9c9ae2ca7bd42c19e6da5 assets/mekanismtools/models/item/bronze_boots.json +5b5cc4aa0f391ef980d06879eb8fc0d14f56c26b assets/mekanismtools/models/item/bronze_boots_amethyst_trim.json +fe4579d722087e8bd7e4b44176699070fdc7d6a3 assets/mekanismtools/models/item/bronze_boots_copper_trim.json +2a51ae212c4ee568c30b35ddccba84dfa1a6e9a4 assets/mekanismtools/models/item/bronze_boots_diamond_trim.json +0fb5ca7c7acdb01290e380113d1deb257316a43f assets/mekanismtools/models/item/bronze_boots_emerald_trim.json +c78ce6fd4bce54d09452b3e6f261dc0dd69cdf4c assets/mekanismtools/models/item/bronze_boots_gold_trim.json +322f5ea4840fc3021a7831ba74a06da0ab8dffad assets/mekanismtools/models/item/bronze_boots_iron_trim.json +890e81f45c3ac1ee7e5ae5dbec5a21b30b7f44d3 assets/mekanismtools/models/item/bronze_boots_lapis_trim.json +b6c8bdd68124df87678e4501b4e8263b848c00f4 assets/mekanismtools/models/item/bronze_boots_netherite_trim.json +81a8dc855e4858da756cc82c8b9e5b873aecc2b1 assets/mekanismtools/models/item/bronze_boots_quartz_trim.json +e170bd7afb1a819afb2362eddfa7952f6ad10aec assets/mekanismtools/models/item/bronze_boots_redstone_trim.json +48efe6bc74b6395f449d2414489f58506209b16b assets/mekanismtools/models/item/bronze_chestplate.json +df75215f95208cea7cf96f92663274011ddfe3d7 assets/mekanismtools/models/item/bronze_chestplate_amethyst_trim.json +598e8caf89471b402e6ab90204ff6cdfe3d15452 assets/mekanismtools/models/item/bronze_chestplate_copper_trim.json +50c6ab94e1a36adc20182b7a13c6412e086eccc2 assets/mekanismtools/models/item/bronze_chestplate_diamond_trim.json +370b60969eb63a8960326f03e2eaf472b6ca3ccb assets/mekanismtools/models/item/bronze_chestplate_emerald_trim.json +00938a5e758f9659bb27f8348e23e152b9eafee0 assets/mekanismtools/models/item/bronze_chestplate_gold_trim.json +9b2555c2a78b8f50b4af399757ee2114092bf9ce assets/mekanismtools/models/item/bronze_chestplate_iron_trim.json +cf10aeca09ff2bed3de98f1f41fa88fe094487e2 assets/mekanismtools/models/item/bronze_chestplate_lapis_trim.json +a6576871092d4541efc695395f852b31639ec532 assets/mekanismtools/models/item/bronze_chestplate_netherite_trim.json +50d14cda12c4e43229f8161ccd8aa59e5fc1b193 assets/mekanismtools/models/item/bronze_chestplate_quartz_trim.json +93de940d0971f814c3cf3f063de8a3b4c0e8302f assets/mekanismtools/models/item/bronze_chestplate_redstone_trim.json +32fc22dcf295bd008b4090f8901258be9b722ae2 assets/mekanismtools/models/item/bronze_helmet.json +4bd6750abac59984a9b16be33700ed9ce2e638a1 assets/mekanismtools/models/item/bronze_helmet_amethyst_trim.json +96b21b4f4a29233f33291d9575b8844d0c13ed83 assets/mekanismtools/models/item/bronze_helmet_copper_trim.json +4d60d99be12716a3046d886024379e2cc7d75828 assets/mekanismtools/models/item/bronze_helmet_diamond_trim.json +4d6c64bdcc670d47065f948c5f74c60d89c32d27 assets/mekanismtools/models/item/bronze_helmet_emerald_trim.json +1fcee2d678bd5f4f6053ffb1083a8fbdb48c8ff1 assets/mekanismtools/models/item/bronze_helmet_gold_trim.json +16ea976f1dc4d3e66a9552c9bcd7274b6f05a545 assets/mekanismtools/models/item/bronze_helmet_iron_trim.json +c1f0cf8a01b5dfdaeda46dc17fe3af22d060badb assets/mekanismtools/models/item/bronze_helmet_lapis_trim.json +6ed83f54a1f9253c2b5a6fc3f3cee8c6a3a3bf15 assets/mekanismtools/models/item/bronze_helmet_netherite_trim.json +01a89a89d4929c2b0c56c774980621736fc20346 assets/mekanismtools/models/item/bronze_helmet_quartz_trim.json +1fce5bb09ca9186b324c62ddd0767f5097ca5940 assets/mekanismtools/models/item/bronze_helmet_redstone_trim.json 9a623a9eaa9f9c027a355a1fb65ff2bb12037f5e assets/mekanismtools/models/item/bronze_hoe.json -d8d8404553b8c24169f47ecebcfc00023b79b086 assets/mekanismtools/models/item/bronze_leggings.json +f9028dd983d7c611bef737265d1a7cf09413736f assets/mekanismtools/models/item/bronze_leggings.json +da72e5e990e1d5ca7b2d6ff2bca13fbddb6372a0 assets/mekanismtools/models/item/bronze_leggings_amethyst_trim.json +ec5bca7be25661ec89bea9285538b83764d4cbf0 assets/mekanismtools/models/item/bronze_leggings_copper_trim.json +067655c998ca6f894a8d53c30b9f424e3241181b assets/mekanismtools/models/item/bronze_leggings_diamond_trim.json +83891573a3b7aab966fa98b9e774c61e9ea7fe6c assets/mekanismtools/models/item/bronze_leggings_emerald_trim.json +076ca3ab8b04653d0648095e530c408e846df1f6 assets/mekanismtools/models/item/bronze_leggings_gold_trim.json +645c3f2e251bf1d81c72eadf3ff1ad8f6c54ec06 assets/mekanismtools/models/item/bronze_leggings_iron_trim.json +dc1abf6a9fd963c5602503154a7462e831f2f384 assets/mekanismtools/models/item/bronze_leggings_lapis_trim.json +a864510553ba94ae556669a2f0563875385fc304 assets/mekanismtools/models/item/bronze_leggings_netherite_trim.json +7bb3b133939209f036b04218a480dc819e35e4d3 assets/mekanismtools/models/item/bronze_leggings_quartz_trim.json +3e8862095547a5f67990e694a4a093990ee3855a assets/mekanismtools/models/item/bronze_leggings_redstone_trim.json db52f8d0e4135b05791833e5b0f035122b376929 assets/mekanismtools/models/item/bronze_paxel.json 78a3934892a2401c8ead12b333814d1e0459eccd assets/mekanismtools/models/item/bronze_pickaxe.json f9516d372b7e10ef28d6d94df50886bff2dc8ad5 assets/mekanismtools/models/item/bronze_shield.json @@ -15,11 +55,51 @@ f87d34d22ea0072c58cbbac93a9a488ad5a709ea assets/mekanismtools/models/item/bronze 782562565590cb809f91b143b4f7bc54faedbbb4 assets/mekanismtools/models/item/gold_paxel.json f7183a919c2602cedcb577684150eb0e33fc931c assets/mekanismtools/models/item/iron_paxel.json 1fd8f82f197a7a0f508e472bc36edc923f8eb2dc assets/mekanismtools/models/item/lapis_lazuli_axe.json -be2fcf5151c9fed0319a9be54605766b83df0413 assets/mekanismtools/models/item/lapis_lazuli_boots.json -7b573be3b1406f1baa471f53266a05272b996213 assets/mekanismtools/models/item/lapis_lazuli_chestplate.json -cf8ca66186964885e261659a8a5098c99e9eb1f6 assets/mekanismtools/models/item/lapis_lazuli_helmet.json +ab1f4cdf6c17027ee6a16c1f916e0ade325dc152 assets/mekanismtools/models/item/lapis_lazuli_boots.json +6486fa8108cb66301dbec71a4d1bdf49de3b647d assets/mekanismtools/models/item/lapis_lazuli_boots_amethyst_trim.json +16b6217bb21f3f93ce01a68ff3079fc55a394852 assets/mekanismtools/models/item/lapis_lazuli_boots_copper_trim.json +57ddead4d8d59a32c8af326dd02f805778e69946 assets/mekanismtools/models/item/lapis_lazuli_boots_diamond_trim.json +1e50fb40ae575c68b3b8b736c5c533a59d6c2683 assets/mekanismtools/models/item/lapis_lazuli_boots_emerald_trim.json +0e078e24e93b41337a57ccae0c154f2a4510c62a assets/mekanismtools/models/item/lapis_lazuli_boots_gold_trim.json +1f09e1286e36fda92cc51ffd06d2e2145ff20dd1 assets/mekanismtools/models/item/lapis_lazuli_boots_iron_trim.json +7523b8c07bb07193ee8108ab546f23da5e9952c6 assets/mekanismtools/models/item/lapis_lazuli_boots_lapis_trim.json +a99e8f045aebdf27b9d85c57fad03c7b5ceeaa4e assets/mekanismtools/models/item/lapis_lazuli_boots_netherite_trim.json +f6c4cc0597a447c93ee957fcd55b2ca76041a6c6 assets/mekanismtools/models/item/lapis_lazuli_boots_quartz_trim.json +dd4edaf47d5b88b1e1f112d91afe2277bd4cd8bf assets/mekanismtools/models/item/lapis_lazuli_boots_redstone_trim.json +63a090d7107e2c376e85a2d4e293b1c8f54d2adb assets/mekanismtools/models/item/lapis_lazuli_chestplate.json +a812e94a40969d3fe4ec1b7d2dd44540275c2c18 assets/mekanismtools/models/item/lapis_lazuli_chestplate_amethyst_trim.json +6013229230a8652eb0d29d8509b6c0584954f080 assets/mekanismtools/models/item/lapis_lazuli_chestplate_copper_trim.json +99ad2e3864c5003a5b0cae9d004aceee0d240100 assets/mekanismtools/models/item/lapis_lazuli_chestplate_diamond_trim.json +4e5a0f4d2d5a718eb85d6461cdbe6807da007684 assets/mekanismtools/models/item/lapis_lazuli_chestplate_emerald_trim.json +691cdb9b77dbafb38b71353bb4fe696d9c7ec495 assets/mekanismtools/models/item/lapis_lazuli_chestplate_gold_trim.json +2dd0eedaf799f557ce0c07b3fbf366a97b4a4701 assets/mekanismtools/models/item/lapis_lazuli_chestplate_iron_trim.json +ea0beb84c395236dd0399ea86cf39fda2e281cc8 assets/mekanismtools/models/item/lapis_lazuli_chestplate_lapis_trim.json +405c053967335b8aaeef724c98204c2ac8f6af93 assets/mekanismtools/models/item/lapis_lazuli_chestplate_netherite_trim.json +7b65bc06e4337bea2bc5f3676d40fe471736d27c assets/mekanismtools/models/item/lapis_lazuli_chestplate_quartz_trim.json +e042a68112a3e31c04827236b10b2feca885454d assets/mekanismtools/models/item/lapis_lazuli_chestplate_redstone_trim.json +4674d035bfe0058ebfe0e7783dde3c2e91ec6c4f assets/mekanismtools/models/item/lapis_lazuli_helmet.json +246c1383911fcd5ac451ff9891d49bfdcdd90987 assets/mekanismtools/models/item/lapis_lazuli_helmet_amethyst_trim.json +bcff1ef45a94bb044c897bcf0c590c98231680c5 assets/mekanismtools/models/item/lapis_lazuli_helmet_copper_trim.json +687833c0c94cb964ca71cd57b20270e66baa3337 assets/mekanismtools/models/item/lapis_lazuli_helmet_diamond_trim.json +67c7f6abb909f143872c65439f0b7de6703d5914 assets/mekanismtools/models/item/lapis_lazuli_helmet_emerald_trim.json +cef2dd56804e2d16418247d2804dfb2ea9e7b419 assets/mekanismtools/models/item/lapis_lazuli_helmet_gold_trim.json +d12005bb9caacea425bdd604cb697082b4f8d2ef assets/mekanismtools/models/item/lapis_lazuli_helmet_iron_trim.json +24f14e41774e69ad31bb7532a4925c0b33af0355 assets/mekanismtools/models/item/lapis_lazuli_helmet_lapis_trim.json +b7e25c54aa75e343a904ca2e24498f2a3f871edb assets/mekanismtools/models/item/lapis_lazuli_helmet_netherite_trim.json +4c332cdf1c87cc13d4cf2a268ef42b6bee7ace73 assets/mekanismtools/models/item/lapis_lazuli_helmet_quartz_trim.json +29034f1fa91e32483a7390766e2936c646a6db43 assets/mekanismtools/models/item/lapis_lazuli_helmet_redstone_trim.json b02888967ef948a3cb1710a39f25cfea72c0c9c9 assets/mekanismtools/models/item/lapis_lazuli_hoe.json -8146705e4311eaa4023faf7325d19a5f57af498f assets/mekanismtools/models/item/lapis_lazuli_leggings.json +a041ff257bcc252bd8612121a6445404379de952 assets/mekanismtools/models/item/lapis_lazuli_leggings.json +b2e9dc518cb87f1494b171197138eb486dedd6a0 assets/mekanismtools/models/item/lapis_lazuli_leggings_amethyst_trim.json +74e9ab12742dff52a825592d0d3903b32e75bb01 assets/mekanismtools/models/item/lapis_lazuli_leggings_copper_trim.json +b95d9dc45bd7d385084cdbb56b74209a6b2eead3 assets/mekanismtools/models/item/lapis_lazuli_leggings_diamond_trim.json +3752c6bebfbb949bb3e94b5c23e60cc03c3eda7b assets/mekanismtools/models/item/lapis_lazuli_leggings_emerald_trim.json +ceeb2b99d3cd8abaa24ecfa6372e233d2035c90e assets/mekanismtools/models/item/lapis_lazuli_leggings_gold_trim.json +07cf4973d728dd2f4d74abff3760773a8088675c assets/mekanismtools/models/item/lapis_lazuli_leggings_iron_trim.json +101247eba4417f176050d4303d796d4a30644cda assets/mekanismtools/models/item/lapis_lazuli_leggings_lapis_trim.json +d7f8fb58f128daa6359273ef97c9d8a572423069 assets/mekanismtools/models/item/lapis_lazuli_leggings_netherite_trim.json +94c161716198cf95e200d41ab892de5468498052 assets/mekanismtools/models/item/lapis_lazuli_leggings_quartz_trim.json +248c30e9084bdf048e9e6a5c6fe7cafc8bccb77a assets/mekanismtools/models/item/lapis_lazuli_leggings_redstone_trim.json 41aa7949bfaa3e1aef174da62cc82aa0055978c2 assets/mekanismtools/models/item/lapis_lazuli_paxel.json 85e04668b38f5ba780f3960ed33052fcd5e2b99c assets/mekanismtools/models/item/lapis_lazuli_pickaxe.json 9ac3bb026894eaa26adf495428b6fee8db81544a assets/mekanismtools/models/item/lapis_lazuli_shield.json @@ -28,11 +108,51 @@ c392cd4b48ac0824ecbb66c2cbbde205605d6691 assets/mekanismtools/models/item/lapis_ 296a85ef6f0e5a1890a96adf1b9b8b5526654ed5 assets/mekanismtools/models/item/lapis_lazuli_sword.json 1fa1b10901f3a0dcd2c8d1a17c65142475715e56 assets/mekanismtools/models/item/netherite_paxel.json 955ba38335ffb082a1159afb32cdf93b401ea83c assets/mekanismtools/models/item/osmium_axe.json -52a14f850e7943e6b2762356f9ce36c3563a5780 assets/mekanismtools/models/item/osmium_boots.json -537b5fa3db703a0169db21eaee2c75737e2f0b76 assets/mekanismtools/models/item/osmium_chestplate.json -f410bd7ffa8e98f73e25c7d4a5853e4cb6f47d4b assets/mekanismtools/models/item/osmium_helmet.json +775a7546bed847c173155a52f26b8d11e73b2a12 assets/mekanismtools/models/item/osmium_boots.json +d4c50d3253c850768d16e6efb0ba7145ec8f0077 assets/mekanismtools/models/item/osmium_boots_amethyst_trim.json +b83ba06304f17f3912df006b830716dee2dc0ed1 assets/mekanismtools/models/item/osmium_boots_copper_trim.json +8a2a3985b8df2a449b28aca22d798d5206f699b5 assets/mekanismtools/models/item/osmium_boots_diamond_trim.json +ae6f1fb77e04dc3d37434a7d8c7677a426beec6e assets/mekanismtools/models/item/osmium_boots_emerald_trim.json +769cb4d69c4531ae3b4a794f1421fd90c75a0513 assets/mekanismtools/models/item/osmium_boots_gold_trim.json +e4b47ea179ca71b06ee2a172cd2f4fa1d80d1e70 assets/mekanismtools/models/item/osmium_boots_iron_trim.json +316ca667cfef6d3dbb20ead64f892641c52e6a06 assets/mekanismtools/models/item/osmium_boots_lapis_trim.json +adcc8081ee9ce153de6db017e6a16cf6ec16f4be assets/mekanismtools/models/item/osmium_boots_netherite_trim.json +434cac88d3f10141dbc94c060c4869e7c3fcb564 assets/mekanismtools/models/item/osmium_boots_quartz_trim.json +30899d6a2a28119d2384ba450fd454672232e834 assets/mekanismtools/models/item/osmium_boots_redstone_trim.json +3f114d69c3a415e32d329d629d725175458ff63f assets/mekanismtools/models/item/osmium_chestplate.json +2bab29eb129fb5817dbb328583821ddd0e92a390 assets/mekanismtools/models/item/osmium_chestplate_amethyst_trim.json +eed8780b5189465d1a60e5d8c1890b191965f155 assets/mekanismtools/models/item/osmium_chestplate_copper_trim.json +b821a88c169430d8d7b3d087348cd9a5085b5123 assets/mekanismtools/models/item/osmium_chestplate_diamond_trim.json +ed101b40e6181f0b077012b785858554161627f0 assets/mekanismtools/models/item/osmium_chestplate_emerald_trim.json +7440b45a41878570425afb5a30f2b5889d5b6135 assets/mekanismtools/models/item/osmium_chestplate_gold_trim.json +b093e09a506f03e6aa283c193642ebd0ac8c4dad assets/mekanismtools/models/item/osmium_chestplate_iron_trim.json +d413acbb981c6622b69d98e0df00ead439e03e15 assets/mekanismtools/models/item/osmium_chestplate_lapis_trim.json +c3e4c1ca210e11e42f0216eee3a23f44645d206e assets/mekanismtools/models/item/osmium_chestplate_netherite_trim.json +f59f284e5bfea24df85e8950803ced47fcf35e15 assets/mekanismtools/models/item/osmium_chestplate_quartz_trim.json +afc17716d16941a8381d5423c2b9eb3debee81ce assets/mekanismtools/models/item/osmium_chestplate_redstone_trim.json +8de329b67d5ecbc3e366220cf116b72b0d70fb0c assets/mekanismtools/models/item/osmium_helmet.json +52aae6c27ef18fdc4882476dfc5ed36991f2f3de assets/mekanismtools/models/item/osmium_helmet_amethyst_trim.json +6b6d27a24172e4938d74b37c0a916cc756946d4c assets/mekanismtools/models/item/osmium_helmet_copper_trim.json +f75ee3ba2247b435b0619a8b2830e68348d4a1f0 assets/mekanismtools/models/item/osmium_helmet_diamond_trim.json +c1d58e90814ca5c8ab15ad9f12c21662d65e3de0 assets/mekanismtools/models/item/osmium_helmet_emerald_trim.json +9c05802affa4183ccf4926b0123a1153ee3b930e assets/mekanismtools/models/item/osmium_helmet_gold_trim.json +ed476b1f0915d6caaf05e459d06b5604e1963f09 assets/mekanismtools/models/item/osmium_helmet_iron_trim.json +cfda2a8b4eb840c975f16fa7ed264d59bdd98efb assets/mekanismtools/models/item/osmium_helmet_lapis_trim.json +d78ac1f0a849688095e4b6786983da76d4fc5105 assets/mekanismtools/models/item/osmium_helmet_netherite_trim.json +8560a6707eaad636275806abd49c2b8a0a2878a1 assets/mekanismtools/models/item/osmium_helmet_quartz_trim.json +900d5e7a51f7b1ec4a980f546befce47b5dd8dbd assets/mekanismtools/models/item/osmium_helmet_redstone_trim.json bd3e999121748512396b3d3c77ac887b38a0e08e assets/mekanismtools/models/item/osmium_hoe.json -c37e27424e9ec46641f402b424ed8fc96b24c051 assets/mekanismtools/models/item/osmium_leggings.json +b99c08543db0a1245c473f87c3fa89c215698752 assets/mekanismtools/models/item/osmium_leggings.json +84cd0dc14065771a9a1b9115cef283a65d10dba6 assets/mekanismtools/models/item/osmium_leggings_amethyst_trim.json +3630dde625521a4cc2480cdbae9a194ef09134b3 assets/mekanismtools/models/item/osmium_leggings_copper_trim.json +cf3171787ce69de5d638c57f78b241c511f5d7fd assets/mekanismtools/models/item/osmium_leggings_diamond_trim.json +f463c2542f0d7eedb7fb5f5df02bc2afc030a40b assets/mekanismtools/models/item/osmium_leggings_emerald_trim.json +80c713dfbe79b654ac311b41519774a0f46ffed8 assets/mekanismtools/models/item/osmium_leggings_gold_trim.json +efae610ccdf00ac2fe612fa5ddeb6e34b6c37dbb assets/mekanismtools/models/item/osmium_leggings_iron_trim.json +0c55af148a47a8fc72772c5a6e528e6b44f63e74 assets/mekanismtools/models/item/osmium_leggings_lapis_trim.json +78c0ad5bdcc6966a6976bc6021695e9628d10bdd assets/mekanismtools/models/item/osmium_leggings_netherite_trim.json +60d43f1ee2a5cf5e460348a94f9c80f52ec91cf2 assets/mekanismtools/models/item/osmium_leggings_quartz_trim.json +6d26ea5af1249a7c037086d5fbbdf8fddb6ba72c assets/mekanismtools/models/item/osmium_leggings_redstone_trim.json 85647fef6e86e163fea40504d0cdcfe17d4a2bfc assets/mekanismtools/models/item/osmium_paxel.json 57df15fffb14dac3ae520e618785dc832ddadadf assets/mekanismtools/models/item/osmium_pickaxe.json c2904807d5931ae0bdd7f0e93cdf34ce218961db assets/mekanismtools/models/item/osmium_shield.json @@ -40,11 +160,51 @@ e086d91512568479fa85f49bc464d221744f5d54 assets/mekanismtools/models/item/osmium 7012e9bdd84208e904a50b21205d3fd586450b3e assets/mekanismtools/models/item/osmium_shovel.json 5b33df6cf9a88e70ec9ed85b0a4e0f439b668c0b assets/mekanismtools/models/item/osmium_sword.json 925a17867be516595ea5535fcb0f8b55cd165130 assets/mekanismtools/models/item/refined_glowstone_axe.json -d9eb7066c7f38eb788885a7b49c9621c5511cc93 assets/mekanismtools/models/item/refined_glowstone_boots.json -efd556acc3cc88b678504203429618c1fb7f88ef assets/mekanismtools/models/item/refined_glowstone_chestplate.json -e518eb1cd7b2f4bb00790867314e50b5f063071d assets/mekanismtools/models/item/refined_glowstone_helmet.json +f03a0c88afe90a17c6bdd373181157415ccdaec8 assets/mekanismtools/models/item/refined_glowstone_boots.json +7fa9841eab1f615fec7cb1e3a95e77baf02abdf5 assets/mekanismtools/models/item/refined_glowstone_boots_amethyst_trim.json +a7871fc28ab7981c2fcf82855b6743f467194443 assets/mekanismtools/models/item/refined_glowstone_boots_copper_trim.json +6146ce438421b0d29a9b45a6f4c096af26db14b8 assets/mekanismtools/models/item/refined_glowstone_boots_diamond_trim.json +9dd1c835b56122713d4835a0255496bf46f8f709 assets/mekanismtools/models/item/refined_glowstone_boots_emerald_trim.json +305ece6c24444272dc6cf99a5188fe1dea542c9d assets/mekanismtools/models/item/refined_glowstone_boots_gold_trim.json +c49de19ae7ed5d743dbb556749f56edb810ba195 assets/mekanismtools/models/item/refined_glowstone_boots_iron_trim.json +deff843ecd465ddc0b483e715147c30cb517f154 assets/mekanismtools/models/item/refined_glowstone_boots_lapis_trim.json +0fc99620c5663538704b2a5eb3cd03b6c5ef1962 assets/mekanismtools/models/item/refined_glowstone_boots_netherite_trim.json +55aea70adfbfd11d13a9b93775570fe094024553 assets/mekanismtools/models/item/refined_glowstone_boots_quartz_trim.json +036232eed9110fa7878c242c2741cb5e68f41596 assets/mekanismtools/models/item/refined_glowstone_boots_redstone_trim.json +e55621f7e5646d4cfb77c895234f1a44ed56cc2b assets/mekanismtools/models/item/refined_glowstone_chestplate.json +71caf11aa15dcf32994d09e79f2eccd600de140f assets/mekanismtools/models/item/refined_glowstone_chestplate_amethyst_trim.json +a2990655db0bb35932ecbb7fadd36b8608e79140 assets/mekanismtools/models/item/refined_glowstone_chestplate_copper_trim.json +5a8ec3a06f354a517b17473022dadf00562c1282 assets/mekanismtools/models/item/refined_glowstone_chestplate_diamond_trim.json +b2a8cd2446cd91b4edf4939fbcbdce07703aa86e assets/mekanismtools/models/item/refined_glowstone_chestplate_emerald_trim.json +3c94855a3a65b29a9e3183209e19c10401e5dc04 assets/mekanismtools/models/item/refined_glowstone_chestplate_gold_trim.json +9befd27be6c4ddcd80318a16ce9b9e9fe9be6872 assets/mekanismtools/models/item/refined_glowstone_chestplate_iron_trim.json +7bb62687bfeb9d5a8620442694169720786fd651 assets/mekanismtools/models/item/refined_glowstone_chestplate_lapis_trim.json +c30662b2ddaa1c666fd6446009f3d06191112f01 assets/mekanismtools/models/item/refined_glowstone_chestplate_netherite_trim.json +2995f3cae697001afa489196f13d274560794011 assets/mekanismtools/models/item/refined_glowstone_chestplate_quartz_trim.json +1641c636108bd0ca39d3c98c6cae9f86b2fc9d75 assets/mekanismtools/models/item/refined_glowstone_chestplate_redstone_trim.json +6ffb06042ddc910aaaf3a7c781efd836f48ea92e assets/mekanismtools/models/item/refined_glowstone_helmet.json +8ba3efa57dd4caa32326e9a5f98cd0e54a855e22 assets/mekanismtools/models/item/refined_glowstone_helmet_amethyst_trim.json +36a1073a368d4268bf339fe6c527e8a6ffcd1952 assets/mekanismtools/models/item/refined_glowstone_helmet_copper_trim.json +e2f35573ee042fa7657a55e72a2327533d0f8f31 assets/mekanismtools/models/item/refined_glowstone_helmet_diamond_trim.json +3ddf2b72a7771e777747d28e7ca2076ed0927239 assets/mekanismtools/models/item/refined_glowstone_helmet_emerald_trim.json +ff5db97abaeb591f81a72ad348287a86e161b5a8 assets/mekanismtools/models/item/refined_glowstone_helmet_gold_trim.json +be60076ab8418d297b9baa31847f93b35170caa9 assets/mekanismtools/models/item/refined_glowstone_helmet_iron_trim.json +75469074113548dcf2442f9a820f3e9a2ec9e22c assets/mekanismtools/models/item/refined_glowstone_helmet_lapis_trim.json +c745aaaecc9395521a7bdd8be9a269b767b20bb5 assets/mekanismtools/models/item/refined_glowstone_helmet_netherite_trim.json +9f4685dcef20702560385947674702455b4be9b0 assets/mekanismtools/models/item/refined_glowstone_helmet_quartz_trim.json +150a9dbc061edf4d2e30d22c35d785153ff822c6 assets/mekanismtools/models/item/refined_glowstone_helmet_redstone_trim.json 9772090fe9afe82edb8f1a635aec9732a8eaf35f assets/mekanismtools/models/item/refined_glowstone_hoe.json -b94cb8479d54002f7cc46a1616519e7e7f820ecf assets/mekanismtools/models/item/refined_glowstone_leggings.json +88b777b149141bf45ed55af1045c36fbba290c72 assets/mekanismtools/models/item/refined_glowstone_leggings.json +8464365504630be202674a69c1ed80ca1ada7289 assets/mekanismtools/models/item/refined_glowstone_leggings_amethyst_trim.json +07f2d740e81a03e277c2cc4908798b94901259df assets/mekanismtools/models/item/refined_glowstone_leggings_copper_trim.json +bae8524873c012e3c7fe61070587cae0d4ea7c84 assets/mekanismtools/models/item/refined_glowstone_leggings_diamond_trim.json +0a0b937f190322e5cd3ae8e94dbdd7bd5e673ae1 assets/mekanismtools/models/item/refined_glowstone_leggings_emerald_trim.json +d0fb16a930fbb768a5906d14967f41b2931b31d4 assets/mekanismtools/models/item/refined_glowstone_leggings_gold_trim.json +bccb13c9ccf04f3f1b86b4da0a78df750f528052 assets/mekanismtools/models/item/refined_glowstone_leggings_iron_trim.json +cb564dd7f648ca18dc59320c89c03331b470a62e assets/mekanismtools/models/item/refined_glowstone_leggings_lapis_trim.json +fdbcb1a80fd4e6a66029e3731943e8b7fd3a179e assets/mekanismtools/models/item/refined_glowstone_leggings_netherite_trim.json +3f6bc55365e24c45b4be03a0fb4543580ee416b0 assets/mekanismtools/models/item/refined_glowstone_leggings_quartz_trim.json +6c62430a97e11bc51f0aade847c903982d1a61fc assets/mekanismtools/models/item/refined_glowstone_leggings_redstone_trim.json a1702bb3b7bf5d4346fe39e113d617af0477a890 assets/mekanismtools/models/item/refined_glowstone_paxel.json b3c1234faeacd76a7e313ed3fa3e65476b36e9aa assets/mekanismtools/models/item/refined_glowstone_pickaxe.json 4e3ba02492e18218a3e676618b78ecacee9a4ba2 assets/mekanismtools/models/item/refined_glowstone_shield.json @@ -52,11 +212,51 @@ b3c1234faeacd76a7e313ed3fa3e65476b36e9aa assets/mekanismtools/models/item/refine ada61f6461ddab3cd0a777b3f10cf9bff1b8aa83 assets/mekanismtools/models/item/refined_glowstone_shovel.json c4c310606bb9714590f8a32d94cdf9027bee135b assets/mekanismtools/models/item/refined_glowstone_sword.json 2aad7200c052d74daef8e93bd3d82da5a85d267b assets/mekanismtools/models/item/refined_obsidian_axe.json -94477408bf61f0ad490ee0ac046de07a2d8a0f48 assets/mekanismtools/models/item/refined_obsidian_boots.json -b6d246b121fd5c023d9b2287e8f12cb43a136087 assets/mekanismtools/models/item/refined_obsidian_chestplate.json -72b2e4474651ddfeaa23ff3e10bd33e0fc67d10a assets/mekanismtools/models/item/refined_obsidian_helmet.json +9259a28216f766b166d1fde0cd734ee08337159f assets/mekanismtools/models/item/refined_obsidian_boots.json +c9d5402732fcfc90965deceec829c26417ad040a assets/mekanismtools/models/item/refined_obsidian_boots_amethyst_trim.json +af56a81b1c655be45e81bc1c61f9350094856bd7 assets/mekanismtools/models/item/refined_obsidian_boots_copper_trim.json +0918f6b498a2e03aa105f2e534c6823bb40584b2 assets/mekanismtools/models/item/refined_obsidian_boots_diamond_trim.json +321e5255ed7bdfb267d8728d670329b919f80cd9 assets/mekanismtools/models/item/refined_obsidian_boots_emerald_trim.json +1565f3e2b8ab6e42dcd41573daafc2eecdacd32f assets/mekanismtools/models/item/refined_obsidian_boots_gold_trim.json +f0b4ebbcc1adea580133443712cc7d87c929b030 assets/mekanismtools/models/item/refined_obsidian_boots_iron_trim.json +cedb8fc65b2ae7465b61cb762ff72d4e5417a9f7 assets/mekanismtools/models/item/refined_obsidian_boots_lapis_trim.json +673ecee0abad7e3b3c5c4f8f8e8fde417f0b66ea assets/mekanismtools/models/item/refined_obsidian_boots_netherite_trim.json +c800ea7b74a2b1e64bc5778ec9db24518c32afff assets/mekanismtools/models/item/refined_obsidian_boots_quartz_trim.json +2bbc1ecc5afb3aebca308ec5682cfb926785bd39 assets/mekanismtools/models/item/refined_obsidian_boots_redstone_trim.json +05a26cfc0931eb7a0e43ff85839e8cc6770b37cd assets/mekanismtools/models/item/refined_obsidian_chestplate.json +278a378ad2e5ea88626cfd35db8c3251b2532583 assets/mekanismtools/models/item/refined_obsidian_chestplate_amethyst_trim.json +d5041f7f690ea1629fa5034ddd948f7db8bc5bac assets/mekanismtools/models/item/refined_obsidian_chestplate_copper_trim.json +81bbd39b0411b7eda3f6bb8cb9a8b63a4710a07a assets/mekanismtools/models/item/refined_obsidian_chestplate_diamond_trim.json +86bb32274fb24ec47e0811270961a52094e5de9c assets/mekanismtools/models/item/refined_obsidian_chestplate_emerald_trim.json +e8a8e7a3d4d6151d43ac318583baa250023618a0 assets/mekanismtools/models/item/refined_obsidian_chestplate_gold_trim.json +6aac590700e0e71b687e14d8ecd74403e9dafed9 assets/mekanismtools/models/item/refined_obsidian_chestplate_iron_trim.json +fde8607bcdd9c2a636b129b90842928a7cc62513 assets/mekanismtools/models/item/refined_obsidian_chestplate_lapis_trim.json +f86f50a85ba3e22a688e7a955d5cf27448e9f8f9 assets/mekanismtools/models/item/refined_obsidian_chestplate_netherite_trim.json +b05c2d36e3f412d92bebf5481c472fad0e86c022 assets/mekanismtools/models/item/refined_obsidian_chestplate_quartz_trim.json +87512834a92a9736dae3e8a31f150b5432042d18 assets/mekanismtools/models/item/refined_obsidian_chestplate_redstone_trim.json +0207e831dea975fb0708431e9b2186b852dfb4f9 assets/mekanismtools/models/item/refined_obsidian_helmet.json +47d383329d070a64460434ef8203331d62b4b487 assets/mekanismtools/models/item/refined_obsidian_helmet_amethyst_trim.json +586e16734564c2a42eede69f5e0925864d32c034 assets/mekanismtools/models/item/refined_obsidian_helmet_copper_trim.json +b2aed710a691b53c18f4d942dd87d7a440832e33 assets/mekanismtools/models/item/refined_obsidian_helmet_diamond_trim.json +b9c81ec450463b39a323fd6721a784c3e3680c09 assets/mekanismtools/models/item/refined_obsidian_helmet_emerald_trim.json +97cb98b7b00f2b9bc0efac6e8a6de8c09161ffb7 assets/mekanismtools/models/item/refined_obsidian_helmet_gold_trim.json +04dac059fb1e36ab28d9f73e01dbe8493aae7602 assets/mekanismtools/models/item/refined_obsidian_helmet_iron_trim.json +5c9f323bab8fdd1bd730414c53f23011668092e2 assets/mekanismtools/models/item/refined_obsidian_helmet_lapis_trim.json +12ea222797023270856d15641803ae674195abdc assets/mekanismtools/models/item/refined_obsidian_helmet_netherite_trim.json +754e5fc08cd9ab58a141983266966b6767f27dac assets/mekanismtools/models/item/refined_obsidian_helmet_quartz_trim.json +df5a9e1e2365626c9eb3c2e9540c11e4a476ab90 assets/mekanismtools/models/item/refined_obsidian_helmet_redstone_trim.json 4b5164ac9e50ec0ded2bacfdd2b1a457083945c2 assets/mekanismtools/models/item/refined_obsidian_hoe.json -27645f6a4b7fa34f5bdff8013469494f758920a8 assets/mekanismtools/models/item/refined_obsidian_leggings.json +a1059d871c06a128cbdbc2a535c2cc38450f3ed0 assets/mekanismtools/models/item/refined_obsidian_leggings.json +3327b4b6cbd65a35d1b84e02bb1ba3c68429634c assets/mekanismtools/models/item/refined_obsidian_leggings_amethyst_trim.json +21732a85ceef7e66aa49784a2bee9aecb356c7d5 assets/mekanismtools/models/item/refined_obsidian_leggings_copper_trim.json +aba48501c6abca4c31b0297c79fdfe834551de56 assets/mekanismtools/models/item/refined_obsidian_leggings_diamond_trim.json +76ee7b84412c13a0777dbcde318071aa71e51154 assets/mekanismtools/models/item/refined_obsidian_leggings_emerald_trim.json +cde7da6b48b463b025b5f9f6733f6a7736485213 assets/mekanismtools/models/item/refined_obsidian_leggings_gold_trim.json +f6a9f0c5823754bca2b13affb5a92e9fb38cce15 assets/mekanismtools/models/item/refined_obsidian_leggings_iron_trim.json +e849619b2e441f1137fce9e740dfd4c799e7eec2 assets/mekanismtools/models/item/refined_obsidian_leggings_lapis_trim.json +b1415557a147e57242571ce121126851c8ed40ff assets/mekanismtools/models/item/refined_obsidian_leggings_netherite_trim.json +4f157b296a8e8b8b5f5c9c130ba7a88160a493ed assets/mekanismtools/models/item/refined_obsidian_leggings_quartz_trim.json +d230742000ac94c7ad589831e55fb5173cd1e4d5 assets/mekanismtools/models/item/refined_obsidian_leggings_redstone_trim.json bfc0562aa7deb4dd8a49737c1685549397d80a7d assets/mekanismtools/models/item/refined_obsidian_paxel.json 2be1712995959b7a6818d6ce54365384c8834412 assets/mekanismtools/models/item/refined_obsidian_pickaxe.json cb13586b68f37922d4afcf73a3e376f505aa4ce4 assets/mekanismtools/models/item/refined_obsidian_shield.json @@ -64,11 +264,51 @@ cb13586b68f37922d4afcf73a3e376f505aa4ce4 assets/mekanismtools/models/item/refine 7c852739845c8973d8f9ea890cd85d6b6b73b6b7 assets/mekanismtools/models/item/refined_obsidian_shovel.json f58f8637e016da24b8d60d54155e04361e39d945 assets/mekanismtools/models/item/refined_obsidian_sword.json b04ea1b15d4ee92eb1bc2b0aca50c03dac65a789 assets/mekanismtools/models/item/steel_axe.json -1cc836f7f753248aeb3116f88a92a13020491e1d assets/mekanismtools/models/item/steel_boots.json -2319a0613b637aef461528211603cb75e525f773 assets/mekanismtools/models/item/steel_chestplate.json -20691ea7d73e7a35063e7df820898ce1cf0a0236 assets/mekanismtools/models/item/steel_helmet.json +c55e67eb6600fd7be1744c86ab70feb87e87a6a6 assets/mekanismtools/models/item/steel_boots.json +c9fbd3c6bf70b8656e8aa24452637d90f4c12d3f assets/mekanismtools/models/item/steel_boots_amethyst_trim.json +d85cadb07ac655fa1f2becbae71e136177e90941 assets/mekanismtools/models/item/steel_boots_copper_trim.json +c0465ffa3fdb374cccb0d4ef295f4ec991dbb811 assets/mekanismtools/models/item/steel_boots_diamond_trim.json +d0ebd0bc57fae0de702bef31598e9c2ee6c04d42 assets/mekanismtools/models/item/steel_boots_emerald_trim.json +fdb23961e77f9c18971561d466998818e8c02e8d assets/mekanismtools/models/item/steel_boots_gold_trim.json +53c755dac65a6ebe6039e115f5b851c52f92f60b assets/mekanismtools/models/item/steel_boots_iron_trim.json +ae2cac5a989f1c022e2519cbb74da31b65ad4d4d assets/mekanismtools/models/item/steel_boots_lapis_trim.json +e8e5872d7529f3ae4b061984298209953f567792 assets/mekanismtools/models/item/steel_boots_netherite_trim.json +c8c67b726fcf3a949a375b97259af2b599449668 assets/mekanismtools/models/item/steel_boots_quartz_trim.json +a6c54ee693862ca9b9384a35889668d74c06874b assets/mekanismtools/models/item/steel_boots_redstone_trim.json +f436f4d8e5d77b1fa46d32391c5ed247e7f7b7de assets/mekanismtools/models/item/steel_chestplate.json +8909d837bc32ad5cf9e1c4f7e99bdb338bd78efb assets/mekanismtools/models/item/steel_chestplate_amethyst_trim.json +187210e5fbd28436982d2c90569637060e7f4ad9 assets/mekanismtools/models/item/steel_chestplate_copper_trim.json +4744b403367880964aecc444e219f64b8d4b996e assets/mekanismtools/models/item/steel_chestplate_diamond_trim.json +92bf3aac61e5a35a37c8308e97db580c6c86b704 assets/mekanismtools/models/item/steel_chestplate_emerald_trim.json +974a93e8b57bc486ccd20d1207ebb16b4ce4f234 assets/mekanismtools/models/item/steel_chestplate_gold_trim.json +c399672bf12ffee709263846bdeeb421ca698a75 assets/mekanismtools/models/item/steel_chestplate_iron_trim.json +833ca55ad6c737144d20e21d21fde5a5d93b84d1 assets/mekanismtools/models/item/steel_chestplate_lapis_trim.json +c9bf7a066ac9b9065d315cb41dde28b8fe165f29 assets/mekanismtools/models/item/steel_chestplate_netherite_trim.json +27bcbee0a47324162323bc746038b019708bea28 assets/mekanismtools/models/item/steel_chestplate_quartz_trim.json +aa01ece5fed1a1c0ddff283c26b407f1c0865cf5 assets/mekanismtools/models/item/steel_chestplate_redstone_trim.json +e7c42553fa9967b5a93f9839e04ec3380b7b9717 assets/mekanismtools/models/item/steel_helmet.json +45e1f0697f6335a5f87ae27f9ccd1f4b007f2e6c assets/mekanismtools/models/item/steel_helmet_amethyst_trim.json +39f22fcbeb381854de17fe091c3f54eb4bfa5dea assets/mekanismtools/models/item/steel_helmet_copper_trim.json +8dddfa5bbab6297561ec279690206f58cdded3ed assets/mekanismtools/models/item/steel_helmet_diamond_trim.json +06028a9df71cdb0c01a1bb962c0c6d558f71fa32 assets/mekanismtools/models/item/steel_helmet_emerald_trim.json +a8a149ec3cb46d1d452b882f6c9fed71dfb84b24 assets/mekanismtools/models/item/steel_helmet_gold_trim.json +0a7ba303300e7173ec65c06251dfef603111a559 assets/mekanismtools/models/item/steel_helmet_iron_trim.json +d10e5dd39f8940e1c5ec65cdb43f8d8807e2116c assets/mekanismtools/models/item/steel_helmet_lapis_trim.json +98d1d06344fe0d5a0574c4ecc3a4e261bb25393c assets/mekanismtools/models/item/steel_helmet_netherite_trim.json +f828e9c7931c5ba5f0554d41d73fe80796e282a8 assets/mekanismtools/models/item/steel_helmet_quartz_trim.json +217471f033fc551fa5cc0d8fb75f881b536b84d5 assets/mekanismtools/models/item/steel_helmet_redstone_trim.json c6dc047e3479f2a5c5a83bf340562ad7903567b5 assets/mekanismtools/models/item/steel_hoe.json -611bbc92408c9c880e593ce1b2aa4f822b17d63e assets/mekanismtools/models/item/steel_leggings.json +2f283c275df9b6fe744f88abe072851be011e1fb assets/mekanismtools/models/item/steel_leggings.json +477aa6c5afc67459c7461526884760683ccae807 assets/mekanismtools/models/item/steel_leggings_amethyst_trim.json +c8260912835058fcc1fb210e20a615e8b2c6007c assets/mekanismtools/models/item/steel_leggings_copper_trim.json +0c5c88b366109b363c7c9599e7685fb18e18c945 assets/mekanismtools/models/item/steel_leggings_diamond_trim.json +f09505a60a04718ab8013248265c6ad41bd294d5 assets/mekanismtools/models/item/steel_leggings_emerald_trim.json +98e8b942a5df5cc2be75a5dcb148d96973353ed7 assets/mekanismtools/models/item/steel_leggings_gold_trim.json +064647ae0bf4befa658928e8054d9ca525f7f7c7 assets/mekanismtools/models/item/steel_leggings_iron_trim.json +847bf2781833af22a6cd02e707ded7c804c6490e assets/mekanismtools/models/item/steel_leggings_lapis_trim.json +aa88db802165e3ef80c51eb23a11b0331424d528 assets/mekanismtools/models/item/steel_leggings_netherite_trim.json +53c20a71213ecb0414bc5f5f72044d60904c54e7 assets/mekanismtools/models/item/steel_leggings_quartz_trim.json +b5696871fcf9d93ea4b451026eb3fcc0ae3370eb assets/mekanismtools/models/item/steel_leggings_redstone_trim.json 5990645078208072d02fa879f562dcb0d240dbde assets/mekanismtools/models/item/steel_paxel.json aad6d7561428c4d4924d542f86c056a7ea5c3c6d assets/mekanismtools/models/item/steel_pickaxe.json be506ec53fd67af3171d1d8935a4393c6a73b9de assets/mekanismtools/models/item/steel_shield.json diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots.json index 4b957e37bf4..b5c13ae1991 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/bronze_boots_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/bronze_boots_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/bronze_boots_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/bronze_boots_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/bronze_boots_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/bronze_boots_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/bronze_boots_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/bronze_boots_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/bronze_boots_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/bronze_boots_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/bronze/boots" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_amethyst_trim.json new file mode 100644 index 00000000000..2eb78c41545 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/boots", + "layer1": "minecraft:trims/items/boots_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_copper_trim.json new file mode 100644 index 00000000000..aa852397c41 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/boots", + "layer1": "minecraft:trims/items/boots_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_diamond_trim.json new file mode 100644 index 00000000000..7872aea776a --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/boots", + "layer1": "minecraft:trims/items/boots_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_emerald_trim.json new file mode 100644 index 00000000000..9e5859bd0e3 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/boots", + "layer1": "minecraft:trims/items/boots_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_gold_trim.json new file mode 100644 index 00000000000..db24a585dbc --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/boots", + "layer1": "minecraft:trims/items/boots_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_iron_trim.json new file mode 100644 index 00000000000..b0398fdc41a --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/boots", + "layer1": "minecraft:trims/items/boots_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_lapis_trim.json new file mode 100644 index 00000000000..40fa03f9998 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/boots", + "layer1": "minecraft:trims/items/boots_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_netherite_trim.json new file mode 100644 index 00000000000..7fbaa4beb37 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/boots", + "layer1": "minecraft:trims/items/boots_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_quartz_trim.json new file mode 100644 index 00000000000..a419aa46687 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/boots", + "layer1": "minecraft:trims/items/boots_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_redstone_trim.json new file mode 100644 index 00000000000..77d2c1c762b --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_boots_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/boots", + "layer1": "minecraft:trims/items/boots_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate.json index ad823b320ee..de595086dbb 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/bronze_chestplate_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/bronze_chestplate_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/bronze_chestplate_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/bronze_chestplate_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/bronze_chestplate_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/bronze_chestplate_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/bronze_chestplate_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/bronze_chestplate_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/bronze_chestplate_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/bronze_chestplate_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/bronze/chestplate" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_amethyst_trim.json new file mode 100644 index 00000000000..c45590ff9fa --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_copper_trim.json new file mode 100644 index 00000000000..4a30c2ea33a --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_diamond_trim.json new file mode 100644 index 00000000000..58731576dd3 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_emerald_trim.json new file mode 100644 index 00000000000..b84947c7546 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_gold_trim.json new file mode 100644 index 00000000000..950b2552daa --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_iron_trim.json new file mode 100644 index 00000000000..bb61ca32819 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_lapis_trim.json new file mode 100644 index 00000000000..ad05024c453 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_netherite_trim.json new file mode 100644 index 00000000000..0a4a48dba49 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_quartz_trim.json new file mode 100644 index 00000000000..bc08ddef766 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_redstone_trim.json new file mode 100644 index 00000000000..b1b2bd7a7d7 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_chestplate_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet.json index b65afe7cc5c..bdb3f4d8aa9 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/bronze_helmet_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/bronze_helmet_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/bronze_helmet_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/bronze_helmet_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/bronze_helmet_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/bronze_helmet_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/bronze_helmet_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/bronze_helmet_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/bronze_helmet_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/bronze_helmet_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/bronze/helmet" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_amethyst_trim.json new file mode 100644 index 00000000000..f54453af061 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/helmet", + "layer1": "minecraft:trims/items/helmet_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_copper_trim.json new file mode 100644 index 00000000000..5e40ba32d2a --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/helmet", + "layer1": "minecraft:trims/items/helmet_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_diamond_trim.json new file mode 100644 index 00000000000..5852ffd9695 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/helmet", + "layer1": "minecraft:trims/items/helmet_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_emerald_trim.json new file mode 100644 index 00000000000..2b4ddf71abe --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/helmet", + "layer1": "minecraft:trims/items/helmet_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_gold_trim.json new file mode 100644 index 00000000000..313fba02ff9 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/helmet", + "layer1": "minecraft:trims/items/helmet_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_iron_trim.json new file mode 100644 index 00000000000..b26c9b78708 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/helmet", + "layer1": "minecraft:trims/items/helmet_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_lapis_trim.json new file mode 100644 index 00000000000..38628342f47 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/helmet", + "layer1": "minecraft:trims/items/helmet_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_netherite_trim.json new file mode 100644 index 00000000000..813f2208d8c --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/helmet", + "layer1": "minecraft:trims/items/helmet_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_quartz_trim.json new file mode 100644 index 00000000000..268709da777 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/helmet", + "layer1": "minecraft:trims/items/helmet_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_redstone_trim.json new file mode 100644 index 00000000000..1543ca66ac0 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_helmet_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/helmet", + "layer1": "minecraft:trims/items/helmet_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings.json index a9e546cf67e..e303e882118 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/bronze_leggings_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/bronze_leggings_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/bronze_leggings_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/bronze_leggings_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/bronze_leggings_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/bronze_leggings_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/bronze_leggings_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/bronze_leggings_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/bronze_leggings_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/bronze_leggings_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/bronze/leggings" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_amethyst_trim.json new file mode 100644 index 00000000000..b8424694b59 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/leggings", + "layer1": "minecraft:trims/items/leggings_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_copper_trim.json new file mode 100644 index 00000000000..8fc9dfd67ea --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/leggings", + "layer1": "minecraft:trims/items/leggings_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_diamond_trim.json new file mode 100644 index 00000000000..36f3bf73a41 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/leggings", + "layer1": "minecraft:trims/items/leggings_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_emerald_trim.json new file mode 100644 index 00000000000..122d7830be9 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/leggings", + "layer1": "minecraft:trims/items/leggings_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_gold_trim.json new file mode 100644 index 00000000000..7c2379cfa44 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/leggings", + "layer1": "minecraft:trims/items/leggings_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_iron_trim.json new file mode 100644 index 00000000000..08ec1789a9d --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/leggings", + "layer1": "minecraft:trims/items/leggings_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_lapis_trim.json new file mode 100644 index 00000000000..3bfdcbe1777 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/leggings", + "layer1": "minecraft:trims/items/leggings_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_netherite_trim.json new file mode 100644 index 00000000000..0d504e72e16 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/leggings", + "layer1": "minecraft:trims/items/leggings_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_quartz_trim.json new file mode 100644 index 00000000000..f71d1a1ad91 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/leggings", + "layer1": "minecraft:trims/items/leggings_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_redstone_trim.json new file mode 100644 index 00000000000..f4df0b9e526 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/bronze_leggings_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/bronze/leggings", + "layer1": "minecraft:trims/items/leggings_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots.json index 6f9e9eafcce..53db77c74b1 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/lapis_lazuli_boots_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_boots_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_boots_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_boots_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_boots_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_boots_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_boots_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_boots_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_boots_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_boots_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/lapis_lazuli/boots" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_amethyst_trim.json new file mode 100644 index 00000000000..00d39075120 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/boots", + "layer1": "minecraft:trims/items/boots_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_copper_trim.json new file mode 100644 index 00000000000..391473e4efa --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/boots", + "layer1": "minecraft:trims/items/boots_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_diamond_trim.json new file mode 100644 index 00000000000..2fbeeaed2e3 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/boots", + "layer1": "minecraft:trims/items/boots_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_emerald_trim.json new file mode 100644 index 00000000000..dae8bfc513a --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/boots", + "layer1": "minecraft:trims/items/boots_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_gold_trim.json new file mode 100644 index 00000000000..79040cb201e --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/boots", + "layer1": "minecraft:trims/items/boots_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_iron_trim.json new file mode 100644 index 00000000000..72334809e0c --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/boots", + "layer1": "minecraft:trims/items/boots_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_lapis_trim.json new file mode 100644 index 00000000000..87344e5c909 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/boots", + "layer1": "minecraft:trims/items/boots_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_netherite_trim.json new file mode 100644 index 00000000000..753a94a1211 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/boots", + "layer1": "minecraft:trims/items/boots_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_quartz_trim.json new file mode 100644 index 00000000000..777dd733825 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/boots", + "layer1": "minecraft:trims/items/boots_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_redstone_trim.json new file mode 100644 index 00000000000..baf700f7309 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_boots_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/boots", + "layer1": "minecraft:trims/items/boots_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate.json index aab1bd82f37..94cb85ce6d4 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/lapis_lazuli_chestplate_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_chestplate_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_chestplate_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_chestplate_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_chestplate_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_chestplate_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_chestplate_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_chestplate_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_chestplate_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_chestplate_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/lapis_lazuli/chestplate" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_amethyst_trim.json new file mode 100644 index 00000000000..8d7b1b309f7 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_copper_trim.json new file mode 100644 index 00000000000..e3c56b76678 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_diamond_trim.json new file mode 100644 index 00000000000..514c01c6cdd --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_emerald_trim.json new file mode 100644 index 00000000000..bcd4a016585 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_gold_trim.json new file mode 100644 index 00000000000..d2a4437ff84 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_iron_trim.json new file mode 100644 index 00000000000..28784096f0f --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_lapis_trim.json new file mode 100644 index 00000000000..5e3e9051d0d --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_netherite_trim.json new file mode 100644 index 00000000000..bf40bc97d14 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_quartz_trim.json new file mode 100644 index 00000000000..cf2cfcf3c3f --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_redstone_trim.json new file mode 100644 index 00000000000..079de6f5a5a --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_chestplate_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet.json index 00f4169c19d..465fd34e259 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/lapis_lazuli_helmet_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_helmet_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_helmet_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_helmet_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_helmet_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_helmet_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_helmet_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_helmet_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_helmet_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_helmet_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/lapis_lazuli/helmet" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_amethyst_trim.json new file mode 100644 index 00000000000..4e57de0f3b2 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/helmet", + "layer1": "minecraft:trims/items/helmet_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_copper_trim.json new file mode 100644 index 00000000000..b1a9b4f5f5d --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/helmet", + "layer1": "minecraft:trims/items/helmet_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_diamond_trim.json new file mode 100644 index 00000000000..f30a31c7da3 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/helmet", + "layer1": "minecraft:trims/items/helmet_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_emerald_trim.json new file mode 100644 index 00000000000..273eb17e6cc --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/helmet", + "layer1": "minecraft:trims/items/helmet_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_gold_trim.json new file mode 100644 index 00000000000..982347e34be --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/helmet", + "layer1": "minecraft:trims/items/helmet_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_iron_trim.json new file mode 100644 index 00000000000..e5f3be24e7c --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/helmet", + "layer1": "minecraft:trims/items/helmet_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_lapis_trim.json new file mode 100644 index 00000000000..6c3d773d4ec --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/helmet", + "layer1": "minecraft:trims/items/helmet_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_netherite_trim.json new file mode 100644 index 00000000000..22a428a4896 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/helmet", + "layer1": "minecraft:trims/items/helmet_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_quartz_trim.json new file mode 100644 index 00000000000..33209bcb427 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/helmet", + "layer1": "minecraft:trims/items/helmet_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_redstone_trim.json new file mode 100644 index 00000000000..aeef425b02f --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_helmet_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/helmet", + "layer1": "minecraft:trims/items/helmet_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings.json index b5d66786cc7..17edeb531a7 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/lapis_lazuli_leggings_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_leggings_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_leggings_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_leggings_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_leggings_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_leggings_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_leggings_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_leggings_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_leggings_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/lapis_lazuli_leggings_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/lapis_lazuli/leggings" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_amethyst_trim.json new file mode 100644 index 00000000000..84d91bb837e --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/leggings", + "layer1": "minecraft:trims/items/leggings_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_copper_trim.json new file mode 100644 index 00000000000..934c1a7d3f2 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/leggings", + "layer1": "minecraft:trims/items/leggings_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_diamond_trim.json new file mode 100644 index 00000000000..82c1aeb58ec --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/leggings", + "layer1": "minecraft:trims/items/leggings_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_emerald_trim.json new file mode 100644 index 00000000000..58c5e3fce51 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/leggings", + "layer1": "minecraft:trims/items/leggings_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_gold_trim.json new file mode 100644 index 00000000000..12c01ec3253 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/leggings", + "layer1": "minecraft:trims/items/leggings_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_iron_trim.json new file mode 100644 index 00000000000..e1e417e955d --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/leggings", + "layer1": "minecraft:trims/items/leggings_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_lapis_trim.json new file mode 100644 index 00000000000..5d30d772bd9 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/leggings", + "layer1": "minecraft:trims/items/leggings_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_netherite_trim.json new file mode 100644 index 00000000000..1cb33c299bd --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/leggings", + "layer1": "minecraft:trims/items/leggings_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_quartz_trim.json new file mode 100644 index 00000000000..62643500a57 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/leggings", + "layer1": "minecraft:trims/items/leggings_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_redstone_trim.json new file mode 100644 index 00000000000..9eafc423f74 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/lapis_lazuli_leggings_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/lapis_lazuli/leggings", + "layer1": "minecraft:trims/items/leggings_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots.json index 00e71b1ddda..1a0ba0df1d8 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/osmium_boots_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/osmium_boots_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/osmium_boots_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/osmium_boots_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/osmium_boots_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/osmium_boots_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/osmium_boots_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/osmium_boots_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/osmium_boots_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/osmium_boots_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/osmium/boots" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_amethyst_trim.json new file mode 100644 index 00000000000..a71793aece8 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/boots", + "layer1": "minecraft:trims/items/boots_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_copper_trim.json new file mode 100644 index 00000000000..2f15f990427 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/boots", + "layer1": "minecraft:trims/items/boots_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_diamond_trim.json new file mode 100644 index 00000000000..5a1a0095c4d --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/boots", + "layer1": "minecraft:trims/items/boots_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_emerald_trim.json new file mode 100644 index 00000000000..5f13c915cac --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/boots", + "layer1": "minecraft:trims/items/boots_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_gold_trim.json new file mode 100644 index 00000000000..503bb6a93db --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/boots", + "layer1": "minecraft:trims/items/boots_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_iron_trim.json new file mode 100644 index 00000000000..9e54a81bb12 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/boots", + "layer1": "minecraft:trims/items/boots_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_lapis_trim.json new file mode 100644 index 00000000000..1ef52256506 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/boots", + "layer1": "minecraft:trims/items/boots_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_netherite_trim.json new file mode 100644 index 00000000000..e84ddac445c --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/boots", + "layer1": "minecraft:trims/items/boots_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_quartz_trim.json new file mode 100644 index 00000000000..0c9065ba317 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/boots", + "layer1": "minecraft:trims/items/boots_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_redstone_trim.json new file mode 100644 index 00000000000..39a4f69d43b --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_boots_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/boots", + "layer1": "minecraft:trims/items/boots_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate.json index 4755b8a39ab..2cc6219d169 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/osmium_chestplate_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/osmium_chestplate_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/osmium_chestplate_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/osmium_chestplate_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/osmium_chestplate_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/osmium_chestplate_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/osmium_chestplate_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/osmium_chestplate_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/osmium_chestplate_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/osmium_chestplate_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/osmium/chestplate" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_amethyst_trim.json new file mode 100644 index 00000000000..9e62dbde20f --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_copper_trim.json new file mode 100644 index 00000000000..de6d7bba6b4 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_diamond_trim.json new file mode 100644 index 00000000000..98fee9955d0 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_emerald_trim.json new file mode 100644 index 00000000000..55f0346db8e --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_gold_trim.json new file mode 100644 index 00000000000..df4ee8cefd9 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_iron_trim.json new file mode 100644 index 00000000000..e82c416797b --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_lapis_trim.json new file mode 100644 index 00000000000..42d18f54927 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_netherite_trim.json new file mode 100644 index 00000000000..84a793b4b56 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_quartz_trim.json new file mode 100644 index 00000000000..6a9e80e1a8f --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_redstone_trim.json new file mode 100644 index 00000000000..bd5d00426e6 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_chestplate_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet.json index 9610e63282e..38036b67f4b 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/osmium_helmet_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/osmium_helmet_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/osmium_helmet_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/osmium_helmet_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/osmium_helmet_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/osmium_helmet_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/osmium_helmet_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/osmium_helmet_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/osmium_helmet_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/osmium_helmet_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/osmium/helmet" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_amethyst_trim.json new file mode 100644 index 00000000000..56d2c4d2714 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/helmet", + "layer1": "minecraft:trims/items/helmet_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_copper_trim.json new file mode 100644 index 00000000000..b4f4ad706a4 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/helmet", + "layer1": "minecraft:trims/items/helmet_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_diamond_trim.json new file mode 100644 index 00000000000..4936f1c7705 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/helmet", + "layer1": "minecraft:trims/items/helmet_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_emerald_trim.json new file mode 100644 index 00000000000..e4312b7847f --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/helmet", + "layer1": "minecraft:trims/items/helmet_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_gold_trim.json new file mode 100644 index 00000000000..190adb21631 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/helmet", + "layer1": "minecraft:trims/items/helmet_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_iron_trim.json new file mode 100644 index 00000000000..d73defa755d --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/helmet", + "layer1": "minecraft:trims/items/helmet_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_lapis_trim.json new file mode 100644 index 00000000000..5e226303f43 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/helmet", + "layer1": "minecraft:trims/items/helmet_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_netherite_trim.json new file mode 100644 index 00000000000..d55d7907aca --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/helmet", + "layer1": "minecraft:trims/items/helmet_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_quartz_trim.json new file mode 100644 index 00000000000..28c1fb8e9a8 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/helmet", + "layer1": "minecraft:trims/items/helmet_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_redstone_trim.json new file mode 100644 index 00000000000..758fb59597a --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_helmet_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/helmet", + "layer1": "minecraft:trims/items/helmet_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings.json index 68d23dbe491..36f8922a7c6 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/osmium_leggings_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/osmium_leggings_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/osmium_leggings_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/osmium_leggings_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/osmium_leggings_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/osmium_leggings_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/osmium_leggings_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/osmium_leggings_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/osmium_leggings_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/osmium_leggings_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/osmium/leggings" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_amethyst_trim.json new file mode 100644 index 00000000000..6cd32014139 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/leggings", + "layer1": "minecraft:trims/items/leggings_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_copper_trim.json new file mode 100644 index 00000000000..59f872527d5 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/leggings", + "layer1": "minecraft:trims/items/leggings_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_diamond_trim.json new file mode 100644 index 00000000000..b2055b266f9 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/leggings", + "layer1": "minecraft:trims/items/leggings_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_emerald_trim.json new file mode 100644 index 00000000000..582f34b6b3e --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/leggings", + "layer1": "minecraft:trims/items/leggings_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_gold_trim.json new file mode 100644 index 00000000000..8c56e931d3e --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/leggings", + "layer1": "minecraft:trims/items/leggings_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_iron_trim.json new file mode 100644 index 00000000000..26d7e01c279 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/leggings", + "layer1": "minecraft:trims/items/leggings_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_lapis_trim.json new file mode 100644 index 00000000000..90a16822376 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/leggings", + "layer1": "minecraft:trims/items/leggings_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_netherite_trim.json new file mode 100644 index 00000000000..dbab3fc8062 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/leggings", + "layer1": "minecraft:trims/items/leggings_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_quartz_trim.json new file mode 100644 index 00000000000..79f415102fb --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/leggings", + "layer1": "minecraft:trims/items/leggings_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_redstone_trim.json new file mode 100644 index 00000000000..4cfbc1c1b19 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/osmium_leggings_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/osmium/leggings", + "layer1": "minecraft:trims/items/leggings_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots.json index 7b29998a65a..6a1e0132801 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/refined_glowstone_boots_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_boots_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_boots_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_boots_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_boots_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_boots_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_boots_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_boots_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_boots_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_boots_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/refined_glowstone/boots" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_amethyst_trim.json new file mode 100644 index 00000000000..b4352f9f2d0 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/boots", + "layer1": "minecraft:trims/items/boots_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_copper_trim.json new file mode 100644 index 00000000000..c6d5b3b879b --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/boots", + "layer1": "minecraft:trims/items/boots_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_diamond_trim.json new file mode 100644 index 00000000000..d50ae791616 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/boots", + "layer1": "minecraft:trims/items/boots_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_emerald_trim.json new file mode 100644 index 00000000000..d6c7a1cd2c7 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/boots", + "layer1": "minecraft:trims/items/boots_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_gold_trim.json new file mode 100644 index 00000000000..4d29a44515e --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/boots", + "layer1": "minecraft:trims/items/boots_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_iron_trim.json new file mode 100644 index 00000000000..e117ed83d65 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/boots", + "layer1": "minecraft:trims/items/boots_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_lapis_trim.json new file mode 100644 index 00000000000..593f48ac2b2 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/boots", + "layer1": "minecraft:trims/items/boots_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_netherite_trim.json new file mode 100644 index 00000000000..1fbe67e270d --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/boots", + "layer1": "minecraft:trims/items/boots_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_quartz_trim.json new file mode 100644 index 00000000000..cf472ed7ed1 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/boots", + "layer1": "minecraft:trims/items/boots_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_redstone_trim.json new file mode 100644 index 00000000000..7aa8ff29b80 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_boots_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/boots", + "layer1": "minecraft:trims/items/boots_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate.json index 7ebfcf1b28c..13332d5ccd6 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/refined_glowstone_chestplate_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_chestplate_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_chestplate_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_chestplate_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_chestplate_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_chestplate_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_chestplate_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_chestplate_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_chestplate_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_chestplate_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/refined_glowstone/chestplate" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_amethyst_trim.json new file mode 100644 index 00000000000..bd34f471e31 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_copper_trim.json new file mode 100644 index 00000000000..266e73bb607 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_diamond_trim.json new file mode 100644 index 00000000000..47a77ea6832 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_emerald_trim.json new file mode 100644 index 00000000000..f305df82083 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_gold_trim.json new file mode 100644 index 00000000000..8cce0e10ce4 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_iron_trim.json new file mode 100644 index 00000000000..8fbcdb5ccb8 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_lapis_trim.json new file mode 100644 index 00000000000..e64950eede1 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_netherite_trim.json new file mode 100644 index 00000000000..242de89a900 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_quartz_trim.json new file mode 100644 index 00000000000..d27b1b2dcb1 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_redstone_trim.json new file mode 100644 index 00000000000..7862a1da06a --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_chestplate_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet.json index 763f41e6b2e..36dbc848e1b 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/refined_glowstone_helmet_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_helmet_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_helmet_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_helmet_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_helmet_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_helmet_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_helmet_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_helmet_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_helmet_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_helmet_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/refined_glowstone/helmet" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_amethyst_trim.json new file mode 100644 index 00000000000..9b789facbf9 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/helmet", + "layer1": "minecraft:trims/items/helmet_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_copper_trim.json new file mode 100644 index 00000000000..8ea69c20eb1 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/helmet", + "layer1": "minecraft:trims/items/helmet_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_diamond_trim.json new file mode 100644 index 00000000000..53b2f1e752a --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/helmet", + "layer1": "minecraft:trims/items/helmet_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_emerald_trim.json new file mode 100644 index 00000000000..b97b025b297 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/helmet", + "layer1": "minecraft:trims/items/helmet_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_gold_trim.json new file mode 100644 index 00000000000..04a93d8d45f --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/helmet", + "layer1": "minecraft:trims/items/helmet_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_iron_trim.json new file mode 100644 index 00000000000..dfb7e254830 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/helmet", + "layer1": "minecraft:trims/items/helmet_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_lapis_trim.json new file mode 100644 index 00000000000..68debb440fb --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/helmet", + "layer1": "minecraft:trims/items/helmet_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_netherite_trim.json new file mode 100644 index 00000000000..bb9b96f1445 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/helmet", + "layer1": "minecraft:trims/items/helmet_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_quartz_trim.json new file mode 100644 index 00000000000..ef46ae71a27 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/helmet", + "layer1": "minecraft:trims/items/helmet_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_redstone_trim.json new file mode 100644 index 00000000000..682b7a21ec6 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_helmet_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/helmet", + "layer1": "minecraft:trims/items/helmet_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings.json index ff87cc5e457..18b3c47f7d8 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/refined_glowstone_leggings_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_leggings_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_leggings_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_leggings_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_leggings_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_leggings_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_leggings_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_leggings_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_leggings_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/refined_glowstone_leggings_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/refined_glowstone/leggings" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_amethyst_trim.json new file mode 100644 index 00000000000..81ecff071fc --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/leggings", + "layer1": "minecraft:trims/items/leggings_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_copper_trim.json new file mode 100644 index 00000000000..a5396865396 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/leggings", + "layer1": "minecraft:trims/items/leggings_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_diamond_trim.json new file mode 100644 index 00000000000..345a1286dda --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/leggings", + "layer1": "minecraft:trims/items/leggings_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_emerald_trim.json new file mode 100644 index 00000000000..f630fa27231 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/leggings", + "layer1": "minecraft:trims/items/leggings_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_gold_trim.json new file mode 100644 index 00000000000..01670a01808 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/leggings", + "layer1": "minecraft:trims/items/leggings_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_iron_trim.json new file mode 100644 index 00000000000..3626ffd408a --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/leggings", + "layer1": "minecraft:trims/items/leggings_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_lapis_trim.json new file mode 100644 index 00000000000..d1cbc69fa77 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/leggings", + "layer1": "minecraft:trims/items/leggings_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_netherite_trim.json new file mode 100644 index 00000000000..12135e8660e --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/leggings", + "layer1": "minecraft:trims/items/leggings_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_quartz_trim.json new file mode 100644 index 00000000000..67fe686cd4a --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/leggings", + "layer1": "minecraft:trims/items/leggings_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_redstone_trim.json new file mode 100644 index 00000000000..87b3dcb3857 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_glowstone_leggings_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_glowstone/leggings", + "layer1": "minecraft:trims/items/leggings_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots.json index 0160b784f15..cd6b39b0625 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/refined_obsidian_boots_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_boots_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_boots_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_boots_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_boots_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_boots_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_boots_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_boots_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_boots_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_boots_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/refined_obsidian/boots" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_amethyst_trim.json new file mode 100644 index 00000000000..31d4e161885 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/boots", + "layer1": "minecraft:trims/items/boots_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_copper_trim.json new file mode 100644 index 00000000000..b099cf588a2 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/boots", + "layer1": "minecraft:trims/items/boots_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_diamond_trim.json new file mode 100644 index 00000000000..bca992dcfd4 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/boots", + "layer1": "minecraft:trims/items/boots_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_emerald_trim.json new file mode 100644 index 00000000000..a577fe59e5a --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/boots", + "layer1": "minecraft:trims/items/boots_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_gold_trim.json new file mode 100644 index 00000000000..e0cf8313ee6 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/boots", + "layer1": "minecraft:trims/items/boots_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_iron_trim.json new file mode 100644 index 00000000000..4f7efd71e8d --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/boots", + "layer1": "minecraft:trims/items/boots_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_lapis_trim.json new file mode 100644 index 00000000000..c65f9360e92 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/boots", + "layer1": "minecraft:trims/items/boots_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_netherite_trim.json new file mode 100644 index 00000000000..7c069ae00e7 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/boots", + "layer1": "minecraft:trims/items/boots_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_quartz_trim.json new file mode 100644 index 00000000000..a7d706a726f --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/boots", + "layer1": "minecraft:trims/items/boots_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_redstone_trim.json new file mode 100644 index 00000000000..838de06c3e9 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_boots_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/boots", + "layer1": "minecraft:trims/items/boots_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate.json index 333e93f5c73..adf843ebbd5 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/refined_obsidian_chestplate_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_chestplate_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_chestplate_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_chestplate_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_chestplate_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_chestplate_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_chestplate_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_chestplate_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_chestplate_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_chestplate_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/refined_obsidian/chestplate" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_amethyst_trim.json new file mode 100644 index 00000000000..6a63ac245c6 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_copper_trim.json new file mode 100644 index 00000000000..e1c0764235b --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_diamond_trim.json new file mode 100644 index 00000000000..2e6ae73b6c1 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_emerald_trim.json new file mode 100644 index 00000000000..29d19f2414b --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_gold_trim.json new file mode 100644 index 00000000000..6da0c4bfaee --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_iron_trim.json new file mode 100644 index 00000000000..4a5861df4f4 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_lapis_trim.json new file mode 100644 index 00000000000..8550e45cb94 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_netherite_trim.json new file mode 100644 index 00000000000..de665caf0ea --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_quartz_trim.json new file mode 100644 index 00000000000..89f93e74a0d --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_redstone_trim.json new file mode 100644 index 00000000000..eb01c4a57b1 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_chestplate_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet.json index 7b8d8185b3e..6817ea3729e 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/refined_obsidian_helmet_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_helmet_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_helmet_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_helmet_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_helmet_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_helmet_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_helmet_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_helmet_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_helmet_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_helmet_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/refined_obsidian/helmet" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_amethyst_trim.json new file mode 100644 index 00000000000..e1904bbdb88 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/helmet", + "layer1": "minecraft:trims/items/helmet_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_copper_trim.json new file mode 100644 index 00000000000..37c0eef480a --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/helmet", + "layer1": "minecraft:trims/items/helmet_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_diamond_trim.json new file mode 100644 index 00000000000..f6d714b2048 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/helmet", + "layer1": "minecraft:trims/items/helmet_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_emerald_trim.json new file mode 100644 index 00000000000..3b5bd17c2e9 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/helmet", + "layer1": "minecraft:trims/items/helmet_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_gold_trim.json new file mode 100644 index 00000000000..5da1545e236 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/helmet", + "layer1": "minecraft:trims/items/helmet_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_iron_trim.json new file mode 100644 index 00000000000..700325e8ce1 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/helmet", + "layer1": "minecraft:trims/items/helmet_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_lapis_trim.json new file mode 100644 index 00000000000..203f5815fd7 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/helmet", + "layer1": "minecraft:trims/items/helmet_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_netherite_trim.json new file mode 100644 index 00000000000..c53f48802ca --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/helmet", + "layer1": "minecraft:trims/items/helmet_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_quartz_trim.json new file mode 100644 index 00000000000..0aa8f944aea --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/helmet", + "layer1": "minecraft:trims/items/helmet_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_redstone_trim.json new file mode 100644 index 00000000000..75780332644 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_helmet_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/helmet", + "layer1": "minecraft:trims/items/helmet_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings.json index c55bb330e49..3c6a8240b81 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/refined_obsidian_leggings_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_leggings_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_leggings_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_leggings_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_leggings_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_leggings_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_leggings_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_leggings_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_leggings_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/refined_obsidian_leggings_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/refined_obsidian/leggings" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_amethyst_trim.json new file mode 100644 index 00000000000..d710964b4db --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/leggings", + "layer1": "minecraft:trims/items/leggings_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_copper_trim.json new file mode 100644 index 00000000000..d9ce1b512e1 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/leggings", + "layer1": "minecraft:trims/items/leggings_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_diamond_trim.json new file mode 100644 index 00000000000..f70096f9f30 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/leggings", + "layer1": "minecraft:trims/items/leggings_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_emerald_trim.json new file mode 100644 index 00000000000..1862841cfdf --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/leggings", + "layer1": "minecraft:trims/items/leggings_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_gold_trim.json new file mode 100644 index 00000000000..602c2f799b8 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/leggings", + "layer1": "minecraft:trims/items/leggings_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_iron_trim.json new file mode 100644 index 00000000000..eb292d68240 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/leggings", + "layer1": "minecraft:trims/items/leggings_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_lapis_trim.json new file mode 100644 index 00000000000..1e1be35175b --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/leggings", + "layer1": "minecraft:trims/items/leggings_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_netherite_trim.json new file mode 100644 index 00000000000..e1a592b21e0 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/leggings", + "layer1": "minecraft:trims/items/leggings_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_quartz_trim.json new file mode 100644 index 00000000000..a58a2de9213 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/leggings", + "layer1": "minecraft:trims/items/leggings_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_redstone_trim.json new file mode 100644 index 00000000000..714d98e0060 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/refined_obsidian_leggings_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/refined_obsidian/leggings", + "layer1": "minecraft:trims/items/leggings_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots.json index cf600118120..b054265699e 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/steel_boots_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/steel_boots_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/steel_boots_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/steel_boots_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/steel_boots_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/steel_boots_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/steel_boots_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/steel_boots_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/steel_boots_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/steel_boots_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/steel/boots" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_amethyst_trim.json new file mode 100644 index 00000000000..6490ca3f4a5 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/boots", + "layer1": "minecraft:trims/items/boots_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_copper_trim.json new file mode 100644 index 00000000000..438c994510f --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/boots", + "layer1": "minecraft:trims/items/boots_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_diamond_trim.json new file mode 100644 index 00000000000..beca2720c09 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/boots", + "layer1": "minecraft:trims/items/boots_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_emerald_trim.json new file mode 100644 index 00000000000..53c06cef221 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/boots", + "layer1": "minecraft:trims/items/boots_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_gold_trim.json new file mode 100644 index 00000000000..664abc3803b --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/boots", + "layer1": "minecraft:trims/items/boots_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_iron_trim.json new file mode 100644 index 00000000000..c3fbf611fa7 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/boots", + "layer1": "minecraft:trims/items/boots_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_lapis_trim.json new file mode 100644 index 00000000000..b1f1e250c36 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/boots", + "layer1": "minecraft:trims/items/boots_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_netherite_trim.json new file mode 100644 index 00000000000..6e2450830bb --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/boots", + "layer1": "minecraft:trims/items/boots_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_quartz_trim.json new file mode 100644 index 00000000000..3f2c45ffb71 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/boots", + "layer1": "minecraft:trims/items/boots_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_redstone_trim.json new file mode 100644 index 00000000000..e87dac71677 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_boots_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/boots", + "layer1": "minecraft:trims/items/boots_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate.json index fba79babd0f..8d46dc12178 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/steel_chestplate_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/steel_chestplate_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/steel_chestplate_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/steel_chestplate_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/steel_chestplate_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/steel_chestplate_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/steel_chestplate_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/steel_chestplate_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/steel_chestplate_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/steel_chestplate_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/steel/chestplate" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_amethyst_trim.json new file mode 100644 index 00000000000..05b7a061690 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_copper_trim.json new file mode 100644 index 00000000000..367a8ba0f2a --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_diamond_trim.json new file mode 100644 index 00000000000..9f2ac825ef0 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_emerald_trim.json new file mode 100644 index 00000000000..25af0ef5a9b --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_gold_trim.json new file mode 100644 index 00000000000..a10d8620bdd --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_iron_trim.json new file mode 100644 index 00000000000..9c16c7cb335 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_lapis_trim.json new file mode 100644 index 00000000000..e85623d11db --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_netherite_trim.json new file mode 100644 index 00000000000..891bdf4b305 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_quartz_trim.json new file mode 100644 index 00000000000..b0573b55377 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_redstone_trim.json new file mode 100644 index 00000000000..5bbf65a7b17 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_chestplate_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet.json index e56dbfcdebb..b48ec9fea67 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/steel_helmet_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/steel_helmet_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/steel_helmet_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/steel_helmet_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/steel_helmet_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/steel_helmet_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/steel_helmet_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/steel_helmet_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/steel_helmet_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/steel_helmet_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/steel/helmet" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_amethyst_trim.json new file mode 100644 index 00000000000..48045861fd5 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/helmet", + "layer1": "minecraft:trims/items/helmet_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_copper_trim.json new file mode 100644 index 00000000000..35f1ff6b12f --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/helmet", + "layer1": "minecraft:trims/items/helmet_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_diamond_trim.json new file mode 100644 index 00000000000..542c6505c40 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/helmet", + "layer1": "minecraft:trims/items/helmet_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_emerald_trim.json new file mode 100644 index 00000000000..b9c60d18e68 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/helmet", + "layer1": "minecraft:trims/items/helmet_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_gold_trim.json new file mode 100644 index 00000000000..a9c255dcdcd --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/helmet", + "layer1": "minecraft:trims/items/helmet_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_iron_trim.json new file mode 100644 index 00000000000..4c7f8dd919c --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/helmet", + "layer1": "minecraft:trims/items/helmet_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_lapis_trim.json new file mode 100644 index 00000000000..89ee42add4f --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/helmet", + "layer1": "minecraft:trims/items/helmet_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_netherite_trim.json new file mode 100644 index 00000000000..f0afa628ef8 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/helmet", + "layer1": "minecraft:trims/items/helmet_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_quartz_trim.json new file mode 100644 index 00000000000..7c7873c3280 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/helmet", + "layer1": "minecraft:trims/items/helmet_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_redstone_trim.json new file mode 100644 index 00000000000..2a269471bbe --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_helmet_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/helmet", + "layer1": "minecraft:trims/items/helmet_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings.json index d229f7e809a..63b23f01fe3 100644 --- a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings.json +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings.json @@ -1,5 +1,67 @@ { "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "mekanismtools:item/steel_leggings_quartz_trim", + "predicate": { + "minecraft:trim_type": 0.1 + } + }, + { + "model": "mekanismtools:item/steel_leggings_iron_trim", + "predicate": { + "minecraft:trim_type": 0.2 + } + }, + { + "model": "mekanismtools:item/steel_leggings_netherite_trim", + "predicate": { + "minecraft:trim_type": 0.3 + } + }, + { + "model": "mekanismtools:item/steel_leggings_redstone_trim", + "predicate": { + "minecraft:trim_type": 0.4 + } + }, + { + "model": "mekanismtools:item/steel_leggings_copper_trim", + "predicate": { + "minecraft:trim_type": 0.5 + } + }, + { + "model": "mekanismtools:item/steel_leggings_gold_trim", + "predicate": { + "minecraft:trim_type": 0.6 + } + }, + { + "model": "mekanismtools:item/steel_leggings_emerald_trim", + "predicate": { + "minecraft:trim_type": 0.7 + } + }, + { + "model": "mekanismtools:item/steel_leggings_diamond_trim", + "predicate": { + "minecraft:trim_type": 0.8 + } + }, + { + "model": "mekanismtools:item/steel_leggings_lapis_trim", + "predicate": { + "minecraft:trim_type": 0.9 + } + }, + { + "model": "mekanismtools:item/steel_leggings_amethyst_trim", + "predicate": { + "minecraft:trim_type": 1.0 + } + } + ], "textures": { "layer0": "mekanismtools:item/steel/leggings" } diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_amethyst_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_amethyst_trim.json new file mode 100644 index 00000000000..87291b36eff --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/leggings", + "layer1": "minecraft:trims/items/leggings_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_copper_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_copper_trim.json new file mode 100644 index 00000000000..7b41511f427 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/leggings", + "layer1": "minecraft:trims/items/leggings_trim_copper" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_diamond_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_diamond_trim.json new file mode 100644 index 00000000000..978beec44d0 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/leggings", + "layer1": "minecraft:trims/items/leggings_trim_diamond" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_emerald_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_emerald_trim.json new file mode 100644 index 00000000000..fdd1641d572 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/leggings", + "layer1": "minecraft:trims/items/leggings_trim_emerald" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_gold_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_gold_trim.json new file mode 100644 index 00000000000..aa51869a95e --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/leggings", + "layer1": "minecraft:trims/items/leggings_trim_gold" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_iron_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_iron_trim.json new file mode 100644 index 00000000000..3088450b6fe --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/leggings", + "layer1": "minecraft:trims/items/leggings_trim_iron" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_lapis_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_lapis_trim.json new file mode 100644 index 00000000000..a9da8ee402b --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/leggings", + "layer1": "minecraft:trims/items/leggings_trim_lapis" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_netherite_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_netherite_trim.json new file mode 100644 index 00000000000..fca723d2b1c --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/leggings", + "layer1": "minecraft:trims/items/leggings_trim_netherite" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_quartz_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_quartz_trim.json new file mode 100644 index 00000000000..1c9226512f0 --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/leggings", + "layer1": "minecraft:trims/items/leggings_trim_quartz" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_redstone_trim.json b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_redstone_trim.json new file mode 100644 index 00000000000..14cf3e13e9a --- /dev/null +++ b/src/datagen/generated/mekanismtools/assets/mekanismtools/models/item/steel_leggings_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mekanismtools:item/steel/leggings", + "layer1": "minecraft:trims/items/leggings_trim_redstone" + } +} \ No newline at end of file diff --git a/src/datagen/generated/mekanismtools/data/minecraft/tags/items/trimmable_armor.json b/src/datagen/generated/mekanismtools/data/minecraft/tags/items/trimmable_armor.json new file mode 100644 index 00000000000..64036ff0fcd --- /dev/null +++ b/src/datagen/generated/mekanismtools/data/minecraft/tags/items/trimmable_armor.json @@ -0,0 +1,28 @@ +{ + "values": [ + "mekanismtools:bronze_helmet", + "mekanismtools:bronze_chestplate", + "mekanismtools:bronze_leggings", + "mekanismtools:bronze_boots", + "mekanismtools:lapis_lazuli_helmet", + "mekanismtools:lapis_lazuli_chestplate", + "mekanismtools:lapis_lazuli_leggings", + "mekanismtools:lapis_lazuli_boots", + "mekanismtools:osmium_helmet", + "mekanismtools:osmium_chestplate", + "mekanismtools:osmium_leggings", + "mekanismtools:osmium_boots", + "mekanismtools:refined_glowstone_helmet", + "mekanismtools:refined_glowstone_chestplate", + "mekanismtools:refined_glowstone_leggings", + "mekanismtools:refined_glowstone_boots", + "mekanismtools:refined_obsidian_helmet", + "mekanismtools:refined_obsidian_chestplate", + "mekanismtools:refined_obsidian_leggings", + "mekanismtools:refined_obsidian_boots", + "mekanismtools:steel_helmet", + "mekanismtools:steel_chestplate", + "mekanismtools:steel_leggings", + "mekanismtools:steel_boots" + ] +} \ No newline at end of file diff --git a/src/datagen/generators/java/mekanism/generators/common/GeneratorsTagProvider.java b/src/datagen/generators/java/mekanism/generators/common/GeneratorsTagProvider.java index 283b6aa6e35..3d914b7fb3f 100644 --- a/src/datagen/generators/java/mekanism/generators/common/GeneratorsTagProvider.java +++ b/src/datagen/generators/java/mekanism/generators/common/GeneratorsTagProvider.java @@ -6,6 +6,7 @@ import mekanism.common.registration.impl.FluidRegistryObject; import mekanism.common.registration.impl.TileEntityTypeRegistryObject; import mekanism.common.tag.BaseTagProvider; +import mekanism.common.tag.IntrinsicMekanismTagBuilder; import mekanism.common.tag.MekanismTagProvider; import mekanism.common.tags.MekanismTags; import mekanism.generators.common.registries.GeneratorsBlocks; @@ -15,6 +16,7 @@ import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.tags.BlockTags; +import net.minecraft.world.level.block.Block; import net.minecraftforge.common.Tags; import net.minecraftforge.common.data.ExistingFileHelper; import org.jetbrains.annotations.Nullable; @@ -81,9 +83,11 @@ private void addFluids() { addToTag(GeneratorTags.Fluids.DEUTERIUM, GeneratorsFluids.DEUTERIUM); addToTag(GeneratorTags.Fluids.FUSION_FUEL, GeneratorsFluids.FUSION_FUEL); addToTag(GeneratorTags.Fluids.TRITIUM, GeneratorsFluids.TRITIUM); - //Prevent all our fluids from being duped by create + IntrinsicMekanismTagBuilder replaceableBuilder = getBlockBuilder(BlockTags.REPLACEABLE); for (FluidRegistryObject fluid : GeneratorsFluids.FLUIDS.getAllFluids()) { + //Prevent all our fluids from being duped by create addToTag(MekanismTagProvider.CREATE_NO_INFINITE_FLUID, fluid); + replaceableBuilder.add(fluid.getBlock()); } } diff --git a/src/datagen/main/java/mekanism/client/model/BaseItemModelProvider.java b/src/datagen/main/java/mekanism/client/model/BaseItemModelProvider.java index ee0e4b8327a..c4a86ff364d 100644 --- a/src/datagen/main/java/mekanism/client/model/BaseItemModelProvider.java +++ b/src/datagen/main/java/mekanism/client/model/BaseItemModelProvider.java @@ -1,23 +1,36 @@ package mekanism.client.model; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.BiConsumer; import mekanism.api.providers.IItemProvider; import mekanism.common.item.ItemModule; +import mekanism.common.lib.FieldReflectionHelper; import mekanism.common.registration.impl.FluidDeferredRegister; import mekanism.common.registration.impl.FluidRegistryObject; import mekanism.common.registration.impl.ItemDeferredRegister; import mekanism.common.util.RegistryUtils; import net.minecraft.data.PackOutput; +import net.minecraft.data.models.ItemModelGenerators; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.PackType; +import net.minecraft.world.item.ArmorItem; import net.minecraft.world.item.Item; import net.minecraftforge.client.model.generators.ItemModelBuilder; import net.minecraftforge.client.model.generators.ItemModelProvider; +import net.minecraftforge.client.model.generators.ModelBuilder; import net.minecraftforge.client.model.generators.loaders.DynamicFluidContainerModelBuilder; import net.minecraftforge.common.data.ExistingFileHelper; import org.jetbrains.annotations.NotNull; public abstract class BaseItemModelProvider extends ItemModelProvider { + @SuppressWarnings("rawtypes") + private final FieldReflectionHelper> MODEL_TEXTURES = new FieldReflectionHelper<>(ModelBuilder.class, "textures", HashMap::new); + private static final TrimModelDataHelper TRIM_HELPER = new TrimModelDataHelper<>(); + protected BaseItemModelProvider(PackOutput output, String modid, ExistingFileHelper existingFileHelper) { super(output, modid, existingFileHelper); } @@ -91,10 +104,53 @@ protected ItemModelBuilder handheld(IItemProvider itemProvider, ResourceLocation return withExistingParent(itemProvider.getName(), "item/handheld").texture("layer0", texture); } + protected ItemModelBuilder armorWithTrim(IItemProvider itemProvider, ResourceLocation texture) { + ItemModelBuilder builder = generated(itemProvider, texture); + ArmorItem.Type type = ((ArmorItem) itemProvider.asItem()).getType(); + TRIM_HELPER.forEachTrim((trimId, itemModelIndex) -> { + ItemModelBuilder override = withExistingParent(builder.getLocation().withSuffix("_" + trimId + "_trim").getPath(), "item/generated") + .texture("layer0", texture); + //Directly add the layer1 to the texture map as the file doesn't actually exist + MODEL_TEXTURES.getValue(override).put("layer1", new ResourceLocation(type.getName() + "_trim_" + trimId).withPrefix("trims/items/").toString()); + builder.override() + .predicate(ItemModelGenerators.TRIM_TYPE_PREDICATE_ID, itemModelIndex) + .model(override); + } + ); + return builder; + } + //Note: This isn't the best way to do this in terms of model file validation, but it works protected void registerBucket(FluidRegistryObject fluidRO) { withExistingParent(RegistryUtils.getPath(fluidRO.getBucket()), new ResourceLocation("forge", "item/bucket")) .customLoader(DynamicFluidContainerModelBuilder::begin) .fluid(fluidRO.getStillFluid()); } + + private static class TrimModelDataHelper { + + private final FieldReflectionHelper> generatedTrimModels = new FieldReflectionHelper<>(ItemModelGenerators.class, "f_265952_", Collections::emptyList); + private final FieldReflectionHelper name; + private final FieldReflectionHelper itemModelIndex; + + public TrimModelDataHelper() { + Class tmdClass; + try { + tmdClass = (Class) Class.forName("net.minecraft.data.models.ItemModelGenerators$TrimModelData"); + } catch (ClassNotFoundException e) { + throw new RuntimeException(e); + } + name = new FieldReflectionHelper<>(tmdClass, "f_265890_", () -> null); + itemModelIndex = new FieldReflectionHelper<>(tmdClass, "f_265849_", () -> null); + } + + public void forEachTrim(BiConsumer consumer) { + List trims = generatedTrimModels.getValue(null); + for (TMD_CLASS trim : trims) { + String trimName = name.getValue(trim); + Float modelIndex = itemModelIndex.getValue(trim); + consumer.accept(trimName, modelIndex); + } + } + } } \ No newline at end of file diff --git a/src/datagen/main/java/mekanism/common/recipe/RecipeProviderUtil.java b/src/datagen/main/java/mekanism/common/recipe/RecipeProviderUtil.java index 743072946c6..d85de8377c2 100644 --- a/src/datagen/main/java/mekanism/common/recipe/RecipeProviderUtil.java +++ b/src/datagen/main/java/mekanism/common/recipe/RecipeProviderUtil.java @@ -46,12 +46,12 @@ public static void addSmeltingBlastingRecipes(Consumer consumer, } public static void addPrecisionSawmillWoodTypeRecipes(Consumer consumer, String basePath, ItemLike planks, @Nullable ItemLike boat, - @Nullable ItemLike chestBoat, ItemLike door, ItemLike fenceGate, TagKey log, ItemLike pressurePlate, ItemLike trapdoor, String name) { + @Nullable ItemLike chestBoat, ItemLike door, ItemLike fenceGate, @Nullable TagKey log, ItemLike pressurePlate, ItemLike trapdoor, String name) { addPrecisionSawmillWoodTypeRecipes(consumer, basePath, planks, boat, chestBoat, door, fenceGate, log, pressurePlate, trapdoor, name, null); } public static void addPrecisionSawmillWoodTypeRecipes(Consumer consumer, String basePath, ItemLike planks, @Nullable ItemLike boat, - @Nullable ItemLike chestBoat, ItemLike door, ItemLike fenceGate, TagKey log, ItemLike pressurePlate, ItemLike trapdoor, String name, + @Nullable ItemLike chestBoat, ItemLike door, ItemLike fenceGate, @Nullable TagKey log, ItemLike pressurePlate, ItemLike trapdoor, String name, @Nullable ICondition condition) { if (boat != null) { //Boat @@ -81,13 +81,15 @@ public static void addPrecisionSawmillWoodTypeRecipes(Consumer c new ItemStack(Items.STICK, 4), 1 ), basePath + "fence_gate/" + name, condition); - //Log - build(consumer, SawmillRecipeBuilder.sawing( - IngredientCreatorAccess.item().from(log), - new ItemStack(planks, 6), - MekanismItems.SAWDUST.getItemStack(), - 0.25 - ), basePath + "log/" + name, condition); + if (log != null) { + //Log + build(consumer, SawmillRecipeBuilder.sawing( + IngredientCreatorAccess.item().from(log), + new ItemStack(planks, 6), + MekanismItems.SAWDUST.getItemStack(), + 0.25 + ), basePath + "log/" + name, condition); + } //Pressure plate build(consumer, SawmillRecipeBuilder.sawing( IngredientCreatorAccess.item().from(pressurePlate), diff --git a/src/datagen/main/java/mekanism/common/recipe/impl/EnrichingRecipeProvider.java b/src/datagen/main/java/mekanism/common/recipe/impl/EnrichingRecipeProvider.java index 2896ba9f1b4..2c1373cf67c 100644 --- a/src/datagen/main/java/mekanism/common/recipe/impl/EnrichingRecipeProvider.java +++ b/src/datagen/main/java/mekanism/common/recipe/impl/EnrichingRecipeProvider.java @@ -412,6 +412,11 @@ private void addEnrichingDyeRecipes(Consumer consumer, String ba )), new ItemStack(Items.RED_DYE, 2) ).build(consumer, Mekanism.rl(basePath + "small_red")); + //Cyan + ItemStackToItemStackRecipeBuilder.enriching( + IngredientCreatorAccess.item().from(Blocks.PITCHER_PLANT), + new ItemStack(Items.CYAN_DYE, 4) + ).build(consumer, Mekanism.rl(basePath + "large_cyan")); //Green ItemStackToItemStackRecipeBuilder.enriching( IngredientCreatorAccess.item().from(Blocks.CACTUS), @@ -432,7 +437,10 @@ private void addEnrichingDyeRecipes(Consumer consumer, String ba new ItemStack(Items.PINK_DYE, 4) ).build(consumer, Mekanism.rl(basePath + "large_pink")); ItemStackToItemStackRecipeBuilder.enriching( - IngredientCreatorAccess.item().from(Blocks.PINK_TULIP), + IngredientCreatorAccess.item().from(Ingredient.of( + Blocks.PINK_TULIP, + Blocks.PINK_PETALS + )), new ItemStack(Items.PINK_DYE, 2) ).build(consumer, Mekanism.rl(basePath + "small_pink")); //Lime @@ -465,7 +473,10 @@ private void addEnrichingDyeRecipes(Consumer consumer, String ba ).build(consumer, Mekanism.rl(basePath + "small_magenta")); //Orange ItemStackToItemStackRecipeBuilder.enriching( - IngredientCreatorAccess.item().from(Blocks.ORANGE_TULIP), + IngredientCreatorAccess.item().from(Ingredient.of( + Blocks.ORANGE_TULIP, + Blocks.TORCHFLOWER + )), new ItemStack(Items.ORANGE_DYE, 2) ).build(consumer, Mekanism.rl(basePath + "orange")); //Blue diff --git a/src/datagen/main/java/mekanism/common/recipe/impl/PigmentExtractingRecipeProvider.java b/src/datagen/main/java/mekanism/common/recipe/impl/PigmentExtractingRecipeProvider.java index b3806f4af0a..9efb9541e1e 100644 --- a/src/datagen/main/java/mekanism/common/recipe/impl/PigmentExtractingRecipeProvider.java +++ b/src/datagen/main/java/mekanism/common/recipe/impl/PigmentExtractingRecipeProvider.java @@ -121,6 +121,11 @@ private static void addFlowerExtractionRecipes(Consumer consumer )), MekanismPigments.PIGMENT_COLOR_LOOKUP.get(EnumColor.RED).getStack(flowerRate) ).build(consumer, Mekanism.rl(basePath + "small_red")); + //Cyan + ItemStackToChemicalRecipeBuilder.pigmentExtracting( + IngredientCreatorAccess.item().from(Blocks.PITCHER_PLANT), + MekanismPigments.PIGMENT_COLOR_LOOKUP.get(EnumColor.DARK_AQUA).getStack(largeFlowerRate) + ).build(consumer, Mekanism.rl(basePath + "large_cyan")); //Green ItemStackToChemicalRecipeBuilder.pigmentExtracting( IngredientCreatorAccess.item().from(Blocks.CACTUS), @@ -141,7 +146,10 @@ private static void addFlowerExtractionRecipes(Consumer consumer MekanismPigments.PIGMENT_COLOR_LOOKUP.get(EnumColor.BRIGHT_PINK).getStack(largeFlowerRate) ).build(consumer, Mekanism.rl(basePath + "large_pink")); ItemStackToChemicalRecipeBuilder.pigmentExtracting( - IngredientCreatorAccess.item().from(Blocks.PINK_TULIP), + IngredientCreatorAccess.item().from(Ingredient.of( + Blocks.PINK_TULIP, + Blocks.PINK_PETALS + )), MekanismPigments.PIGMENT_COLOR_LOOKUP.get(EnumColor.BRIGHT_PINK).getStack(flowerRate) ).build(consumer, Mekanism.rl(basePath + "small_pink")); //Lime @@ -174,7 +182,10 @@ private static void addFlowerExtractionRecipes(Consumer consumer ).build(consumer, Mekanism.rl(basePath + "small_magenta")); //Orange ItemStackToChemicalRecipeBuilder.pigmentExtracting( - IngredientCreatorAccess.item().from(Blocks.ORANGE_TULIP), + IngredientCreatorAccess.item().from(Ingredient.of( + Blocks.ORANGE_TULIP, + Blocks.TORCHFLOWER + )), MekanismPigments.PIGMENT_COLOR_LOOKUP.get(EnumColor.ORANGE).getStack(flowerRate) ).build(consumer, Mekanism.rl(basePath + "orange")); //Blue diff --git a/src/datagen/main/java/mekanism/common/recipe/impl/PressurizedReactionRecipeProvider.java b/src/datagen/main/java/mekanism/common/recipe/impl/PressurizedReactionRecipeProvider.java index 9a6a94cd18e..b0086fde4ba 100644 --- a/src/datagen/main/java/mekanism/common/recipe/impl/PressurizedReactionRecipeProvider.java +++ b/src/datagen/main/java/mekanism/common/recipe/impl/PressurizedReactionRecipeProvider.java @@ -14,6 +14,7 @@ import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.tags.FluidTags; import net.minecraft.tags.ItemTags; +import net.minecraft.world.level.block.Blocks; import net.minecraftforge.common.Tags; class PressurizedReactionRecipeProvider implements ISubRecipeProvider { @@ -85,7 +86,11 @@ private void addWoodGasificationRecipes(Consumer consumer, Strin ).build(consumer, Mekanism.rl(basePath + "logs")); //Planks, each worth a 5th of a log. PressurizedReactionRecipeBuilder.reaction( - IngredientCreatorAccess.item().from(ItemTags.PLANKS, 20), + IngredientCreatorAccess.item().from(BaseRecipeProvider.createIngredient( + ItemTags.PLANKS, + //Allow mosaic as it can be smelted, so it makes sense it can be used in wood gasification + Blocks.BAMBOO_MOSAIC + ), 20), IngredientCreatorAccess.fluid().from(FluidTags.WATER, 400), IngredientCreatorAccess.gas().from(MekanismGases.OXYGEN, 400), 600, @@ -102,7 +107,11 @@ private void addWoodGasificationRecipes(Consumer consumer, Strin ).build(consumer, Mekanism.rl(basePath + "rods_wooden")); //Slabs, each worth a 10th of a log. PressurizedReactionRecipeBuilder.reaction( - IngredientCreatorAccess.item().from(ItemTags.WOODEN_SLABS), + IngredientCreatorAccess.item().from(BaseRecipeProvider.createIngredient( + ItemTags.WOODEN_SLABS, + //Allow mosaic as it can be smelted, so it makes sense it can be used in wood gasification + Blocks.BAMBOO_MOSAIC_SLAB + )), IngredientCreatorAccess.fluid().from(FluidTags.WATER, 10), IngredientCreatorAccess.gas().from(MekanismGases.OXYGEN, 10), 15, @@ -110,7 +119,11 @@ private void addWoodGasificationRecipes(Consumer consumer, Strin ).build(consumer, Mekanism.rl(basePath + "wooden_slabs")); //Stairs, each worth a 6⅔th of a log. PressurizedReactionRecipeBuilder.reaction( - IngredientCreatorAccess.item().from(ItemTags.WOODEN_STAIRS), + IngredientCreatorAccess.item().from(BaseRecipeProvider.createIngredient( + ItemTags.WOODEN_STAIRS, + //Allow mosaic as it can be smelted, so it makes sense it can be used in wood gasification + Blocks.BAMBOO_MOSAIC_STAIRS + )), IngredientCreatorAccess.fluid().from(FluidTags.WATER, 15), IngredientCreatorAccess.gas().from(MekanismGases.OXYGEN, 15), 22, diff --git a/src/datagen/main/java/mekanism/common/recipe/impl/SawingRecipeProvider.java b/src/datagen/main/java/mekanism/common/recipe/impl/SawingRecipeProvider.java index 42d07fca54f..184cab2453d 100644 --- a/src/datagen/main/java/mekanism/common/recipe/impl/SawingRecipeProvider.java +++ b/src/datagen/main/java/mekanism/common/recipe/impl/SawingRecipeProvider.java @@ -21,20 +21,27 @@ class SawingRecipeProvider implements ISubRecipeProvider { public void addRecipes(Consumer consumer) { String basePath = "sawing/"; addPrecisionSawmillBedRecipes(consumer, basePath + "bed/"); + //TODO - 1.20: Do we want to support signs?? RecipeProviderUtil.addPrecisionSawmillWoodTypeRecipes(consumer, basePath, Blocks.ACACIA_PLANKS, Items.ACACIA_BOAT, Items.ACACIA_CHEST_BOAT, Items.ACACIA_DOOR, Blocks.ACACIA_FENCE_GATE, ItemTags.ACACIA_LOGS, Blocks.ACACIA_PRESSURE_PLATE, Blocks.ACACIA_TRAPDOOR, "acacia"); + //Note: We intentionally do not treat bamboo mosaic as wood as vanilla doesn't seem to do so anywhere + RecipeProviderUtil.addPrecisionSawmillWoodTypeRecipes(consumer, basePath, Blocks.BAMBOO_PLANKS, Items.BAMBOO_RAFT, Items.BAMBOO_CHEST_RAFT, + Items.BAMBOO_DOOR, Blocks.BAMBOO_FENCE_GATE, null, Blocks.BAMBOO_PRESSURE_PLATE, Blocks.BAMBOO_TRAPDOOR, "bamboo"); RecipeProviderUtil.addPrecisionSawmillWoodTypeRecipes(consumer, basePath, Blocks.BIRCH_PLANKS, Items.BIRCH_BOAT, Items.BIRCH_CHEST_BOAT, Items.BIRCH_DOOR, Blocks.BIRCH_FENCE_GATE, ItemTags.BIRCH_LOGS, Blocks.BIRCH_PRESSURE_PLATE, Blocks.BIRCH_TRAPDOOR, "birch"); + RecipeProviderUtil.addPrecisionSawmillWoodTypeRecipes(consumer, basePath, Blocks.CHERRY_PLANKS, Items.CHERRY_BOAT, Items.CHERRY_CHEST_BOAT, + Items.CHERRY_DOOR, Blocks.CHERRY_FENCE_GATE, ItemTags.CHERRY_LOGS, Blocks.CHERRY_PRESSURE_PLATE, Blocks.CHERRY_TRAPDOOR, "cherry"); RecipeProviderUtil.addPrecisionSawmillWoodTypeRecipes(consumer, basePath, Blocks.DARK_OAK_PLANKS, Items.DARK_OAK_BOAT, Items.DARK_OAK_CHEST_BOAT, Items.DARK_OAK_DOOR, Blocks.DARK_OAK_FENCE_GATE, ItemTags.DARK_OAK_LOGS, Blocks.DARK_OAK_PRESSURE_PLATE, Blocks.DARK_OAK_TRAPDOOR, "dark_oak"); RecipeProviderUtil.addPrecisionSawmillWoodTypeRecipes(consumer, basePath, Blocks.JUNGLE_PLANKS, Items.JUNGLE_BOAT, Items.JUNGLE_CHEST_BOAT, Items.JUNGLE_DOOR, Blocks.JUNGLE_FENCE_GATE, ItemTags.JUNGLE_LOGS, Blocks.JUNGLE_PRESSURE_PLATE, Blocks.JUNGLE_TRAPDOOR, "jungle"); + RecipeProviderUtil.addPrecisionSawmillWoodTypeRecipes(consumer, basePath, Blocks.MANGROVE_PLANKS, Items.MANGROVE_BOAT, Items.MANGROVE_CHEST_BOAT, + Items.MANGROVE_DOOR, Blocks.MANGROVE_FENCE_GATE, ItemTags.MANGROVE_LOGS, Blocks.MANGROVE_PRESSURE_PLATE, Blocks.MANGROVE_TRAPDOOR, "mangrove"); RecipeProviderUtil.addPrecisionSawmillWoodTypeRecipes(consumer, basePath, Blocks.OAK_PLANKS, Items.OAK_BOAT, Items.OAK_CHEST_BOAT, Items.OAK_DOOR, Blocks.OAK_FENCE_GATE, ItemTags.OAK_LOGS, Blocks.OAK_PRESSURE_PLATE, Blocks.OAK_TRAPDOOR, "oak"); RecipeProviderUtil.addPrecisionSawmillWoodTypeRecipes(consumer, basePath, Blocks.SPRUCE_PLANKS, Items.SPRUCE_BOAT, Items.SPRUCE_CHEST_BOAT, Items.SPRUCE_DOOR, Blocks.SPRUCE_FENCE_GATE, ItemTags.SPRUCE_LOGS, Blocks.SPRUCE_PRESSURE_PLATE, Blocks.SPRUCE_TRAPDOOR, "spruce"); - RecipeProviderUtil.addPrecisionSawmillWoodTypeRecipes(consumer, basePath, Blocks.MANGROVE_PLANKS, Items.MANGROVE_BOAT, Items.MANGROVE_CHEST_BOAT, - Items.MANGROVE_DOOR, Blocks.MANGROVE_FENCE_GATE, ItemTags.MANGROVE_LOGS, Blocks.MANGROVE_PRESSURE_PLATE, Blocks.MANGROVE_TRAPDOOR, "mangrove"); + RecipeProviderUtil.addPrecisionSawmillWoodTypeRecipes(consumer, basePath, Blocks.CRIMSON_PLANKS, null, null, Items.CRIMSON_DOOR, Blocks.CRIMSON_FENCE_GATE, ItemTags.CRIMSON_STEMS, Blocks.CRIMSON_PRESSURE_PLATE, Blocks.CRIMSON_TRAPDOOR, "crimson"); RecipeProviderUtil.addPrecisionSawmillWoodTypeRecipes(consumer, basePath, Blocks.WARPED_PLANKS, null, null, Items.WARPED_DOOR, @@ -51,6 +58,13 @@ public void addRecipes(Consumer consumer) { new ItemStack(Items.BOOK, 3), 1 ).build(consumer, Mekanism.rl(basePath + "bookshelf")); + //Chiseled Bookshelf + SawmillRecipeBuilder.sawing( + IngredientCreatorAccess.item().from(Blocks.CHISELED_BOOKSHELF), + new ItemStack(Blocks.OAK_PLANKS, 6), + new ItemStack(Blocks.OAK_SLAB, 3), + 1 + ).build(consumer, Mekanism.rl(basePath + "chiseled_bookshelf")); //Chest SawmillRecipeBuilder.sawing( IngredientCreatorAccess.item().from(Blocks.CHEST), @@ -170,6 +184,12 @@ public void addRecipes(Consumer consumer) { new ItemStack(Blocks.TRIPWIRE_HOOK), 0.75 ).build(consumer, Mekanism.rl(basePath + "trapped_chest")); + //Bamboo block + SawmillRecipeBuilder.sawing( + //Note: We don't use the tag as turning stripped bamboo back into regular bamboo makes no sense + IngredientCreatorAccess.item().from(Blocks.BAMBOO_BLOCK), + new ItemStack(Items.BAMBOO, 9) + ).build(consumer, Mekanism.rl(basePath + "bamboo_block")); } private void addPrecisionSawmillBedRecipes(Consumer consumer, String basePath) { diff --git a/src/datagen/main/java/mekanism/common/tag/MekanismTagProvider.java b/src/datagen/main/java/mekanism/common/tag/MekanismTagProvider.java index 2b8164f99b0..21d9057dd20 100644 --- a/src/datagen/main/java/mekanism/common/tag/MekanismTagProvider.java +++ b/src/datagen/main/java/mekanism/common/tag/MekanismTagProvider.java @@ -261,8 +261,8 @@ private void addTools() { private void addWrenches() { addToTag(MekanismTags.Items.WRENCHES, MekanismItems.CONFIGURATOR); + //Note: We don't add wrenches to the vanilla tools tag as that is for a different style of tool and used for things like breaking pots getItemBuilder(Tags.Items.TOOLS).add(MekanismTags.Items.TOOLS_WRENCH); - getItemBuilder(ItemTags.TOOLS).add(MekanismTags.Items.TOOLS_WRENCH); addToTag(MekanismTags.Items.TOOLS_WRENCH, MekanismItems.CONFIGURATOR); getItemBuilder(MekanismTags.Items.CONFIGURATORS).add(MekanismTags.Items.WRENCHES, MekanismTags.Items.TOOLS_WRENCH); } @@ -530,9 +530,11 @@ private void addFluids() { addToTag(MekanismTags.Fluids.URANIUM_OXIDE, MekanismFluids.URANIUM_OXIDE); addToTag(MekanismTags.Fluids.URANIUM_HEXAFLUORIDE, MekanismFluids.URANIUM_HEXAFLUORIDE); addToTag(Tags.Fluids.GASEOUS, MekanismFluids.STEAM); - //Prevent all our fluids from being duped by create + IntrinsicMekanismTagBuilder replaceableBuilder = getBlockBuilder(BlockTags.REPLACEABLE); for (FluidRegistryObject fluid : MekanismFluids.FLUIDS.getAllFluids()) { + //Prevent all our fluids from being duped by create addToTag(CREATE_NO_INFINITE_FLUID, fluid); + replaceableBuilder.add(fluid.getBlock()); } } diff --git a/src/datagen/tools/java/mekanism/tools/client/ToolsItemModelProvider.java b/src/datagen/tools/java/mekanism/tools/client/ToolsItemModelProvider.java index 79addfe3ea3..af9a33aa7ec 100644 --- a/src/datagen/tools/java/mekanism/tools/client/ToolsItemModelProvider.java +++ b/src/datagen/tools/java/mekanism/tools/client/ToolsItemModelProvider.java @@ -46,7 +46,7 @@ protected void registerModels() { texture = modLoc("item/" + name.substring(0, index) + '/' + name.substring(index + 1)); } if (item instanceof ArmorItem) { - generated(itemProvider, texture); + armorWithTrim(itemProvider, texture); } else { handheld(itemProvider, texture); } diff --git a/src/datagen/tools/java/mekanism/tools/common/ToolsTagProvider.java b/src/datagen/tools/java/mekanism/tools/common/ToolsTagProvider.java index 7775fa809d8..3f94004299a 100644 --- a/src/datagen/tools/java/mekanism/tools/common/ToolsTagProvider.java +++ b/src/datagen/tools/java/mekanism/tools/common/ToolsTagProvider.java @@ -67,6 +67,14 @@ private void addToolTags() { addChestplates(); addLeggings(); addBoots(); + addToTag(ItemTags.TRIMMABLE_ARMOR, + ToolsItems.BRONZE_HELMET, ToolsItems.BRONZE_CHESTPLATE, ToolsItems.BRONZE_LEGGINGS, ToolsItems.BRONZE_BOOTS, + ToolsItems.LAPIS_LAZULI_HELMET, ToolsItems.LAPIS_LAZULI_CHESTPLATE, ToolsItems.LAPIS_LAZULI_LEGGINGS, ToolsItems.LAPIS_LAZULI_BOOTS, + ToolsItems.OSMIUM_HELMET, ToolsItems.OSMIUM_CHESTPLATE, ToolsItems.OSMIUM_LEGGINGS, ToolsItems.OSMIUM_BOOTS, + ToolsItems.REFINED_GLOWSTONE_HELMET, ToolsItems.REFINED_GLOWSTONE_CHESTPLATE, ToolsItems.REFINED_GLOWSTONE_LEGGINGS, ToolsItems.REFINED_GLOWSTONE_BOOTS, + ToolsItems.REFINED_OBSIDIAN_HELMET, ToolsItems.REFINED_OBSIDIAN_CHESTPLATE, ToolsItems.REFINED_OBSIDIAN_LEGGINGS, ToolsItems.REFINED_OBSIDIAN_BOOTS, + ToolsItems.STEEL_HELMET, ToolsItems.STEEL_CHESTPLATE, ToolsItems.STEEL_LEGGINGS, ToolsItems.STEEL_BOOTS + ); } private void addPaxels() { diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 8e6844d4e8c..4cbfce29279 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -370,6 +370,8 @@ private void commonSetup(FMLCommonSetupEvent event) { //Register custom item predicates ItemPredicate.register(FullCanteenItemPredicate.ID, json -> FullCanteenItemPredicate.INSTANCE); ItemPredicate.register(MaxedModuleContainerItemPredicate.ID, MaxedModuleContainerItemPredicate::fromJson); + //Add any extra game event frequencies + MekanismGameEvents.addFrequencies(); }); //Register player tracker diff --git a/src/main/java/mekanism/common/content/gear/mekatool/ModuleFarmingUnit.java b/src/main/java/mekanism/common/content/gear/mekatool/ModuleFarmingUnit.java index 490257b1b4b..482470d737f 100644 --- a/src/main/java/mekanism/common/content/gear/mekatool/ModuleFarmingUnit.java +++ b/src/main/java/mekanism/common/content/gear/mekatool/ModuleFarmingUnit.java @@ -286,7 +286,8 @@ public boolean isValid(Level level, BlockPos pos, BlockState state) { } //Or it is a replaceable plant that is also not solid (such as tall grass) //TODO - 1.20: Figure out if we want to just allow it if the above state is replaceable in general or do we want to maybe add a tag for this - // or do some form of instance checking? + // or do some form of instance checking? maybe replaceable_by_trees block tag? and validate not a liquid though it also includes other things + // that make no sense for this like leaves. We may just have to make our own tag? /*Material material = aboveState.getMaterial(); if (material == Material.REPLACEABLE_PLANT || material == Material.REPLACEABLE_FIREPROOF_PLANT) { return !aboveState.isSolidRender(level, abovePos); diff --git a/src/main/java/mekanism/common/registries/MekanismGameEvents.java b/src/main/java/mekanism/common/registries/MekanismGameEvents.java index f02387aaa92..cf42963e8ae 100644 --- a/src/main/java/mekanism/common/registries/MekanismGameEvents.java +++ b/src/main/java/mekanism/common/registries/MekanismGameEvents.java @@ -1,9 +1,11 @@ package mekanism.common.registries; +import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import mekanism.common.Mekanism; import mekanism.common.registration.impl.GameEventDeferredRegister; import mekanism.common.registration.impl.GameEventRegistryObject; import net.minecraft.world.level.gameevent.GameEvent; +import net.minecraft.world.level.gameevent.vibrations.VibrationSystem; public class MekanismGameEvents { @@ -12,10 +14,21 @@ private MekanismGameEvents() { public static final GameEventDeferredRegister GAME_EVENTS = new GameEventDeferredRegister(Mekanism.MODID); - //TODO: Eventually we may want to evaluate somehow adding these to SculkSensorBlock.VIBRATION_FREQUENCY_FOR_EVENT - // so that they have different comparator levels public static final GameEventRegistryObject SEISMIC_VIBRATION = GAME_EVENTS.register("seismic_vibration", 64); public static final GameEventRegistryObject JETPACK_BURN = GAME_EVENTS.register("jetpack_burn"); public static final GameEventRegistryObject GRAVITY_MODULATE = GAME_EVENTS.register("gravity_modulate"); public static final GameEventRegistryObject GRAVITY_MODULATE_BOOSTED = GAME_EVENTS.register("gravity_modulate_boosted", 32); + + public static void addFrequencies() { + if (VibrationSystem.VIBRATION_FREQUENCY_FOR_EVENT instanceof Object2IntOpenHashMap frequencyForEvent) { + //Follows vanilla's logic for what gives what sort of frequency + // A frequency of four is used for gliding with an elytra or unique mob actions + frequencyForEvent.put(JETPACK_BURN.get(), 4); + frequencyForEvent.put(GRAVITY_MODULATE.get(), 4); + //Note: We use 5 for boosted modulation to be able to tell it apart easier from normal modulating + frequencyForEvent.put(GRAVITY_MODULATE_BOOSTED.get(), 5); + // A frequency of ten is for blocks activating + frequencyForEvent.put(SEISMIC_VIBRATION.get(), 10); + } + } } \ No newline at end of file