diff --git a/src/generated/resources/assets/anvilcraft/items/hardend_resin.json b/src/generated/resources/assets/anvilcraft/items/hardened_resin.json similarity index 52% rename from src/generated/resources/assets/anvilcraft/items/hardend_resin.json rename to src/generated/resources/assets/anvilcraft/items/hardened_resin.json index 77bb889cc4..be0b0ce8c2 100644 --- a/src/generated/resources/assets/anvilcraft/items/hardend_resin.json +++ b/src/generated/resources/assets/anvilcraft/items/hardened_resin.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "anvilcraft:item/hardend_resin" + "model": "anvilcraft:item/hardened_resin" } } \ No newline at end of file diff --git a/src/generated/resources/assets/anvilcraft/lang/en_ud.json b/src/generated/resources/assets/anvilcraft/lang/en_ud.json index 723eb1b01d..fb475f2352 100644 --- a/src/generated/resources/assets/anvilcraft/lang/en_ud.json +++ b/src/generated/resources/assets/anvilcraft/lang/en_ud.json @@ -1515,7 +1515,7 @@ "item.anvilcraft.gray_cement_bucket": "ʇǝʞɔnᗺ ʇuǝɯǝƆ ʎɐɹ⅁", "item.anvilcraft.green_cement_bucket": "ʇǝʞɔnᗺ ʇuǝɯǝƆ uǝǝɹ⅁", "item.anvilcraft.guide_book": "ʞooᗺ ǝpᴉn⅁ ʇɟɐɹƆꞁᴉʌuⱯ", - "item.anvilcraft.hardend_resin": "uᴉsǝᴚ puǝpɹɐH", + "item.anvilcraft.hardened_resin": "uᴉsǝᴚ pǝuǝpɹɐH", "item.anvilcraft.heavy_halberd_core": "ǝɹoƆ pɹǝqꞁɐH ʎʌɐǝH", "item.anvilcraft.heliostats.pos_set": "%s ǝʇɐᴉpɐɹɹᴉ ꞁꞁᴉM", "item.anvilcraft.helium_bucket": "ʇǝʞɔnᗺ ɯnᴉꞁǝH", diff --git a/src/generated/resources/assets/anvilcraft/lang/en_us.json b/src/generated/resources/assets/anvilcraft/lang/en_us.json index 3af95608a9..56ac32e7a4 100644 --- a/src/generated/resources/assets/anvilcraft/lang/en_us.json +++ b/src/generated/resources/assets/anvilcraft/lang/en_us.json @@ -1515,7 +1515,7 @@ "item.anvilcraft.gray_cement_bucket": "Gray Cement Bucket", "item.anvilcraft.green_cement_bucket": "Green Cement Bucket", "item.anvilcraft.guide_book": "AnvilCraft Guide Book", - "item.anvilcraft.hardend_resin": "Hardend Resin", + "item.anvilcraft.hardened_resin": "Hardened Resin", "item.anvilcraft.heavy_halberd_core": "Heavy Halberd Core", "item.anvilcraft.heliostats.pos_set": "Will irradiate %s", "item.anvilcraft.helium_bucket": "Helium Bucket", diff --git a/src/generated/resources/assets/anvilcraft/models/item/hardend_resin.json b/src/generated/resources/assets/anvilcraft/models/item/hardened_resin.json similarity index 57% rename from src/generated/resources/assets/anvilcraft/models/item/hardend_resin.json rename to src/generated/resources/assets/anvilcraft/models/item/hardened_resin.json index f40c4974ea..8d2292278f 100644 --- a/src/generated/resources/assets/anvilcraft/models/item/hardend_resin.json +++ b/src/generated/resources/assets/anvilcraft/models/item/hardened_resin.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "anvilcraft:item/hardend_resin" + "layer0": "anvilcraft:item/hardened_resin" } } \ No newline at end of file diff --git a/src/generated/resources/data/anvilcraft/advancement/recipes/building_blocks/comparator.json b/src/generated/resources/data/anvilcraft/advancement/recipes/building_blocks/comparator.json index 3a09e097ad..0d855924df 100644 --- a/src/generated/resources/data/anvilcraft/advancement/recipes/building_blocks/comparator.json +++ b/src/generated/resources/data/anvilcraft/advancement/recipes/building_blocks/comparator.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_hardend_resin": { + "has_hardened_resin": { "conditions": { "items": [ { - "items": "anvilcraft:hardend_resin" + "items": "anvilcraft:hardened_resin" } ] }, @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_hardend_resin" + "has_hardened_resin" ] ], "rewards": { diff --git a/src/generated/resources/data/anvilcraft/advancement/recipes/building_blocks/repeater.json b/src/generated/resources/data/anvilcraft/advancement/recipes/building_blocks/repeater.json index d5fe34ad8a..a4c4d44a9c 100644 --- a/src/generated/resources/data/anvilcraft/advancement/recipes/building_blocks/repeater.json +++ b/src/generated/resources/data/anvilcraft/advancement/recipes/building_blocks/repeater.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_hardend_resin": { + "has_hardened_resin": { "conditions": { "items": [ { - "items": "anvilcraft:hardend_resin" + "items": "anvilcraft:hardened_resin" } ] }, @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_hardend_resin" + "has_hardened_resin" ] ], "rewards": { diff --git a/src/generated/resources/data/anvilcraft/advancement/recipes/fast_cooking/hardend_resin.json b/src/generated/resources/data/anvilcraft/advancement/recipes/fast_cooking/hardened_resin.json similarity index 71% rename from src/generated/resources/data/anvilcraft/advancement/recipes/fast_cooking/hardend_resin.json rename to src/generated/resources/data/anvilcraft/advancement/recipes/fast_cooking/hardened_resin.json index 2d65e4d015..1a98822a06 100644 --- a/src/generated/resources/data/anvilcraft/advancement/recipes/fast_cooking/hardend_resin.json +++ b/src/generated/resources/data/anvilcraft/advancement/recipes/fast_cooking/hardened_resin.json @@ -3,7 +3,7 @@ "criteria": { "has_the_recipe": { "conditions": { - "recipe": "anvilcraft:fast_cooking/hardend_resin" + "recipe": "anvilcraft:fast_cooking/hardened_resin" }, "trigger": "minecraft:recipe_unlocked" } @@ -15,7 +15,7 @@ ], "rewards": { "recipes": [ - "anvilcraft:fast_cooking/hardend_resin" + "anvilcraft:fast_cooking/hardened_resin" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/anvilcraft/advancement/recipes/misc/circuit_board.json b/src/generated/resources/data/anvilcraft/advancement/recipes/misc/circuit_board.json index 7e668c9d46..419941d661 100644 --- a/src/generated/resources/data/anvilcraft/advancement/recipes/misc/circuit_board.json +++ b/src/generated/resources/data/anvilcraft/advancement/recipes/misc/circuit_board.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_hardend_resin": { + "has_hardened_resin": { "conditions": { "items": [ { - "items": "anvilcraft:hardend_resin" + "items": "anvilcraft:hardened_resin" } ] }, @@ -32,7 +32,7 @@ [ "has_the_recipe", "has_redstone_wire", - "has_hardend_resin" + "has_hardened_resin" ] ], "rewards": { diff --git a/src/generated/resources/data/anvilcraft/advancement/recipes/misc/pill_box.json b/src/generated/resources/data/anvilcraft/advancement/recipes/misc/pill_box.json index ce1acd45c2..be160c5099 100644 --- a/src/generated/resources/data/anvilcraft/advancement/recipes/misc/pill_box.json +++ b/src/generated/resources/data/anvilcraft/advancement/recipes/misc/pill_box.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "items": "anvilcraft:hardend_resin" + "items": "anvilcraft:hardened_resin" } ] }, diff --git a/src/generated/resources/data/anvilcraft/advancement/recipes/misc/processor.json b/src/generated/resources/data/anvilcraft/advancement/recipes/misc/processor.json index 7ba8335c06..3e63c8e082 100644 --- a/src/generated/resources/data/anvilcraft/advancement/recipes/misc/processor.json +++ b/src/generated/resources/data/anvilcraft/advancement/recipes/misc/processor.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_hardend_resin": { + "has_hardened_resin": { "conditions": { "items": [ { - "items": "anvilcraft:hardend_resin" + "items": "anvilcraft:hardened_resin" } ] }, @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_hardend_resin" + "has_hardened_resin" ] ], "rewards": { diff --git a/src/generated/resources/data/anvilcraft/advancement/recipes/redstone/big_red_button.json b/src/generated/resources/data/anvilcraft/advancement/recipes/redstone/big_red_button.json index 2675ae22b6..435c0d053d 100644 --- a/src/generated/resources/data/anvilcraft/advancement/recipes/redstone/big_red_button.json +++ b/src/generated/resources/data/anvilcraft/advancement/recipes/redstone/big_red_button.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_hardend_resin": { + "has_hardened_resin": { "conditions": { "items": [ { - "items": "anvilcraft:hardend_resin" + "items": "anvilcraft:hardened_resin" } ] }, @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_hardend_resin" + "has_hardened_resin" ] ], "rewards": { diff --git a/src/generated/resources/data/anvilcraft/advancement/recipes/tools/disk.json b/src/generated/resources/data/anvilcraft/advancement/recipes/tools/disk.json index 53d62e7320..b594e2bc73 100644 --- a/src/generated/resources/data/anvilcraft/advancement/recipes/tools/disk.json +++ b/src/generated/resources/data/anvilcraft/advancement/recipes/tools/disk.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_hardend_resin": { + "has_hardened_resin": { "conditions": { "items": [ { - "items": "anvilcraft:hardend_resin" + "items": "anvilcraft:hardened_resin" } ] }, @@ -41,7 +41,7 @@ "requirements": [ [ "has_the_recipe", - "has_hardend_resin", + "has_hardened_resin", "has_iron_ingot", "has_magnet_ingot" ] diff --git a/src/generated/resources/data/anvilcraft/advancement/recipes/tools/filter.json b/src/generated/resources/data/anvilcraft/advancement/recipes/tools/filter.json index 9c0e14a10a..5a0dcbf9c8 100644 --- a/src/generated/resources/data/anvilcraft/advancement/recipes/tools/filter.json +++ b/src/generated/resources/data/anvilcraft/advancement/recipes/tools/filter.json @@ -11,11 +11,11 @@ }, "trigger": "minecraft:inventory_changed" }, - "has_hardend_resin": { + "has_hardened_resin": { "conditions": { "items": [ { - "items": "anvilcraft:hardend_resin" + "items": "anvilcraft:hardened_resin" } ] }, @@ -41,7 +41,7 @@ "requirements": [ [ "has_the_recipe", - "has_hardend_resin", + "has_hardened_resin", "has_hopper", "has_circuit_board" ] diff --git a/src/generated/resources/data/anvilcraft/recipe/big_red_button.json b/src/generated/resources/data/anvilcraft/recipe/big_red_button.json index 24a682af07..f9900ed40b 100644 --- a/src/generated/resources/data/anvilcraft/recipe/big_red_button.json +++ b/src/generated/resources/data/anvilcraft/recipe/big_red_button.json @@ -2,7 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "redstone", "key": { - "H": "anvilcraft:hardend_resin", + "H": "anvilcraft:hardened_resin", "I": "minecraft:iron_ingot", "R": "minecraft:redstone" }, diff --git a/src/generated/resources/data/anvilcraft/recipe/buffer_boots.json b/src/generated/resources/data/anvilcraft/recipe/buffer_boots.json index b30c485762..bb48f8cfa6 100644 --- a/src/generated/resources/data/anvilcraft/recipe/buffer_boots.json +++ b/src/generated/resources/data/anvilcraft/recipe/buffer_boots.json @@ -4,7 +4,7 @@ "key": { "B": "anvilcraft:resin_block", "I": "minecraft:iron_boots", - "R": "anvilcraft:hardend_resin" + "R": "anvilcraft:hardened_resin" }, "pattern": [ "R R", diff --git a/src/generated/resources/data/anvilcraft/recipe/circuit_board.json b/src/generated/resources/data/anvilcraft/recipe/circuit_board.json index 6371ca752d..5035529346 100644 --- a/src/generated/resources/data/anvilcraft/recipe/circuit_board.json +++ b/src/generated/resources/data/anvilcraft/recipe/circuit_board.json @@ -2,7 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "R": "anvilcraft:hardend_resin", + "R": "anvilcraft:hardened_resin", "W": "anvilcraft:redstone_wire" }, "pattern": [ diff --git a/src/generated/resources/data/anvilcraft/recipe/comparator.json b/src/generated/resources/data/anvilcraft/recipe/comparator.json index a0780a23dd..7f24ec0c0f 100644 --- a/src/generated/resources/data/anvilcraft/recipe/comparator.json +++ b/src/generated/resources/data/anvilcraft/recipe/comparator.json @@ -2,7 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "B": "anvilcraft:hardend_resin", + "B": "anvilcraft:hardened_resin", "Q": "minecraft:quartz", "T": "minecraft:redstone_torch" }, diff --git a/src/generated/resources/data/anvilcraft/recipe/disk.json b/src/generated/resources/data/anvilcraft/recipe/disk.json index 45a9c52483..25d09658ea 100644 --- a/src/generated/resources/data/anvilcraft/recipe/disk.json +++ b/src/generated/resources/data/anvilcraft/recipe/disk.json @@ -2,7 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "A": "anvilcraft:hardend_resin", + "A": "anvilcraft:hardened_resin", "B": "minecraft:iron_ingot", "C": "anvilcraft:magnet_ingot" }, diff --git a/src/generated/resources/data/anvilcraft/recipe/fast_cooking/hardend_resin.json b/src/generated/resources/data/anvilcraft/recipe/fast_cooking/hardened_resin.json similarity index 76% rename from src/generated/resources/data/anvilcraft/recipe/fast_cooking/hardend_resin.json rename to src/generated/resources/data/anvilcraft/recipe/fast_cooking/hardened_resin.json index a2d629cebd..98aa7c45ff 100644 --- a/src/generated/resources/data/anvilcraft/recipe/fast_cooking/hardend_resin.json +++ b/src/generated/resources/data/anvilcraft/recipe/fast_cooking/hardened_resin.json @@ -7,7 +7,7 @@ ], "results": [ { - "id": "anvilcraft:hardend_resin" + "id": "anvilcraft:hardened_resin" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/anvilcraft/recipe/filter.json b/src/generated/resources/data/anvilcraft/recipe/filter.json index 2e09dec43b..50ce1a5ffe 100644 --- a/src/generated/resources/data/anvilcraft/recipe/filter.json +++ b/src/generated/resources/data/anvilcraft/recipe/filter.json @@ -2,7 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "A": "anvilcraft:hardend_resin", + "A": "anvilcraft:hardened_resin", "B": "minecraft:hopper", "C": "anvilcraft:circuit_board" }, diff --git a/src/generated/resources/data/anvilcraft/recipe/pill_box.json b/src/generated/resources/data/anvilcraft/recipe/pill_box.json index 14d7413d4d..0bda3a61e0 100644 --- a/src/generated/resources/data/anvilcraft/recipe/pill_box.json +++ b/src/generated/resources/data/anvilcraft/recipe/pill_box.json @@ -2,7 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "A": "anvilcraft:hardend_resin", + "A": "anvilcraft:hardened_resin", "B": "anvilcraft:pill" }, "pattern": [ diff --git a/src/generated/resources/data/anvilcraft/recipe/processor.json b/src/generated/resources/data/anvilcraft/recipe/processor.json index 95d863969d..7e325f497a 100644 --- a/src/generated/resources/data/anvilcraft/recipe/processor.json +++ b/src/generated/resources/data/anvilcraft/recipe/processor.json @@ -3,7 +3,7 @@ "category": "misc", "group": "anvilcraft:processor", "key": { - "B": "anvilcraft:hardend_resin", + "B": "anvilcraft:hardened_resin", "C": "#c:nuggets/copper", "D": "#c:gems/quartz" }, diff --git a/src/generated/resources/data/anvilcraft/recipe/repeater.json b/src/generated/resources/data/anvilcraft/recipe/repeater.json index 93899e9c4d..d392898c2e 100644 --- a/src/generated/resources/data/anvilcraft/recipe/repeater.json +++ b/src/generated/resources/data/anvilcraft/recipe/repeater.json @@ -2,7 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "B": "anvilcraft:hardend_resin", + "B": "anvilcraft:hardened_resin", "R": "minecraft:redstone", "T": "minecraft:redstone_torch" }, diff --git a/src/main/java/dev/dubhe/anvilcraft/data/recipe/FastCookingRecipeLoader.java b/src/main/java/dev/dubhe/anvilcraft/data/recipe/FastCookingRecipeLoader.java index 192da9bd99..058ffcc92f 100644 --- a/src/main/java/dev/dubhe/anvilcraft/data/recipe/FastCookingRecipeLoader.java +++ b/src/main/java/dev/dubhe/anvilcraft/data/recipe/FastCookingRecipeLoader.java @@ -16,7 +16,7 @@ public static void init(RegistrumRecipeProvider provider) { HolderGetter items = provider.getItems(); FastCookingRecipe.builder() .requires(items, ModItemTags.RESIN) - .result(ModItems.HARDEND_RESIN) + .result(ModItems.HARDENED_RESIN) .save(provider); FastCookingRecipe.builder() diff --git a/src/main/java/dev/dubhe/anvilcraft/data/recipe/RegistrumBlockRecipeLoader.java b/src/main/java/dev/dubhe/anvilcraft/data/recipe/RegistrumBlockRecipeLoader.java index 0921e78d7f..f5d7e1fe58 100644 --- a/src/main/java/dev/dubhe/anvilcraft/data/recipe/RegistrumBlockRecipeLoader.java +++ b/src/main/java/dev/dubhe/anvilcraft/data/recipe/RegistrumBlockRecipeLoader.java @@ -152,10 +152,10 @@ public static void bigRedButton(DataGenContext ctx, .pattern("RHR") .pattern("III") .define('R', Items.REDSTONE) - .define('H', ModItems.HARDEND_RESIN) + .define('H', ModItems.HARDENED_RESIN) .define('I', Items.IRON_INGOT) .unlockedBy( - AnvilCraftDatagen.hasItem(ModItems.HARDEND_RESIN), AnvilCraftDatagen.has(provider.getItems(), ModItems.HARDEND_RESIN) + AnvilCraftDatagen.hasItem(ModItems.HARDENED_RESIN), AnvilCraftDatagen.has(provider.getItems(), ModItems.HARDENED_RESIN) ) .save(provider); } diff --git a/src/main/java/dev/dubhe/anvilcraft/data/recipe/RegistrumItemRecipeLoader.java b/src/main/java/dev/dubhe/anvilcraft/data/recipe/RegistrumItemRecipeLoader.java index 9ccc3738c0..9b684afe69 100644 --- a/src/main/java/dev/dubhe/anvilcraft/data/recipe/RegistrumItemRecipeLoader.java +++ b/src/main/java/dev/dubhe/anvilcraft/data/recipe/RegistrumItemRecipeLoader.java @@ -570,10 +570,10 @@ public static void disk(DataGenContext ctx, RegistrumR .pattern("ABA") .pattern("ACA") .pattern("AAA") - .define('A', ModItems.HARDEND_RESIN) + .define('A', ModItems.HARDENED_RESIN) .define('B', Items.IRON_INGOT) .define('C', ModItems.MAGNET_INGOT) - .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.HARDEND_RESIN), AnvilCraftDatagen.has(lookup, ModItems.HARDEND_RESIN)) + .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.HARDENED_RESIN), AnvilCraftDatagen.has(lookup, ModItems.HARDENED_RESIN)) .unlockedBy(AnvilCraftDatagen.hasItem(Items.IRON_INGOT), AnvilCraftDatagen.has(lookup, Items.IRON_INGOT)) .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.MAGNET_INGOT), AnvilCraftDatagen.has(lookup, ModItems.MAGNET_INGOT)) .save(provider); @@ -597,10 +597,10 @@ public static void filter(DataGenContext ctx, Registru .pattern("ACA") .pattern("ABA") .pattern("AAA") - .define('A', ModItems.HARDEND_RESIN) + .define('A', ModItems.HARDENED_RESIN) .define('B', Items.HOPPER) .define('C', ModItems.CIRCUIT_BOARD) - .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.HARDEND_RESIN), AnvilCraftDatagen.has(lookup, ModItems.HARDEND_RESIN)) + .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.HARDENED_RESIN), AnvilCraftDatagen.has(lookup, ModItems.HARDENED_RESIN)) .unlockedBy(AnvilCraftDatagen.hasItem(Items.HOPPER), AnvilCraftDatagen.has(lookup, Items.HOPPER)) .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.CIRCUIT_BOARD), AnvilCraftDatagen.has(lookup, ModItems.CIRCUIT_BOARD)) .save(provider); @@ -667,9 +667,9 @@ public static void pillBox(DataGenContext ctx, Registr .pattern("AAA") .pattern("ABA") .pattern("AAA") - .define('A', ModItems.HARDEND_RESIN) + .define('A', ModItems.HARDENED_RESIN) .define('B', ModFoodItems.PILL) - .unlockedBy("has_hardend_resin", AnvilCraftDatagen.has(lookup, ModItems.HARDEND_RESIN)) + .unlockedBy("has_hardend_resin", AnvilCraftDatagen.has(lookup, ModItems.HARDENED_RESIN)) .unlockedBy("has_pill", AnvilCraftDatagen.has(lookup, ModFoodItems.PILL)) .save(provider); } @@ -844,7 +844,7 @@ public static void hyperdimensionTerminal(DataGenContext void hyperdimensionTerminalUnbind(DataGenContext ctx, RegistrumRecipeProvider provider) { @@ -1000,9 +1000,9 @@ public static void circuitBoard(DataGenContext ctx, Re .pattern("W") .pattern("R") .define('W', ModBlocks.REDSTONE_WIRE) - .define('R', ModItems.HARDEND_RESIN) + .define('R', ModItems.HARDENED_RESIN) .unlockedBy(AnvilCraftDatagen.hasItem(ModBlocks.REDSTONE_WIRE), AnvilCraftDatagen.has(lookup, ModBlocks.REDSTONE_WIRE)) - .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.HARDEND_RESIN), AnvilCraftDatagen.has(lookup, ModItems.HARDEND_RESIN)) + .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.HARDENED_RESIN), AnvilCraftDatagen.has(lookup, ModItems.HARDENED_RESIN)) .save(provider); } @@ -1012,13 +1012,13 @@ public static void processor(DataGenContext ctx, Regis .pattern("CDC") .pattern("DCD") .pattern("BBB") - .define('B', ModItems.HARDEND_RESIN) + .define('B', ModItems.HARDENED_RESIN) .define('C', ModItemTags.COPPER_NUGGETS) .define('D', Tags.Items.GEMS_QUARTZ) .group(ctx.getId().toString()) .unlockedBy( - AnvilCraftDatagen.hasItem(ModItems.HARDEND_RESIN), - AnvilCraftDatagen.has(lookup, ModItems.HARDEND_RESIN) + AnvilCraftDatagen.hasItem(ModItems.HARDENED_RESIN), + AnvilCraftDatagen.has(lookup, ModItems.HARDENED_RESIN) ) .save(provider); } @@ -1849,7 +1849,7 @@ public static void bufferArmor(DataGenContext ctx, Reg .pattern("R R") .pattern("RIR") .pattern("B B") - .define('R', ModItems.HARDEND_RESIN) + .define('R', ModItems.HARDENED_RESIN) .define('I', Items.IRON_BOOTS) .define('B', ModBlocks.RESIN_BLOCK) .unlockedBy("has_material", AnvilCraftDatagen.has(provider.getItems(), Items.IRON_BOOTS)) diff --git a/src/main/java/dev/dubhe/anvilcraft/data/recipe/VanillaRecipesLoader.java b/src/main/java/dev/dubhe/anvilcraft/data/recipe/VanillaRecipesLoader.java index 00c7051ff5..16281b5092 100644 --- a/src/main/java/dev/dubhe/anvilcraft/data/recipe/VanillaRecipesLoader.java +++ b/src/main/java/dev/dubhe/anvilcraft/data/recipe/VanillaRecipesLoader.java @@ -84,8 +84,8 @@ public static void init(RegistrumRecipeProvider provider) { .pattern("BBB") .define('R', Items.REDSTONE) .define('T', Items.REDSTONE_TORCH) - .define('B', ModItems.HARDEND_RESIN) - .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.HARDEND_RESIN), AnvilCraftDatagen.has(lookup, ModItems.HARDEND_RESIN)) + .define('B', ModItems.HARDENED_RESIN) + .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.HARDENED_RESIN), AnvilCraftDatagen.has(lookup, ModItems.HARDENED_RESIN)) .save(provider, AnvilCraft.recipe("repeater")); ShapedRecipeBuilder.shaped(lookup, RecipeCategory.BUILDING_BLOCKS, Items.COMPARATOR) .pattern(" T ") @@ -93,8 +93,8 @@ public static void init(RegistrumRecipeProvider provider) { .pattern("BBB") .define('Q', Items.QUARTZ) .define('T', Items.REDSTONE_TORCH) - .define('B', ModItems.HARDEND_RESIN) - .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.HARDEND_RESIN), AnvilCraftDatagen.has(lookup, ModItems.HARDEND_RESIN)) + .define('B', ModItems.HARDENED_RESIN) + .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.HARDENED_RESIN), AnvilCraftDatagen.has(lookup, ModItems.HARDENED_RESIN)) .save(provider, AnvilCraft.recipe("comparator")); ShapelessRecipeBuilder.shapeless(lookup, RecipeCategory.BUILDING_BLOCKS, Items.IRON_BLOCK, 9) diff --git a/src/main/java/dev/dubhe/anvilcraft/init/item/ModItems.java b/src/main/java/dev/dubhe/anvilcraft/init/item/ModItems.java index f5b7199970..6f7b7e2331 100644 --- a/src/main/java/dev/dubhe/anvilcraft/init/item/ModItems.java +++ b/src/main/java/dev/dubhe/anvilcraft/init/item/ModItems.java @@ -1145,8 +1145,12 @@ public void accept( .tag(Tags.Items.GEMS, ModItemTags.GEMS_AMBER) .recipe(RegistrumItemRecipeLoader::amber) .register(); - public static final ItemEntry HARDEND_RESIN = REGISTRUM.item("hardend_resin", Item::new) + public static final ItemEntry HARDENED_RESIN = REGISTRUM + .item("hardened_resin", Item::new) + .aliasFrom(AnvilCraft.of("hardend_resin")) .register(); + @Deprecated(forRemoval = true) + public static final ItemEntry HARDEND_RESIN = ModItems.HARDENED_RESIN; public static final ItemEntry WOOD_FIBER = REGISTRUM.item("wood_fiber", Item::new) .register(); public static final ItemEntry CIRCUIT_BOARD = REGISTRUM.item("circuit_board", Item::new) diff --git a/src/main/java/dev/dubhe/anvilcraft/init/item/tabs/Ingredients.java b/src/main/java/dev/dubhe/anvilcraft/init/item/tabs/Ingredients.java index 6f0f38dc5c..d08bdd9010 100644 --- a/src/main/java/dev/dubhe/anvilcraft/init/item/tabs/Ingredients.java +++ b/src/main/java/dev/dubhe/anvilcraft/init/item/tabs/Ingredients.java @@ -1,6 +1,5 @@ package dev.dubhe.anvilcraft.init.item.tabs; -import dev.dubhe.anvilcraft.init.item.ModFoodItems; import dev.dubhe.anvilcraft.init.item.ModItems; import net.minecraft.world.item.Items; @@ -10,7 +9,7 @@ public void accept() { this.plain(ModItems.SPONGE_GEMMULE); this.plain(ModItems.AMBER); this.plain(ModItems.RESIN); - this.plain(ModItems.HARDEND_RESIN); + this.plain(ModItems.HARDENED_RESIN); this.plain(ModItems.WOOD_FIBER); this.plain(ModItems.LIME_POWDER); this.plain(ModItems.CRAB_CLAW); diff --git a/src/main/java/dev/dubhe/anvilcraft/init/item/tabs/ItemsSections.java b/src/main/java/dev/dubhe/anvilcraft/init/item/tabs/ItemsSections.java index 376bad55c5..79a8b088a8 100644 --- a/src/main/java/dev/dubhe/anvilcraft/init/item/tabs/ItemsSections.java +++ b/src/main/java/dev/dubhe/anvilcraft/init/item/tabs/ItemsSections.java @@ -235,7 +235,7 @@ public void accept() { content.accept(ModItems.MULTIPHASE_MATTER); content.accept(ModItems.RESIN); content.accept(ModItems.AMBER); - content.accept(ModItems.HARDEND_RESIN); + content.accept(ModItems.HARDENED_RESIN); content.accept(ModItems.WOOD_FIBER); content.accept(ModItems.SPONGE_GEMMULE); content.accept(ModItems.LIME_POWDER); diff --git a/src/main/java/dev/dubhe/anvilcraft/recipe/generate/JewelCraftingRecipeGeneratingCache.java b/src/main/java/dev/dubhe/anvilcraft/recipe/generate/JewelCraftingRecipeGeneratingCache.java index 9cfcfae2f5..0893a71355 100644 --- a/src/main/java/dev/dubhe/anvilcraft/recipe/generate/JewelCraftingRecipeGeneratingCache.java +++ b/src/main/java/dev/dubhe/anvilcraft/recipe/generate/JewelCraftingRecipeGeneratingCache.java @@ -9,7 +9,6 @@ import net.minecraft.core.registries.Registries; import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; -import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.item.crafting.SmithingTrimRecipe; import net.minecraft.world.level.block.entity.DecoratedPotPatterns; @@ -21,7 +20,7 @@ import java.util.Optional; public class JewelCraftingRecipeGeneratingCache extends BaseGeneratingCache { - private static final Logger logger = logger(); + private static final Logger logger = BaseGeneratingCache.logger(); private final List bannerPatterns = new ArrayList<>(); private final List musicDiscs = new ArrayList<>(); @@ -32,19 +31,22 @@ public JewelCraftingRecipeGeneratingCache(HolderLookup.Provider registries, Coll super(registries, "jewel_crafting", "jewel crafting recipe"); for (Holder holder : registries.lookupOrThrow(Registries.ITEM).listElements().toList()) { if (holder.components().has(DataComponents.PROVIDES_BANNER_PATTERNS)) { - logger.debug( - "Add a banner pattern {} for generating jewel crafting recipes", BuiltInRegistries.ITEM.getKey(holder.value())); + JewelCraftingRecipeGeneratingCache.logger.debug( + "Add a banner pattern {} for generating jewel crafting recipes", BuiltInRegistries.ITEM.getKey(holder.value()) + ); this.bannerPatterns.add(holder.value()); } else if (holder.components().has(DataComponents.JUKEBOX_PLAYABLE)) { - logger.debug( - "Add a music disc {} for generating jewel crafting recipes", BuiltInRegistries.ITEM.getKey(holder.value())); + JewelCraftingRecipeGeneratingCache.logger.debug( + "Add a music disc {} for generating jewel crafting recipes", BuiltInRegistries.ITEM.getKey(holder.value()) + ); this.musicDiscs.add(holder.value()); } else if ( DecoratedPotPatterns.getPatternFromItem(holder.value()) != null - && !holder.value().equals(Items.BRICK) + && !holder.value().equals(Items.BRICK) ) { - logger.debug( - "Add a pottery sherd {} for generating jewel crafting recipes", BuiltInRegistries.ITEM.getKey(holder.value())); + JewelCraftingRecipeGeneratingCache.logger.debug( + "Add a pottery sherd {} for generating jewel crafting recipes", BuiltInRegistries.ITEM.getKey(holder.value()) + ); this.potterySherds.add(holder.value()); } } @@ -58,7 +60,8 @@ public JewelCraftingRecipeGeneratingCache(HolderLookup.Provider registries, Coll @Override public Optional>> buildRecipes() { - if (this.bannerPatterns.isEmpty() + if ( + this.bannerPatterns.isEmpty() && this.musicDiscs.isEmpty() && this.potterySherds.isEmpty() && this.trimTemplates.isEmpty() @@ -75,16 +78,16 @@ public Optional>> buildRecipes() { .result(bannerPattern) .hasVanishingCurse(false) .buildRecipe(); - recipeHolders.add(new RecipeHolder<>(generateRecipeId("banner_patterns", bannerPattern, bannerPattern), recipe)); + recipeHolders.add(new RecipeHolder<>(this.generateRecipeId("banner_patterns", bannerPattern, bannerPattern), recipe)); } for (Item musicDisc : this.musicDiscs) { JewelCraftingRecipe recipe = JewelCraftingRecipe.builder(this.registries.lookupOrThrow(Registries.ITEM)) - .requires(ModItems.HARDEND_RESIN, 4) + .requires(ModItems.HARDENED_RESIN, 4) .requires(Items.PAPER) .result(musicDisc) .hasVanishingCurse(false) .buildRecipe(); - recipeHolders.add(new RecipeHolder<>(generateRecipeId("music_discs", musicDisc, musicDisc), recipe)); + recipeHolders.add(new RecipeHolder<>(this.generateRecipeId("music_discs", musicDisc, musicDisc), recipe)); } for (Item potterySherd : this.potterySherds) { JewelCraftingRecipe recipe = JewelCraftingRecipe.builder(this.registries.lookupOrThrow(Registries.ITEM)) @@ -92,7 +95,7 @@ public Optional>> buildRecipes() { .result(potterySherd) .hasVanishingCurse(false) .buildRecipe(); - recipeHolders.add(new RecipeHolder<>(generateRecipeId("pottery_sherds", potterySherd, potterySherd), recipe)); + recipeHolders.add(new RecipeHolder<>(this.generateRecipeId("pottery_sherds", potterySherd, potterySherd), recipe)); } for (Item trimTemplate : this.trimTemplates) { JewelCraftingRecipe recipe = JewelCraftingRecipe.builder(this.registries.lookupOrThrow(Registries.ITEM)) @@ -101,7 +104,7 @@ public Optional>> buildRecipes() { .result(trimTemplate) .hasVanishingCurse(false) .buildRecipe(); - recipeHolders.add(new RecipeHolder<>(generateRecipeId("trim_templates", trimTemplate, trimTemplate), recipe)); + recipeHolders.add(new RecipeHolder<>(this.generateRecipeId("trim_templates", trimTemplate, trimTemplate), recipe)); } return Optional.of(recipeHolders); diff --git a/src/main/resources/assets/anvilcraft/models/item/capacitor_empty.json b/src/main/resources/assets/anvilcraft/models/item/capacitor_empty.json deleted file mode 100644 index ac2f18cf8c..0000000000 --- a/src/main/resources/assets/anvilcraft/models/item/capacitor_empty.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "anvilcraft:item/capacitor", - "textures": { - "0": "anvilcraft:item/capacitor_empty", - "particle": "anvilcraft:item/capacitor_empty" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/item/empty_capacitor.json b/src/main/resources/assets/anvilcraft/models/item/empty_capacitor.json new file mode 100644 index 0000000000..2ca73ecf26 --- /dev/null +++ b/src/main/resources/assets/anvilcraft/models/item/empty_capacitor.json @@ -0,0 +1,7 @@ +{ + "parent": "anvilcraft:item/capacitor", + "textures": { + "0": "anvilcraft:item/empty_capacitor", + "particle": "anvilcraft:item/empty_capacitor" + } +} diff --git a/src/main/resources/assets/anvilcraft/models/item/supercapacitor_empty.json b/src/main/resources/assets/anvilcraft/models/item/empty_supercapacitor.json similarity index 98% rename from src/main/resources/assets/anvilcraft/models/item/supercapacitor_empty.json rename to src/main/resources/assets/anvilcraft/models/item/empty_supercapacitor.json index 635a27d52a..f244c67f57 100644 --- a/src/main/resources/assets/anvilcraft/models/item/supercapacitor_empty.json +++ b/src/main/resources/assets/anvilcraft/models/item/empty_supercapacitor.json @@ -2,8 +2,8 @@ "credit": "Made by XeKr with Blockbench", "ambientocclusion": false, "textures": { - "0": "anvilcraft:item/supercapacitor_empty", - "particle": "anvilcraft:item/supercapacitor_empty" + "0": "anvilcraft:item/empty_supercapacitor", + "particle": "anvilcraft:item/empty_supercapacitor" }, "elements": [ { @@ -178,4 +178,4 @@ "translation": [0, 13, 0] } } -} \ No newline at end of file +}