diff --git a/Common/src/main/java/com/autovw/advancednetherite/core/ModItems.java b/Common/src/main/java/com/autovw/advancednetherite/core/ModItems.java index 10fe2a03..d298442a 100644 --- a/Common/src/main/java/com/autovw/advancednetherite/core/ModItems.java +++ b/Common/src/main/java/com/autovw/advancednetherite/core/ModItems.java @@ -4,11 +4,9 @@ import com.autovw.advancednetherite.common.item.*; import com.autovw.advancednetherite.core.util.ModArmorMaterials; import com.autovw.advancednetherite.core.util.ModToolMaterials; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.ArmorItem; import net.minecraft.world.item.Item; import net.minecraft.world.item.equipment.ArmorType; diff --git a/Common/src/main/java/com/autovw/advancednetherite/core/util/ModEquipmentModels.java b/Common/src/main/java/com/autovw/advancednetherite/core/util/ModEquipmentModels.java index 56f22ba9..e799b8e3 100644 --- a/Common/src/main/java/com/autovw/advancednetherite/core/util/ModEquipmentModels.java +++ b/Common/src/main/java/com/autovw/advancednetherite/core/util/ModEquipmentModels.java @@ -11,20 +11,23 @@ */ public final class ModEquipmentModels { - public static final EquipmentModel NETHERITE_IRON = humanoidModel(key("netherite_iron")); - public static final EquipmentModel NETHERITE_GOLD = humanoidModel(key("netherite_gold")); - public static final EquipmentModel NETHERITE_EMERALD = humanoidModel(key("netherite_emerald")); - public static final EquipmentModel NETHERITE_DIAMOND = humanoidModel(key("netherite_diamond")); + public static final ResourceLocation ID_NETHERITE_IRON = key("netherite_iron"); + public static final ResourceLocation ID_NETHERITE_GOLD = key("netherite_gold"); + public static final ResourceLocation ID_NETHERITE_EMERALD = key("netherite_emerald"); + public static final ResourceLocation ID_NETHERITE_DIAMOND = key("netherite_diamond"); + + public static final EquipmentModel NETHERITE_IRON = humanoidModel(ID_NETHERITE_IRON); + public static final EquipmentModel NETHERITE_GOLD = humanoidModel(ID_NETHERITE_GOLD); + public static final EquipmentModel NETHERITE_EMERALD = humanoidModel(ID_NETHERITE_EMERALD); + public static final EquipmentModel NETHERITE_DIAMOND = humanoidModel(ID_NETHERITE_DIAMOND); - /* public static void bootstrap(BiConsumer consumer) { - consumer.accept(NETHERITE_IRON, humanoidModel(NETHERITE_IRON)); - consumer.accept(NETHERITE_GOLD, humanoidModel(NETHERITE_GOLD)); - consumer.accept(NETHERITE_EMERALD, humanoidModel(NETHERITE_EMERALD)); - consumer.accept(NETHERITE_DIAMOND, humanoidModel(NETHERITE_DIAMOND)); + consumer.accept(ID_NETHERITE_IRON, NETHERITE_IRON); + consumer.accept(ID_NETHERITE_GOLD, NETHERITE_GOLD); + consumer.accept(ID_NETHERITE_EMERALD, NETHERITE_EMERALD); + consumer.accept(ID_NETHERITE_DIAMOND, NETHERITE_DIAMOND); } - */ private static EquipmentModel humanoidModel(ResourceLocation location) { diff --git a/Common/src/main/resources/assets/advancednetherite/textures/models/armor/netherite_diamond_layer_1.png b/Common/src/main/resources/assets/advancednetherite/textures/entity/equipment/humanoid/netherite_diamond.png similarity index 100% rename from Common/src/main/resources/assets/advancednetherite/textures/models/armor/netherite_diamond_layer_1.png rename to Common/src/main/resources/assets/advancednetherite/textures/entity/equipment/humanoid/netherite_diamond.png diff --git a/Common/src/main/resources/assets/advancednetherite/textures/models/armor/netherite_emerald_layer_1.png b/Common/src/main/resources/assets/advancednetherite/textures/entity/equipment/humanoid/netherite_emerald.png similarity index 100% rename from Common/src/main/resources/assets/advancednetherite/textures/models/armor/netherite_emerald_layer_1.png rename to Common/src/main/resources/assets/advancednetherite/textures/entity/equipment/humanoid/netherite_emerald.png diff --git a/Common/src/main/resources/assets/advancednetherite/textures/models/armor/netherite_gold_layer_1.png b/Common/src/main/resources/assets/advancednetherite/textures/entity/equipment/humanoid/netherite_gold.png similarity index 100% rename from Common/src/main/resources/assets/advancednetherite/textures/models/armor/netherite_gold_layer_1.png rename to Common/src/main/resources/assets/advancednetherite/textures/entity/equipment/humanoid/netherite_gold.png diff --git a/Common/src/main/resources/assets/advancednetherite/textures/models/armor/netherite_iron_layer_1.png b/Common/src/main/resources/assets/advancednetherite/textures/entity/equipment/humanoid/netherite_iron.png similarity index 100% rename from Common/src/main/resources/assets/advancednetherite/textures/models/armor/netherite_iron_layer_1.png rename to Common/src/main/resources/assets/advancednetherite/textures/entity/equipment/humanoid/netherite_iron.png diff --git a/Common/src/main/resources/assets/advancednetherite/textures/models/armor/netherite_diamond_layer_2.png b/Common/src/main/resources/assets/advancednetherite/textures/entity/equipment/humanoid_leggings/netherite_diamond.png similarity index 100% rename from Common/src/main/resources/assets/advancednetherite/textures/models/armor/netherite_diamond_layer_2.png rename to Common/src/main/resources/assets/advancednetherite/textures/entity/equipment/humanoid_leggings/netherite_diamond.png diff --git a/Common/src/main/resources/assets/advancednetherite/textures/models/armor/netherite_emerald_layer_2.png b/Common/src/main/resources/assets/advancednetherite/textures/entity/equipment/humanoid_leggings/netherite_emerald.png similarity index 100% rename from Common/src/main/resources/assets/advancednetherite/textures/models/armor/netherite_emerald_layer_2.png rename to Common/src/main/resources/assets/advancednetherite/textures/entity/equipment/humanoid_leggings/netherite_emerald.png diff --git a/Common/src/main/resources/assets/advancednetherite/textures/models/armor/netherite_gold_layer_2.png b/Common/src/main/resources/assets/advancednetherite/textures/entity/equipment/humanoid_leggings/netherite_gold.png similarity index 100% rename from Common/src/main/resources/assets/advancednetherite/textures/models/armor/netherite_gold_layer_2.png rename to Common/src/main/resources/assets/advancednetherite/textures/entity/equipment/humanoid_leggings/netherite_gold.png diff --git a/Common/src/main/resources/assets/advancednetherite/textures/models/armor/netherite_iron_layer_2.png b/Common/src/main/resources/assets/advancednetherite/textures/entity/equipment/humanoid_leggings/netherite_iron.png similarity index 100% rename from Common/src/main/resources/assets/advancednetherite/textures/models/armor/netherite_iron_layer_2.png rename to Common/src/main/resources/assets/advancednetherite/textures/entity/equipment/humanoid_leggings/netherite_iron.png diff --git a/Fabric/src/generated/resources/assets/advancednetherite/models/equipment/netherite_diamond.json b/Fabric/src/generated/resources/assets/advancednetherite/models/equipment/netherite_diamond.json new file mode 100644 index 00000000..2369a490 --- /dev/null +++ b/Fabric/src/generated/resources/assets/advancednetherite/models/equipment/netherite_diamond.json @@ -0,0 +1,14 @@ +{ + "layers": { + "humanoid": [ + { + "texture": "advancednetherite:netherite_diamond" + } + ], + "humanoid_leggings": [ + { + "texture": "advancednetherite:netherite_diamond" + } + ] + } +} \ No newline at end of file diff --git a/Fabric/src/generated/resources/assets/advancednetherite/models/equipment/netherite_emerald.json b/Fabric/src/generated/resources/assets/advancednetherite/models/equipment/netherite_emerald.json new file mode 100644 index 00000000..5da1e07e --- /dev/null +++ b/Fabric/src/generated/resources/assets/advancednetherite/models/equipment/netherite_emerald.json @@ -0,0 +1,14 @@ +{ + "layers": { + "humanoid": [ + { + "texture": "advancednetherite:netherite_emerald" + } + ], + "humanoid_leggings": [ + { + "texture": "advancednetherite:netherite_emerald" + } + ] + } +} \ No newline at end of file diff --git a/Fabric/src/generated/resources/assets/advancednetherite/models/equipment/netherite_gold.json b/Fabric/src/generated/resources/assets/advancednetherite/models/equipment/netherite_gold.json new file mode 100644 index 00000000..ffd8fea2 --- /dev/null +++ b/Fabric/src/generated/resources/assets/advancednetherite/models/equipment/netherite_gold.json @@ -0,0 +1,14 @@ +{ + "layers": { + "humanoid": [ + { + "texture": "advancednetherite:netherite_gold" + } + ], + "humanoid_leggings": [ + { + "texture": "advancednetherite:netherite_gold" + } + ] + } +} \ No newline at end of file diff --git a/Fabric/src/generated/resources/assets/advancednetherite/models/equipment/netherite_iron.json b/Fabric/src/generated/resources/assets/advancednetherite/models/equipment/netherite_iron.json new file mode 100644 index 00000000..1809c868 --- /dev/null +++ b/Fabric/src/generated/resources/assets/advancednetherite/models/equipment/netherite_iron.json @@ -0,0 +1,14 @@ +{ + "layers": { + "humanoid": [ + { + "texture": "advancednetherite:netherite_iron" + } + ], + "humanoid_leggings": [ + { + "texture": "advancednetherite:netherite_iron" + } + ] + } +} \ No newline at end of file diff --git a/Fabric/src/main/java/com/autovw/advancednetherite/datagen/ModDataGenerator.java b/Fabric/src/main/java/com/autovw/advancednetherite/datagen/ModDataGenerator.java index 797141cd..fd86eb72 100644 --- a/Fabric/src/main/java/com/autovw/advancednetherite/datagen/ModDataGenerator.java +++ b/Fabric/src/main/java/com/autovw/advancednetherite/datagen/ModDataGenerator.java @@ -3,6 +3,7 @@ import com.autovw.advancednetherite.datagen.providers.*; import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; +import net.minecraft.data.DataGenerator; /** * @author Autovw @@ -21,5 +22,8 @@ public void onInitializeDataGenerator(FabricDataGenerator generator) pack.addProvider(ModBlockTagsProvider::new); pack.addProvider(ModItemTagsProvider::new); pack.addProvider(ModEnchantmentTagsProvider::new); + + DataGenerator.PackGenerator secondaryPack = generator.createPack(); + secondaryPack.addProvider(ModEquipmentModelProvider::new); } } diff --git a/Fabric/src/main/java/com/autovw/advancednetherite/datagen/providers/ModEquipmentModelProvider.java b/Fabric/src/main/java/com/autovw/advancednetherite/datagen/providers/ModEquipmentModelProvider.java new file mode 100644 index 00000000..9e5b0364 --- /dev/null +++ b/Fabric/src/main/java/com/autovw/advancednetherite/datagen/providers/ModEquipmentModelProvider.java @@ -0,0 +1,40 @@ +package com.autovw.advancednetherite.datagen.providers; + +import com.autovw.advancednetherite.core.util.ModEquipmentModels; +import net.minecraft.data.CachedOutput; +import net.minecraft.data.DataProvider; +import net.minecraft.data.PackOutput; +import net.minecraft.data.models.EquipmentModelProvider; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.equipment.EquipmentModel; + +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.CompletableFuture; + +/** + * @author Autovw + */ +public class ModEquipmentModelProvider extends EquipmentModelProvider +{ + protected final PackOutput.PathProvider pathProvider; + + public ModEquipmentModelProvider(PackOutput packOutput) + { + super(packOutput); + this.pathProvider = packOutput.createPathProvider(PackOutput.Target.RESOURCE_PACK, "models/equipment"); + } + + @Override + public CompletableFuture run(CachedOutput output) + { + Map map = new HashMap<>(); + ModEquipmentModels.bootstrap((id, model) -> { + if (map.putIfAbsent(id, model) != null) + { + throw new IllegalStateException("Duplicate equipment model for id: " + id.toString()); + } + }); + return DataProvider.saveAll(output, EquipmentModel.CODEC, this.pathProvider, map); + } +} diff --git a/Forge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_diamond.json b/Forge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_diamond.json new file mode 100644 index 00000000..2369a490 --- /dev/null +++ b/Forge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_diamond.json @@ -0,0 +1,14 @@ +{ + "layers": { + "humanoid": [ + { + "texture": "advancednetherite:netherite_diamond" + } + ], + "humanoid_leggings": [ + { + "texture": "advancednetherite:netherite_diamond" + } + ] + } +} \ No newline at end of file diff --git a/Forge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_emerald.json b/Forge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_emerald.json new file mode 100644 index 00000000..5da1e07e --- /dev/null +++ b/Forge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_emerald.json @@ -0,0 +1,14 @@ +{ + "layers": { + "humanoid": [ + { + "texture": "advancednetherite:netherite_emerald" + } + ], + "humanoid_leggings": [ + { + "texture": "advancednetherite:netherite_emerald" + } + ] + } +} \ No newline at end of file diff --git a/Forge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_gold.json b/Forge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_gold.json new file mode 100644 index 00000000..ffd8fea2 --- /dev/null +++ b/Forge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_gold.json @@ -0,0 +1,14 @@ +{ + "layers": { + "humanoid": [ + { + "texture": "advancednetherite:netherite_gold" + } + ], + "humanoid_leggings": [ + { + "texture": "advancednetherite:netherite_gold" + } + ] + } +} \ No newline at end of file diff --git a/Forge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_iron.json b/Forge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_iron.json new file mode 100644 index 00000000..1809c868 --- /dev/null +++ b/Forge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_iron.json @@ -0,0 +1,14 @@ +{ + "layers": { + "humanoid": [ + { + "texture": "advancednetherite:netherite_iron" + } + ], + "humanoid_leggings": [ + { + "texture": "advancednetherite:netherite_iron" + } + ] + } +} \ No newline at end of file diff --git a/Forge/src/main/java/com/autovw/advancednetherite/datagen/ModDataGenerator.java b/Forge/src/main/java/com/autovw/advancednetherite/datagen/ModDataGenerator.java index 76a702f6..99d26af0 100644 --- a/Forge/src/main/java/com/autovw/advancednetherite/datagen/ModDataGenerator.java +++ b/Forge/src/main/java/com/autovw/advancednetherite/datagen/ModDataGenerator.java @@ -50,6 +50,7 @@ public static void onGatherData(final GatherDataEvent event) // client generator.addProvider(event.includeClient(), new ModBlockStatesProvider(packOutput, AdvancedNetherite.MOD_ID, helper)); + generator.addProvider(event.includeClient(), new ModEquipmentModelProvider(packOutput)); generator.addProvider(event.includeClient(), new ModItemModelProvider(packOutput, AdvancedNetherite.MOD_ID, helper)); } } diff --git a/Forge/src/main/java/com/autovw/advancednetherite/datagen/providers/ModEquipmentModelProvider.java b/Forge/src/main/java/com/autovw/advancednetherite/datagen/providers/ModEquipmentModelProvider.java new file mode 100644 index 00000000..9e5b0364 --- /dev/null +++ b/Forge/src/main/java/com/autovw/advancednetherite/datagen/providers/ModEquipmentModelProvider.java @@ -0,0 +1,40 @@ +package com.autovw.advancednetherite.datagen.providers; + +import com.autovw.advancednetherite.core.util.ModEquipmentModels; +import net.minecraft.data.CachedOutput; +import net.minecraft.data.DataProvider; +import net.minecraft.data.PackOutput; +import net.minecraft.data.models.EquipmentModelProvider; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.equipment.EquipmentModel; + +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.CompletableFuture; + +/** + * @author Autovw + */ +public class ModEquipmentModelProvider extends EquipmentModelProvider +{ + protected final PackOutput.PathProvider pathProvider; + + public ModEquipmentModelProvider(PackOutput packOutput) + { + super(packOutput); + this.pathProvider = packOutput.createPathProvider(PackOutput.Target.RESOURCE_PACK, "models/equipment"); + } + + @Override + public CompletableFuture run(CachedOutput output) + { + Map map = new HashMap<>(); + ModEquipmentModels.bootstrap((id, model) -> { + if (map.putIfAbsent(id, model) != null) + { + throw new IllegalStateException("Duplicate equipment model for id: " + id.toString()); + } + }); + return DataProvider.saveAll(output, EquipmentModel.CODEC, this.pathProvider, map); + } +} diff --git a/Forge/src/main/java/com/autovw/advancednetherite/datagen/providers/ModItemModelProvider.java b/Forge/src/main/java/com/autovw/advancednetherite/datagen/providers/ModItemModelProvider.java index 04208db1..f0105f4c 100644 --- a/Forge/src/main/java/com/autovw/advancednetherite/datagen/providers/ModItemModelProvider.java +++ b/Forge/src/main/java/com/autovw/advancednetherite/datagen/providers/ModItemModelProvider.java @@ -147,14 +147,15 @@ public void armorModel(Item item) TRIM_MATERIALS.forEach((trimMaterial, trimValue) -> { ResourceLocation id = AdvancedNetherite.getRegistryHelper().getItemById(armorItem); - String armorType = switch (armorItem.getEquipmentSlot(armorItem.getDefaultInstance())) - { - case HEAD -> "helmet"; - case CHEST -> "chestplate"; - case LEGS -> "leggings"; - case FEET -> "boots"; - default -> ""; - }; + String armorType = ""; + if (id.getPath().contains("helmet")) + armorType = "helmet"; + else if (id.getPath().contains("chestplate")) + armorType = "chestplate"; + else if (id.getPath().contains("leggings")) + armorType = "leggings"; + else if (id.getPath().contains("boots")) + armorType = "boots"; ResourceLocation armorTexture = ResourceLocation.fromNamespaceAndPath(id.getNamespace(), "item/" + id.getPath()); ResourceLocation trimTexture = mcLoc("trims/items/" + armorType + "_trim_" + trimMaterial.location().getPath()); diff --git a/NeoForge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_diamond.json b/NeoForge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_diamond.json new file mode 100644 index 00000000..2369a490 --- /dev/null +++ b/NeoForge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_diamond.json @@ -0,0 +1,14 @@ +{ + "layers": { + "humanoid": [ + { + "texture": "advancednetherite:netherite_diamond" + } + ], + "humanoid_leggings": [ + { + "texture": "advancednetherite:netherite_diamond" + } + ] + } +} \ No newline at end of file diff --git a/NeoForge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_emerald.json b/NeoForge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_emerald.json new file mode 100644 index 00000000..5da1e07e --- /dev/null +++ b/NeoForge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_emerald.json @@ -0,0 +1,14 @@ +{ + "layers": { + "humanoid": [ + { + "texture": "advancednetherite:netherite_emerald" + } + ], + "humanoid_leggings": [ + { + "texture": "advancednetherite:netherite_emerald" + } + ] + } +} \ No newline at end of file diff --git a/NeoForge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_gold.json b/NeoForge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_gold.json new file mode 100644 index 00000000..ffd8fea2 --- /dev/null +++ b/NeoForge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_gold.json @@ -0,0 +1,14 @@ +{ + "layers": { + "humanoid": [ + { + "texture": "advancednetherite:netherite_gold" + } + ], + "humanoid_leggings": [ + { + "texture": "advancednetherite:netherite_gold" + } + ] + } +} \ No newline at end of file diff --git a/NeoForge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_iron.json b/NeoForge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_iron.json new file mode 100644 index 00000000..1809c868 --- /dev/null +++ b/NeoForge/src/generated/resources/assets/advancednetherite/models/equipment/netherite_iron.json @@ -0,0 +1,14 @@ +{ + "layers": { + "humanoid": [ + { + "texture": "advancednetherite:netherite_iron" + } + ], + "humanoid_leggings": [ + { + "texture": "advancednetherite:netherite_iron" + } + ] + } +} \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/lodestone.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/lodestone.json index cb50bd4f..1503289a 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/lodestone.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/lodestone.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "#": { - "tag": "advancednetherite:netherite_ingots" - }, - "S": { - "item": "minecraft:chiseled_stone_bricks" - } + "#": "#advancednetherite:netherite_ingots", + "S": "minecraft:chiseled_stone_bricks" }, "pattern": [ "SSS", diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_axe_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_axe_smithing.json index 64d02da1..0d22faa4 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_axe_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_axe_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_diamond" - }, - "base": { - "tag": "advancednetherite:axe/upgrade_to_netherite_diamond" - }, + "addition": "#advancednetherite:upgrade_to_netherite_diamond", + "base": "#advancednetherite:axe/upgrade_to_netherite_diamond", "result": { "count": 1, "id": "advancednetherite:netherite_diamond_axe" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_block.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_block.json index 7ac535c7..9b4a8187 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_block.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "#": { - "item": "advancednetherite:netherite_diamond_ingot" - } + "#": "advancednetherite:netherite_diamond_ingot" }, "pattern": [ "###", diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_boots_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_boots_smithing.json index 5ee03f48..13167233 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_boots_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_boots_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_diamond" - }, - "base": { - "tag": "advancednetherite:boots/upgrade_to_netherite_diamond" - }, + "addition": "#advancednetherite:upgrade_to_netherite_diamond", + "base": "#advancednetherite:boots/upgrade_to_netherite_diamond", "result": { "count": 1, "id": "advancednetherite:netherite_diamond_boots" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_chestplate_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_chestplate_smithing.json index 5a9e29d2..29144b32 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_chestplate_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_chestplate_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_diamond" - }, - "base": { - "tag": "advancednetherite:chestplate/upgrade_to_netherite_diamond" - }, + "addition": "#advancednetherite:upgrade_to_netherite_diamond", + "base": "#advancednetherite:chestplate/upgrade_to_netherite_diamond", "result": { "count": 1, "id": "advancednetherite:netherite_diamond_chestplate" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_helmet_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_helmet_smithing.json index 588a2bfb..1ded2421 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_helmet_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_helmet_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_diamond" - }, - "base": { - "tag": "advancednetherite:helmet/upgrade_to_netherite_diamond" - }, + "addition": "#advancednetherite:upgrade_to_netherite_diamond", + "base": "#advancednetherite:helmet/upgrade_to_netherite_diamond", "result": { "count": 1, "id": "advancednetherite:netherite_diamond_helmet" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_hoe_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_hoe_smithing.json index 865c896a..4ae64783 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_hoe_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_hoe_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_diamond" - }, - "base": { - "tag": "advancednetherite:hoe/upgrade_to_netherite_diamond" - }, + "addition": "#advancednetherite:upgrade_to_netherite_diamond", + "base": "#advancednetherite:hoe/upgrade_to_netherite_diamond", "result": { "count": 1, "id": "advancednetherite:netherite_diamond_hoe" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_ingot.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_ingot.json index 7ac895e8..13217d22 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_ingot.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_ingot.json @@ -2,21 +2,11 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "tag": "advancednetherite:ingot/upgrade_to_netherite_diamond" - }, - { - "tag": "c:gems/diamond" - }, - { - "tag": "c:gems/diamond" - }, - { - "tag": "c:gems/diamond" - }, - { - "tag": "c:gems/diamond" - } + "#advancednetherite:ingot/upgrade_to_netherite_diamond", + "#c:gems/diamond", + "#c:gems/diamond", + "#c:gems/diamond", + "#c:gems/diamond" ], "result": { "count": 1, diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_ingot_from_block.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_ingot_from_block.json index 84b2682c..92ded4b4 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_ingot_from_block.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "advancednetherite:netherite_diamond_block" - } + "advancednetherite:netherite_diamond_block" ], "result": { "count": 9, diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_leggings_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_leggings_smithing.json index d6c178f0..e425d6dc 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_leggings_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_leggings_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_diamond" - }, - "base": { - "tag": "advancednetherite:leggings/upgrade_to_netherite_diamond" - }, + "addition": "#advancednetherite:upgrade_to_netherite_diamond", + "base": "#advancednetherite:leggings/upgrade_to_netherite_diamond", "result": { "count": 1, "id": "advancednetherite:netherite_diamond_leggings" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_pickaxe_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_pickaxe_smithing.json index 45d10c73..5f47b6ad 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_pickaxe_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_pickaxe_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_diamond" - }, - "base": { - "tag": "advancednetherite:pickaxe/upgrade_to_netherite_diamond" - }, + "addition": "#advancednetherite:upgrade_to_netherite_diamond", + "base": "#advancednetherite:pickaxe/upgrade_to_netherite_diamond", "result": { "count": 1, "id": "advancednetherite:netherite_diamond_pickaxe" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_shovel_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_shovel_smithing.json index a04b64bd..638e8aa5 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_shovel_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_shovel_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_diamond" - }, - "base": { - "tag": "advancednetherite:shovel/upgrade_to_netherite_diamond" - }, + "addition": "#advancednetherite:upgrade_to_netherite_diamond", + "base": "#advancednetherite:shovel/upgrade_to_netherite_diamond", "result": { "count": 1, "id": "advancednetherite:netherite_diamond_shovel" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_sword_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_sword_smithing.json index e8ce192b..cf0fb48d 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_sword_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_diamond_sword_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_diamond" - }, - "base": { - "tag": "advancednetherite:sword/upgrade_to_netherite_diamond" - }, + "addition": "#advancednetherite:upgrade_to_netherite_diamond", + "base": "#advancednetherite:sword/upgrade_to_netherite_diamond", "result": { "count": 1, "id": "advancednetherite:netherite_diamond_sword" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_axe_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_axe_smithing.json index f56d40ff..04b51437 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_axe_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_axe_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_emerald" - }, - "base": { - "tag": "advancednetherite:axe/upgrade_to_netherite_emerald" - }, + "addition": "#advancednetherite:upgrade_to_netherite_emerald", + "base": "#advancednetherite:axe/upgrade_to_netherite_emerald", "result": { "count": 1, "id": "advancednetherite:netherite_emerald_axe" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_block.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_block.json index 9b8188d0..997c70ec 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_block.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "#": { - "item": "advancednetherite:netherite_emerald_ingot" - } + "#": "advancednetherite:netherite_emerald_ingot" }, "pattern": [ "###", diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_boots_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_boots_smithing.json index f53140a4..2b49f897 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_boots_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_boots_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_emerald" - }, - "base": { - "tag": "advancednetherite:boots/upgrade_to_netherite_emerald" - }, + "addition": "#advancednetherite:upgrade_to_netherite_emerald", + "base": "#advancednetherite:boots/upgrade_to_netherite_emerald", "result": { "count": 1, "id": "advancednetherite:netherite_emerald_boots" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_chestplate_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_chestplate_smithing.json index f9f090d5..70ca8e4c 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_chestplate_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_chestplate_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_emerald" - }, - "base": { - "tag": "advancednetherite:chestplate/upgrade_to_netherite_emerald" - }, + "addition": "#advancednetherite:upgrade_to_netherite_emerald", + "base": "#advancednetherite:chestplate/upgrade_to_netherite_emerald", "result": { "count": 1, "id": "advancednetherite:netherite_emerald_chestplate" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_helmet_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_helmet_smithing.json index bff49e1b..dc5ae67a 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_helmet_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_helmet_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_emerald" - }, - "base": { - "tag": "advancednetherite:helmet/upgrade_to_netherite_emerald" - }, + "addition": "#advancednetherite:upgrade_to_netherite_emerald", + "base": "#advancednetherite:helmet/upgrade_to_netherite_emerald", "result": { "count": 1, "id": "advancednetherite:netherite_emerald_helmet" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_hoe_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_hoe_smithing.json index 93a2a92e..1cf045b5 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_hoe_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_hoe_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_emerald" - }, - "base": { - "tag": "advancednetherite:hoe/upgrade_to_netherite_emerald" - }, + "addition": "#advancednetherite:upgrade_to_netherite_emerald", + "base": "#advancednetherite:hoe/upgrade_to_netherite_emerald", "result": { "count": 1, "id": "advancednetherite:netherite_emerald_hoe" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_ingot.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_ingot.json index bf850543..9c49c7f9 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_ingot.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_ingot.json @@ -2,21 +2,11 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "tag": "advancednetherite:ingot/upgrade_to_netherite_emerald" - }, - { - "tag": "c:gems/emerald" - }, - { - "tag": "c:gems/emerald" - }, - { - "tag": "c:gems/emerald" - }, - { - "tag": "c:gems/emerald" - } + "#advancednetherite:ingot/upgrade_to_netherite_emerald", + "#c:gems/emerald", + "#c:gems/emerald", + "#c:gems/emerald", + "#c:gems/emerald" ], "result": { "count": 1, diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_ingot_from_block.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_ingot_from_block.json index 7fc2264d..1bfafd95 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_ingot_from_block.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "advancednetherite:netherite_emerald_block" - } + "advancednetherite:netherite_emerald_block" ], "result": { "count": 9, diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_leggings_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_leggings_smithing.json index 2ccda95c..d0422ea6 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_leggings_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_leggings_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_emerald" - }, - "base": { - "tag": "advancednetherite:leggings/upgrade_to_netherite_emerald" - }, + "addition": "#advancednetherite:upgrade_to_netherite_emerald", + "base": "#advancednetherite:leggings/upgrade_to_netherite_emerald", "result": { "count": 1, "id": "advancednetherite:netherite_emerald_leggings" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_pickaxe_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_pickaxe_smithing.json index 81c171ca..23cb7dbe 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_pickaxe_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_pickaxe_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_emerald" - }, - "base": { - "tag": "advancednetherite:pickaxe/upgrade_to_netherite_emerald" - }, + "addition": "#advancednetherite:upgrade_to_netherite_emerald", + "base": "#advancednetherite:pickaxe/upgrade_to_netherite_emerald", "result": { "count": 1, "id": "advancednetherite:netherite_emerald_pickaxe" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_shovel_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_shovel_smithing.json index ac1d0075..d3fd5db4 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_shovel_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_shovel_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_emerald" - }, - "base": { - "tag": "advancednetherite:shovel/upgrade_to_netherite_emerald" - }, + "addition": "#advancednetherite:upgrade_to_netherite_emerald", + "base": "#advancednetherite:shovel/upgrade_to_netherite_emerald", "result": { "count": 1, "id": "advancednetherite:netherite_emerald_shovel" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_sword_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_sword_smithing.json index 068e3ba1..b7f00e9d 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_sword_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_emerald_sword_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_emerald" - }, - "base": { - "tag": "advancednetherite:sword/upgrade_to_netherite_emerald" - }, + "addition": "#advancednetherite:upgrade_to_netherite_emerald", + "base": "#advancednetherite:sword/upgrade_to_netherite_emerald", "result": { "count": 1, "id": "advancednetherite:netherite_emerald_sword" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_axe_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_axe_smithing.json index 54543188..e636393c 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_axe_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_axe_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_gold" - }, - "base": { - "tag": "advancednetherite:axe/upgrade_to_netherite_gold" - }, + "addition": "#advancednetherite:upgrade_to_netherite_gold", + "base": "#advancednetherite:axe/upgrade_to_netherite_gold", "result": { "count": 1, "id": "advancednetherite:netherite_gold_axe" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_block.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_block.json index 24e294bf..33d0b4e3 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_block.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "#": { - "item": "advancednetherite:netherite_gold_ingot" - } + "#": "advancednetherite:netherite_gold_ingot" }, "pattern": [ "###", diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_boots_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_boots_smithing.json index 3709deab..9bf9b998 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_boots_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_boots_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_gold" - }, - "base": { - "tag": "advancednetherite:boots/upgrade_to_netherite_gold" - }, + "addition": "#advancednetherite:upgrade_to_netherite_gold", + "base": "#advancednetherite:boots/upgrade_to_netherite_gold", "result": { "count": 1, "id": "advancednetherite:netherite_gold_boots" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_chestplate_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_chestplate_smithing.json index 26ed629d..722a7471 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_chestplate_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_chestplate_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_gold" - }, - "base": { - "tag": "advancednetherite:chestplate/upgrade_to_netherite_gold" - }, + "addition": "#advancednetherite:upgrade_to_netherite_gold", + "base": "#advancednetherite:chestplate/upgrade_to_netherite_gold", "result": { "count": 1, "id": "advancednetherite:netherite_gold_chestplate" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_helmet_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_helmet_smithing.json index 4fb592a6..c3f27229 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_helmet_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_helmet_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_gold" - }, - "base": { - "tag": "advancednetherite:helmet/upgrade_to_netherite_gold" - }, + "addition": "#advancednetherite:upgrade_to_netherite_gold", + "base": "#advancednetherite:helmet/upgrade_to_netherite_gold", "result": { "count": 1, "id": "advancednetherite:netherite_gold_helmet" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_hoe_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_hoe_smithing.json index e4036db6..a966f393 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_hoe_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_hoe_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_gold" - }, - "base": { - "tag": "advancednetherite:hoe/upgrade_to_netherite_gold" - }, + "addition": "#advancednetherite:upgrade_to_netherite_gold", + "base": "#advancednetherite:hoe/upgrade_to_netherite_gold", "result": { "count": 1, "id": "advancednetherite:netherite_gold_hoe" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_ingot.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_ingot.json index e5794228..ede84234 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_ingot.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_ingot.json @@ -2,21 +2,11 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "tag": "advancednetherite:ingot/upgrade_to_netherite_gold" - }, - { - "tag": "c:ingots/gold" - }, - { - "tag": "c:ingots/gold" - }, - { - "tag": "c:ingots/gold" - }, - { - "tag": "c:ingots/gold" - } + "#advancednetherite:ingot/upgrade_to_netherite_gold", + "#c:ingots/gold", + "#c:ingots/gold", + "#c:ingots/gold", + "#c:ingots/gold" ], "result": { "count": 1, diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_ingot_from_block.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_ingot_from_block.json index 8781ab72..a0c71a88 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_ingot_from_block.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "advancednetherite:netherite_gold_block" - } + "advancednetherite:netherite_gold_block" ], "result": { "count": 9, diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_leggings_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_leggings_smithing.json index d61efbb3..274258f1 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_leggings_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_leggings_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_gold" - }, - "base": { - "tag": "advancednetherite:leggings/upgrade_to_netherite_gold" - }, + "addition": "#advancednetherite:upgrade_to_netherite_gold", + "base": "#advancednetherite:leggings/upgrade_to_netherite_gold", "result": { "count": 1, "id": "advancednetherite:netherite_gold_leggings" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_pickaxe_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_pickaxe_smithing.json index bd4f905d..a2c06f3f 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_pickaxe_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_pickaxe_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_gold" - }, - "base": { - "tag": "advancednetherite:pickaxe/upgrade_to_netherite_gold" - }, + "addition": "#advancednetherite:upgrade_to_netherite_gold", + "base": "#advancednetherite:pickaxe/upgrade_to_netherite_gold", "result": { "count": 1, "id": "advancednetherite:netherite_gold_pickaxe" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_shovel_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_shovel_smithing.json index 51939171..9fbe9b76 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_shovel_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_shovel_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_gold" - }, - "base": { - "tag": "advancednetherite:shovel/upgrade_to_netherite_gold" - }, + "addition": "#advancednetherite:upgrade_to_netherite_gold", + "base": "#advancednetherite:shovel/upgrade_to_netherite_gold", "result": { "count": 1, "id": "advancednetherite:netherite_gold_shovel" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_sword_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_sword_smithing.json index 1381a32e..28240840 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_sword_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_gold_sword_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_gold" - }, - "base": { - "tag": "advancednetherite:sword/upgrade_to_netherite_gold" - }, + "addition": "#advancednetherite:upgrade_to_netherite_gold", + "base": "#advancednetherite:sword/upgrade_to_netherite_gold", "result": { "count": 1, "id": "advancednetherite:netherite_gold_sword" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_axe_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_axe_smithing.json index 591bd671..02228347 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_axe_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_axe_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_iron" - }, - "base": { - "tag": "advancednetherite:axe/upgrade_to_netherite_iron" - }, + "addition": "#advancednetherite:upgrade_to_netherite_iron", + "base": "#advancednetherite:axe/upgrade_to_netherite_iron", "result": { "count": 1, "id": "advancednetherite:netherite_iron_axe" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_block.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_block.json index 908232c4..fe015311 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_block.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "#": { - "item": "advancednetherite:netherite_iron_ingot" - } + "#": "advancednetherite:netherite_iron_ingot" }, "pattern": [ "###", diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_boots_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_boots_smithing.json index fd36412e..93c74184 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_boots_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_boots_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_iron" - }, - "base": { - "tag": "advancednetherite:boots/upgrade_to_netherite_iron" - }, + "addition": "#advancednetherite:upgrade_to_netherite_iron", + "base": "#advancednetherite:boots/upgrade_to_netherite_iron", "result": { "count": 1, "id": "advancednetherite:netherite_iron_boots" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_chestplate_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_chestplate_smithing.json index d204dd39..f235886f 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_chestplate_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_chestplate_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_iron" - }, - "base": { - "tag": "advancednetherite:chestplate/upgrade_to_netherite_iron" - }, + "addition": "#advancednetherite:upgrade_to_netherite_iron", + "base": "#advancednetherite:chestplate/upgrade_to_netherite_iron", "result": { "count": 1, "id": "advancednetherite:netherite_iron_chestplate" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_helmet_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_helmet_smithing.json index 8563c5b1..9857688c 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_helmet_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_helmet_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_iron" - }, - "base": { - "tag": "advancednetherite:helmet/upgrade_to_netherite_iron" - }, + "addition": "#advancednetherite:upgrade_to_netherite_iron", + "base": "#advancednetherite:helmet/upgrade_to_netherite_iron", "result": { "count": 1, "id": "advancednetherite:netherite_iron_helmet" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_hoe_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_hoe_smithing.json index 3f924fcc..53e5e442 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_hoe_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_hoe_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_iron" - }, - "base": { - "tag": "advancednetherite:hoe/upgrade_to_netherite_iron" - }, + "addition": "#advancednetherite:upgrade_to_netherite_iron", + "base": "#advancednetherite:hoe/upgrade_to_netherite_iron", "result": { "count": 1, "id": "advancednetherite:netherite_iron_hoe" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_ingot.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_ingot.json index f38886b2..50fcc5ac 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_ingot.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_ingot.json @@ -2,21 +2,11 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "tag": "advancednetherite:ingot/upgrade_to_netherite_iron" - }, - { - "tag": "c:ingots/iron" - }, - { - "tag": "c:ingots/iron" - }, - { - "tag": "c:ingots/iron" - }, - { - "tag": "c:ingots/iron" - } + "#advancednetherite:ingot/upgrade_to_netherite_iron", + "#c:ingots/iron", + "#c:ingots/iron", + "#c:ingots/iron", + "#c:ingots/iron" ], "result": { "count": 1, diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_ingot_from_block.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_ingot_from_block.json index 9d37f13e..67d60589 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_ingot_from_block.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "advancednetherite:netherite_iron_block" - } + "advancednetherite:netherite_iron_block" ], "result": { "count": 9, diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_leggings_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_leggings_smithing.json index cbe1f6d1..38bb2b5c 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_leggings_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_leggings_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_iron" - }, - "base": { - "tag": "advancednetherite:leggings/upgrade_to_netherite_iron" - }, + "addition": "#advancednetherite:upgrade_to_netherite_iron", + "base": "#advancednetherite:leggings/upgrade_to_netherite_iron", "result": { "count": 1, "id": "advancednetherite:netherite_iron_leggings" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_pickaxe_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_pickaxe_smithing.json index 5d6c12d5..ff9025b9 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_pickaxe_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_pickaxe_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_iron" - }, - "base": { - "tag": "advancednetherite:pickaxe/upgrade_to_netherite_iron" - }, + "addition": "#advancednetherite:upgrade_to_netherite_iron", + "base": "#advancednetherite:pickaxe/upgrade_to_netherite_iron", "result": { "count": 1, "id": "advancednetherite:netherite_iron_pickaxe" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_shovel_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_shovel_smithing.json index f655582c..9af74aa0 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_shovel_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_shovel_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_iron" - }, - "base": { - "tag": "advancednetherite:shovel/upgrade_to_netherite_iron" - }, + "addition": "#advancednetherite:upgrade_to_netherite_iron", + "base": "#advancednetherite:shovel/upgrade_to_netherite_iron", "result": { "count": 1, "id": "advancednetherite:netherite_iron_shovel" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_sword_smithing.json b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_sword_smithing.json index 81f0cfd2..95d0cd58 100644 --- a/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_sword_smithing.json +++ b/NeoForge/src/generated/resources/data/advancednetherite/recipe/netherite_iron_sword_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "tag": "advancednetherite:upgrade_to_netherite_iron" - }, - "base": { - "tag": "advancednetherite:sword/upgrade_to_netherite_iron" - }, + "addition": "#advancednetherite:upgrade_to_netherite_iron", + "base": "#advancednetherite:sword/upgrade_to_netherite_iron", "result": { "count": 1, "id": "advancednetherite:netherite_iron_sword" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_diamond_armor.json b/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_diamond_armor.json new file mode 100644 index 00000000..23a301b0 --- /dev/null +++ b/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_diamond_armor.json @@ -0,0 +1,5 @@ +{ + "values": [ + "advancednetherite:netherite_diamond_ingot" + ] +} \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_diamond_tools.json b/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_diamond_tools.json new file mode 100644 index 00000000..23a301b0 --- /dev/null +++ b/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_diamond_tools.json @@ -0,0 +1,5 @@ +{ + "values": [ + "advancednetherite:netherite_diamond_ingot" + ] +} \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_emerald_armor.json b/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_emerald_armor.json new file mode 100644 index 00000000..dc6b1c2e --- /dev/null +++ b/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_emerald_armor.json @@ -0,0 +1,5 @@ +{ + "values": [ + "advancednetherite:netherite_emerald_ingot" + ] +} \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_emerald_tools.json b/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_emerald_tools.json new file mode 100644 index 00000000..dc6b1c2e --- /dev/null +++ b/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_emerald_tools.json @@ -0,0 +1,5 @@ +{ + "values": [ + "advancednetherite:netherite_emerald_ingot" + ] +} \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_gold_armor.json b/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_gold_armor.json new file mode 100644 index 00000000..c98e0127 --- /dev/null +++ b/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_gold_armor.json @@ -0,0 +1,5 @@ +{ + "values": [ + "advancednetherite:netherite_gold_ingot" + ] +} \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_gold_tools.json b/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_gold_tools.json new file mode 100644 index 00000000..c98e0127 --- /dev/null +++ b/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_gold_tools.json @@ -0,0 +1,5 @@ +{ + "values": [ + "advancednetherite:netherite_gold_ingot" + ] +} \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_iron_armor.json b/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_iron_armor.json new file mode 100644 index 00000000..ef214d3b --- /dev/null +++ b/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_iron_armor.json @@ -0,0 +1,5 @@ +{ + "values": [ + "advancednetherite:netherite_iron_ingot" + ] +} \ No newline at end of file diff --git a/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_iron_tools.json b/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_iron_tools.json new file mode 100644 index 00000000..ef214d3b --- /dev/null +++ b/NeoForge/src/generated/resources/data/advancednetherite/tags/item/repairs_netherite_iron_tools.json @@ -0,0 +1,5 @@ +{ + "values": [ + "advancednetherite:netherite_iron_ingot" + ] +} \ No newline at end of file diff --git a/NeoForge/src/main/java/com/autovw/advancednetherite/datagen/ModDataGenerator.java b/NeoForge/src/main/java/com/autovw/advancednetherite/datagen/ModDataGenerator.java index 8f67b0bc..ba57c139 100644 --- a/NeoForge/src/main/java/com/autovw/advancednetherite/datagen/ModDataGenerator.java +++ b/NeoForge/src/main/java/com/autovw/advancednetherite/datagen/ModDataGenerator.java @@ -6,8 +6,6 @@ import net.minecraft.core.HolderLookup; import net.minecraft.data.DataGenerator; import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.RecipeOutput; -import net.minecraft.data.recipes.RecipeProvider; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.common.data.ExistingFileHelper; @@ -52,6 +50,7 @@ public static void onGatherData(final GatherDataEvent event) // client generator.addProvider(event.includeClient(), new ModBlockStatesProvider(packOutput, AdvancedNetherite.MOD_ID, helper)); + generator.addProvider(event.includeClient(), new ModEquipmentModelProvider(packOutput)); generator.addProvider(event.includeClient(), new ModItemModelProvider(packOutput, AdvancedNetherite.MOD_ID, helper)); } } diff --git a/NeoForge/src/main/java/com/autovw/advancednetherite/datagen/providers/ModEquipmentModelProvider.java b/NeoForge/src/main/java/com/autovw/advancednetherite/datagen/providers/ModEquipmentModelProvider.java new file mode 100644 index 00000000..9e5b0364 --- /dev/null +++ b/NeoForge/src/main/java/com/autovw/advancednetherite/datagen/providers/ModEquipmentModelProvider.java @@ -0,0 +1,40 @@ +package com.autovw.advancednetherite.datagen.providers; + +import com.autovw.advancednetherite.core.util.ModEquipmentModels; +import net.minecraft.data.CachedOutput; +import net.minecraft.data.DataProvider; +import net.minecraft.data.PackOutput; +import net.minecraft.data.models.EquipmentModelProvider; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.equipment.EquipmentModel; + +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.CompletableFuture; + +/** + * @author Autovw + */ +public class ModEquipmentModelProvider extends EquipmentModelProvider +{ + protected final PackOutput.PathProvider pathProvider; + + public ModEquipmentModelProvider(PackOutput packOutput) + { + super(packOutput); + this.pathProvider = packOutput.createPathProvider(PackOutput.Target.RESOURCE_PACK, "models/equipment"); + } + + @Override + public CompletableFuture run(CachedOutput output) + { + Map map = new HashMap<>(); + ModEquipmentModels.bootstrap((id, model) -> { + if (map.putIfAbsent(id, model) != null) + { + throw new IllegalStateException("Duplicate equipment model for id: " + id.toString()); + } + }); + return DataProvider.saveAll(output, EquipmentModel.CODEC, this.pathProvider, map); + } +} diff --git a/NeoForge/src/main/java/com/autovw/advancednetherite/datagen/providers/ModItemModelProvider.java b/NeoForge/src/main/java/com/autovw/advancednetherite/datagen/providers/ModItemModelProvider.java index c45032af..277ae368 100644 --- a/NeoForge/src/main/java/com/autovw/advancednetherite/datagen/providers/ModItemModelProvider.java +++ b/NeoForge/src/main/java/com/autovw/advancednetherite/datagen/providers/ModItemModelProvider.java @@ -147,14 +147,15 @@ public void armorModel(Item item) TRIM_MATERIALS.forEach((trimMaterial, trimValue) -> { ResourceLocation id = AdvancedNetherite.getRegistryHelper().getItemById(armorItem); - String armorType = switch (armorItem.getEquipmentSlot(armorItem.getDefaultInstance())) - { - case HEAD -> "helmet"; - case CHEST -> "chestplate"; - case LEGS -> "leggings"; - case FEET -> "boots"; - default -> ""; - }; + String armorType = ""; + if (id.getPath().contains("helmet")) + armorType = "helmet"; + else if (id.getPath().contains("chestplate")) + armorType = "chestplate"; + else if (id.getPath().contains("leggings")) + armorType = "leggings"; + else if (id.getPath().contains("boots")) + armorType = "boots"; ResourceLocation armorTexture = ResourceLocation.fromNamespaceAndPath(id.getNamespace(), "item/" + id.getPath()); ResourceLocation trimTexture = mcLoc("trims/items/" + armorType + "_trim_" + trimMaterial.location().getPath()); diff --git a/NeoForge/src/main/java/com/autovw/advancednetherite/datagen/providers/ModRecipeProvider.java b/NeoForge/src/main/java/com/autovw/advancednetherite/datagen/providers/ModRecipeProvider.java index 400198ec..d69b4bc5 100644 --- a/NeoForge/src/main/java/com/autovw/advancednetherite/datagen/providers/ModRecipeProvider.java +++ b/NeoForge/src/main/java/com/autovw/advancednetherite/datagen/providers/ModRecipeProvider.java @@ -16,7 +16,6 @@ import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.Block; import net.neoforged.neoforge.common.Tags; -import net.neoforged.neoforge.common.data.internal.NeoForgeRecipeProvider; import java.util.concurrent.CompletableFuture; diff --git a/NeoForge/src/main/resources/META-INF/neoforge.mods.toml b/NeoForge/src/main/resources/META-INF/neoforge.mods.toml index 79a1c9e0..47c55c66 100644 --- a/NeoForge/src/main/resources/META-INF/neoforge.mods.toml +++ b/NeoForge/src/main/resources/META-INF/neoforge.mods.toml @@ -23,7 +23,7 @@ Visit the GitHub Wiki for more information on everything this mod adds. # 'required' requires the mod to exist, 'optional' does not # 'incompatible' will prevent the game from loading when the mod exists, and 'discouraged' will show a warning type="required" - versionRange="[21.3.0,)" + versionRange="[21.3.7-beta,)" ordering="NONE" side="BOTH" [[dependencies.advancednetherite]] diff --git a/gradle.properties b/gradle.properties index 88fd22da..47d3ecbe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,10 +13,10 @@ mod_author=Autovw minecraft_version=1.21.3 # Forge -forge_version=53.0.5 +forge_version=53.0.7 # NeoForge -neoforge_version=21.3.4-beta +neoforge_version=21.3.7-beta # Fabric fabric_loader_version=0.16.7