From 70b619d42d56d05ce6773e93907e6fa96a13496d Mon Sep 17 00:00:00 2001 From: wdfaESfaef <2622389575@qq.com> Date: Fri, 12 Apr 2024 18:45:58 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=89=A9?= =?UTF-8?q?=E5=93=81=E5=92=8C=E9=85=8D=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BulgingAndCrystallizeRecipesLoader.java | 1 + .../recipe/StampingRecipesLoader.java | 15 ++++ .../recipe/VanillaRecipesLoader.java | 16 ++++ .../dubhe/anvilcraft/init/ModItemGroups.java | 4 + .../dev/dubhe/anvilcraft/init/ModItems.java | 12 +++ .../assets/anvilcraft/lang/en_ud.json | 4 + .../assets/anvilcraft/lang/en_us.json | 4 + .../models/item/prismarine_blade.json | 6 ++ .../models/item/prismarine_cluster.json | 6 ++ .../models/item/sea_heart_shell.json | 6 ++ .../models/item/sea_heart_shell_shard.json | 6 ++ .../advancements/recipes/combat/trident.json | 35 +++++++++ .../crystallize/prismarine_cluster_1.json | 35 +++++++++ .../crystallize/prismarine_cluster_2.json | 35 +++++++++ .../crystallize/prismarine_cluster_3.json | 35 +++++++++ .../recipes/misc/heart_of_the_sea.json | 35 +++++++++ .../misc/stamping/prismarine_blade.json | 35 +++++++++ .../misc/stamping/sea_heart_shell_shard.json | 35 +++++++++ .../crystallize/prismarine_cluster_1.json | 66 ++++++++++++++++ .../crystallize/prismarine_cluster_2.json | 67 ++++++++++++++++ .../crystallize/prismarine_cluster_3.json | 67 ++++++++++++++++ .../anvilcraft/recipes/heart_of_the_sea.json | 21 +++++ .../recipes/stamping/prismarine_blade.json | 76 +++++++++++++++++++ .../stamping/sea_heart_shell_shard.json | 65 ++++++++++++++++ .../data/anvilcraft/recipes/trident.json | 21 +++++ .../assets/anvilcraft/lang/en_ud.json | 4 + .../assets/anvilcraft/lang/en_us.json | 4 + .../models/item/prismarine_blade.json | 6 ++ .../models/item/prismarine_cluster.json | 6 ++ .../models/item/sea_heart_shell.json | 6 ++ .../models/item/sea_heart_shell_shard.json | 6 ++ .../advancements/recipes/combat/trident.json | 35 +++++++++ .../crystallize/prismarine_cluster_1.json | 35 +++++++++ .../crystallize/prismarine_cluster_2.json | 35 +++++++++ .../crystallize/prismarine_cluster_3.json | 35 +++++++++ .../recipes/misc/heart_of_the_sea.json | 35 +++++++++ .../misc/stamping/prismarine_blade.json | 35 +++++++++ .../misc/stamping/sea_heart_shell_shard.json | 35 +++++++++ .../crystallize/prismarine_cluster_1.json | 66 ++++++++++++++++ .../crystallize/prismarine_cluster_2.json | 67 ++++++++++++++++ .../crystallize/prismarine_cluster_3.json | 67 ++++++++++++++++ .../anvilcraft/recipes/heart_of_the_sea.json | 21 +++++ .../recipes/stamping/prismarine_blade.json | 76 +++++++++++++++++++ .../stamping/sea_heart_shell_shard.json | 65 ++++++++++++++++ .../data/anvilcraft/recipes/trident.json | 21 +++++ 45 files changed, 1368 insertions(+) create mode 100644 fabric/src/generated/resources/assets/anvilcraft/models/item/prismarine_blade.json create mode 100644 fabric/src/generated/resources/assets/anvilcraft/models/item/prismarine_cluster.json create mode 100644 fabric/src/generated/resources/assets/anvilcraft/models/item/sea_heart_shell.json create mode 100644 fabric/src/generated/resources/assets/anvilcraft/models/item/sea_heart_shell_shard.json create mode 100644 fabric/src/generated/resources/data/anvilcraft/advancements/recipes/combat/trident.json create mode 100644 fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_1.json create mode 100644 fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_2.json create mode 100644 fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_3.json create mode 100644 fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/heart_of_the_sea.json create mode 100644 fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/stamping/prismarine_blade.json create mode 100644 fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/stamping/sea_heart_shell_shard.json create mode 100644 fabric/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_1.json create mode 100644 fabric/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_2.json create mode 100644 fabric/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_3.json create mode 100644 fabric/src/generated/resources/data/anvilcraft/recipes/heart_of_the_sea.json create mode 100644 fabric/src/generated/resources/data/anvilcraft/recipes/stamping/prismarine_blade.json create mode 100644 fabric/src/generated/resources/data/anvilcraft/recipes/stamping/sea_heart_shell_shard.json create mode 100644 fabric/src/generated/resources/data/anvilcraft/recipes/trident.json create mode 100644 forge/src/generated/resources/assets/anvilcraft/models/item/prismarine_blade.json create mode 100644 forge/src/generated/resources/assets/anvilcraft/models/item/prismarine_cluster.json create mode 100644 forge/src/generated/resources/assets/anvilcraft/models/item/sea_heart_shell.json create mode 100644 forge/src/generated/resources/assets/anvilcraft/models/item/sea_heart_shell_shard.json create mode 100644 forge/src/generated/resources/data/anvilcraft/advancements/recipes/combat/trident.json create mode 100644 forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_1.json create mode 100644 forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_2.json create mode 100644 forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_3.json create mode 100644 forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/heart_of_the_sea.json create mode 100644 forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/stamping/prismarine_blade.json create mode 100644 forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/stamping/sea_heart_shell_shard.json create mode 100644 forge/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_1.json create mode 100644 forge/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_2.json create mode 100644 forge/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_3.json create mode 100644 forge/src/generated/resources/data/anvilcraft/recipes/heart_of_the_sea.json create mode 100644 forge/src/generated/resources/data/anvilcraft/recipes/stamping/prismarine_blade.json create mode 100644 forge/src/generated/resources/data/anvilcraft/recipes/stamping/sea_heart_shell_shard.json create mode 100644 forge/src/generated/resources/data/anvilcraft/recipes/trident.json diff --git a/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/BulgingAndCrystallizeRecipesLoader.java b/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/BulgingAndCrystallizeRecipesLoader.java index c59e35634..e8bcbace1 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/BulgingAndCrystallizeRecipesLoader.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/BulgingAndCrystallizeRecipesLoader.java @@ -30,6 +30,7 @@ public static void init(RegistrateRecipeProvider provider) { bulging(ModItems.FLOUR.get(), ModItems.DOUGH.get(), provider); bulging(ModItems.BARK.get(), ModItems.PULP.get(), provider); bulging(ModItems.SPONGE_GEMMULE.get(), Items.WET_SPONGE, provider); + crystallize(ModItems.SEA_HEART_SHELL_SHARD.get(), ModItems.PRISMARINE_CLUSTER.get(),provider); } private static void bulging(Item item, Item item1, RegistrateRecipeProvider provider) { diff --git a/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/StampingRecipesLoader.java b/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/StampingRecipesLoader.java index df6db0e6b..18e0be1ea 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/StampingRecipesLoader.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/StampingRecipesLoader.java @@ -29,6 +29,21 @@ public static void init(RegistrateRecipeProvider provider) { .spawnItem(new Vec3(0.0, -0.75, 0.0), ModItems.COCOA_POWDER) .unlockedBy(AnvilCraftDatagen.hasItem(Items.COCOA_BEANS), AnvilCraftDatagen.has(Items.COCOA_BEANS)) .save(provider, AnvilCraft.of("stamping/cocoa")); + AnvilRecipe.Builder.create(RecipeCategory.MISC) + .hasBlock(ModBlocks.STAMPING_PLATFORM.get()) + .hasItemIngredient(new Vec3(0.0, -0.75, 0.0), Items.HEART_OF_THE_SEA) + .spawnItem(new Vec3(0.0, -0.75, 0.0), ModItems.SEA_HEART_SHELL_SHARD,3) + .spawnItem(new Vec3(0.0, -0.75, 0.0), ModItems.SAPPHIRE) + .unlockedBy(AnvilCraftDatagen.hasItem(Items.HEART_OF_THE_SEA), AnvilCraftDatagen.has(Items.HEART_OF_THE_SEA)) + .save(provider, AnvilCraft.of("stamping/sea_heart_shell_shard")); + AnvilRecipe.Builder.create(RecipeCategory.MISC) + .hasBlock(ModBlocks.STAMPING_PLATFORM.get()) + .hasItemIngredient(new Vec3(0.0, -0.75, 0.0), ModItems.PRISMARINE_CLUSTER) + .spawnItem(new Vec3(0.0, -0.75, 0.0), ModItems.PRISMARINE_BLADE) + .spawnItem(new Vec3(0.0, -0.75, 0.0), Items.PRISMARINE_CRYSTALS,2) + .spawnItem(new Vec3(0.0, -0.75, 0.0), Items.PRISMARINE_SHARD) + .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.PRISMARINE_CLUSTER.get()), AnvilCraftDatagen.has(ModItems.PRISMARINE_CLUSTER)) + .save(provider, AnvilCraft.of("stamping/prismarine_blade")); } public static void stamping(Item item, Item item1, RegistrateRecipeProvider provider) { diff --git a/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/VanillaRecipesLoader.java b/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/VanillaRecipesLoader.java index 9ef6579bd..1325b977b 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/VanillaRecipesLoader.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/VanillaRecipesLoader.java @@ -44,6 +44,22 @@ public static void init(RegistrateRecipeProvider provider) { .unlockedBy(AnvilCraftDatagen.hasItem(Items.IRON_BLOCK), AnvilCraftDatagen.has(Items.IRON_BLOCK)) .unlockedBy(AnvilCraftDatagen.hasItem(Items.IRON_INGOT), AnvilCraftDatagen.has(Items.IRON_INGOT)) .save(provider); + ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, Items.TRIDENT) + .pattern(" AA") + .pattern(" BA") + .pattern("B ") + .define('A', ModItems.PRISMARINE_BLADE) + .define('B', Items.PRISMARINE_BRICKS) + .unlockedBy("hasitem", AnvilCraftDatagen.has(ModItems.PRISMARINE_BLADE)) + .save(provider); + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, Items.HEART_OF_THE_SEA) + .pattern("A") + .pattern("B") + .pattern("A") + .define('A', ModItems.SEA_HEART_SHELL) + .define('B', ModItems.SAPPHIRE) + .unlockedBy("hasitem", AnvilCraftDatagen.has(ModItems.SEA_HEART_SHELL)) + .save(provider); SimpleCookingRecipeBuilder.campfireCooking(Ingredient.of(ModItemTags.DOUGH), RecipeCategory.FOOD, Items.BREAD, 0.35f, 600) .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.DOUGH.get()), AnvilCraftDatagen.has(ModItems.DOUGH)) diff --git a/common/src/main/java/dev/dubhe/anvilcraft/init/ModItemGroups.java b/common/src/main/java/dev/dubhe/anvilcraft/init/ModItemGroups.java index 43960a9c7..3c15f9ef7 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/init/ModItemGroups.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/init/ModItemGroups.java @@ -39,6 +39,10 @@ public class ModItemGroups { entries.accept(ModItems.RESIN.get().getDefaultInstance()); entries.accept(ModItems.AMBER.get().getDefaultInstance()); entries.accept(ModItems.SPONGE_GEMMULE.get().getDefaultInstance()); + entries.accept(ModItems.SEA_HEART_SHELL_SHARD.get().getDefaultInstance()); + entries.accept(ModItems.SEA_HEART_SHELL.get().getDefaultInstance()); + entries.accept(ModItems.PRISMARINE_CLUSTER.get().getDefaultInstance()); + entries.accept(ModItems.PRISMARINE_BLADE.get().getDefaultInstance()); entries.accept(ModItems.COCOA_LIQUOR.get().getDefaultInstance()); entries.accept(ModItems.COCOA_BUTTER.get().getDefaultInstance()); entries.accept(ModItems.COCOA_POWDER.get().getDefaultInstance()); diff --git a/common/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java b/common/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java index 9919becd7..75bb506cd 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java @@ -421,6 +421,18 @@ public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, @No .save(provider) ) .register(); + public static final ItemEntry PRISMARINE_BLADE = REGISTRATE + .item("prismarine_blade", Item::new) + .register(); + public static final ItemEntry PRISMARINE_CLUSTER = REGISTRATE + .item("prismarine_cluster", Item::new) + .register(); + public static final ItemEntry SEA_HEART_SHELL = REGISTRATE + .item("sea_heart_shell", Item::new) + .register(); + public static final ItemEntry SEA_HEART_SHELL_SHARD = REGISTRATE + .item("sea_heart_shell_shard", Item::new) + .register(); public static void register() { } diff --git a/fabric/src/generated/resources/assets/anvilcraft/lang/en_ud.json b/fabric/src/generated/resources/assets/anvilcraft/lang/en_ud.json index 916501c5a..fe999c8bf 100644 --- a/fabric/src/generated/resources/assets/anvilcraft/lang/en_ud.json +++ b/fabric/src/generated/resources/assets/anvilcraft/lang/en_ud.json @@ -52,6 +52,8 @@ "item.anvilcraft.nether_star_shard": "pɹɐɥS ɹɐʇS ɹǝɥʇǝN", "item.anvilcraft.netherite_coil": "ןıoƆ ǝʇıɹǝɥʇǝN", "item.anvilcraft.netherite_core": "ǝɹoƆ ǝʇıɹǝɥʇǝN", + "item.anvilcraft.prismarine_blade": "ǝpɐןᗺ ǝuıɹɐɯsıɹԀ", + "item.anvilcraft.prismarine_cluster": "ɹǝʇsnןƆ ǝuıɹɐɯsıɹԀ", "item.anvilcraft.pulp": "dןnԀ", "item.anvilcraft.resin": "uısǝᴚ", "item.anvilcraft.royal_steel_ingot": "ʇobuI ןǝǝʇS ןɐʎoᴚ", @@ -59,6 +61,8 @@ "item.anvilcraft.royal_steel_pickaxe": "ǝxɐʞɔıԀ ןǝǝʇS ןɐʎoᴚ", "item.anvilcraft.ruby": "ʎqnᴚ", "item.anvilcraft.sapphire": "ǝɹıɥddɐS", + "item.anvilcraft.sea_heart_shell": "ןןǝɥS ʇɹɐǝH ɐǝS", + "item.anvilcraft.sea_heart_shell_shard": "pɹɐɥS ןןǝɥS ʇɹɐǝH ɐǝS", "item.anvilcraft.sponge_gemmule": "ǝןnɯɯǝ⅁ ǝbuodS", "item.anvilcraft.topaz": "zɐdo⟘", "item.anvilcraft.utusan": "uɐsnʇ∩", diff --git a/fabric/src/generated/resources/assets/anvilcraft/lang/en_us.json b/fabric/src/generated/resources/assets/anvilcraft/lang/en_us.json index a97466a4b..1e4dc093f 100644 --- a/fabric/src/generated/resources/assets/anvilcraft/lang/en_us.json +++ b/fabric/src/generated/resources/assets/anvilcraft/lang/en_us.json @@ -52,6 +52,8 @@ "item.anvilcraft.nether_star_shard": "Nether Star Shard", "item.anvilcraft.netherite_coil": "Netherite Coil", "item.anvilcraft.netherite_core": "Netherite Core", + "item.anvilcraft.prismarine_blade": "Prismarine Blade", + "item.anvilcraft.prismarine_cluster": "Prismarine Cluster", "item.anvilcraft.pulp": "Pulp", "item.anvilcraft.resin": "Resin", "item.anvilcraft.royal_steel_ingot": "Royal Steel Ingot", @@ -59,6 +61,8 @@ "item.anvilcraft.royal_steel_pickaxe": "Royal Steel Pickaxe", "item.anvilcraft.ruby": "Ruby", "item.anvilcraft.sapphire": "Sapphire", + "item.anvilcraft.sea_heart_shell": "Sea Heart Shell", + "item.anvilcraft.sea_heart_shell_shard": "Sea Heart Shell Shard", "item.anvilcraft.sponge_gemmule": "Sponge Gemmule", "item.anvilcraft.topaz": "Topaz", "item.anvilcraft.utusan": "Utusan", diff --git a/fabric/src/generated/resources/assets/anvilcraft/models/item/prismarine_blade.json b/fabric/src/generated/resources/assets/anvilcraft/models/item/prismarine_blade.json new file mode 100644 index 000000000..67723e544 --- /dev/null +++ b/fabric/src/generated/resources/assets/anvilcraft/models/item/prismarine_blade.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "anvilcraft:item/prismarine_blade" + } +} \ No newline at end of file diff --git a/fabric/src/generated/resources/assets/anvilcraft/models/item/prismarine_cluster.json b/fabric/src/generated/resources/assets/anvilcraft/models/item/prismarine_cluster.json new file mode 100644 index 000000000..808788390 --- /dev/null +++ b/fabric/src/generated/resources/assets/anvilcraft/models/item/prismarine_cluster.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "anvilcraft:item/prismarine_cluster" + } +} \ No newline at end of file diff --git a/fabric/src/generated/resources/assets/anvilcraft/models/item/sea_heart_shell.json b/fabric/src/generated/resources/assets/anvilcraft/models/item/sea_heart_shell.json new file mode 100644 index 000000000..ba8ad39e0 --- /dev/null +++ b/fabric/src/generated/resources/assets/anvilcraft/models/item/sea_heart_shell.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "anvilcraft:item/sea_heart_shell" + } +} \ No newline at end of file diff --git a/fabric/src/generated/resources/assets/anvilcraft/models/item/sea_heart_shell_shard.json b/fabric/src/generated/resources/assets/anvilcraft/models/item/sea_heart_shell_shard.json new file mode 100644 index 000000000..c8837e349 --- /dev/null +++ b/fabric/src/generated/resources/assets/anvilcraft/models/item/sea_heart_shell_shard.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "anvilcraft:item/sea_heart_shell_shard" + } +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/combat/trident.json b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/combat/trident.json new file mode 100644 index 000000000..8c41a7882 --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/combat/trident.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:trident" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "hasitem": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:prismarine_blade" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "hasitem", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:trident" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_1.json b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_1.json new file mode 100644 index 000000000..bc4f41111 --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_1.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_sea_heart_shell_shard": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:sea_heart_shell_shard" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:crystallize/prismarine_cluster_1" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_sea_heart_shell_shard", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:crystallize/prismarine_cluster_1" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_2.json b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_2.json new file mode 100644 index 000000000..d66dcde46 --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_2.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_sea_heart_shell_shard": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:sea_heart_shell_shard" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:crystallize/prismarine_cluster_2" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_sea_heart_shell_shard", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:crystallize/prismarine_cluster_2" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_3.json b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_3.json new file mode 100644 index 000000000..75ebcf5a8 --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_3.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_sea_heart_shell_shard": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:sea_heart_shell_shard" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:crystallize/prismarine_cluster_3" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_sea_heart_shell_shard", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:crystallize/prismarine_cluster_3" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/heart_of_the_sea.json b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/heart_of_the_sea.json new file mode 100644 index 000000000..ebdc61e5c --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/heart_of_the_sea.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:heart_of_the_sea" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "hasitem": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:sea_heart_shell" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "hasitem", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:heart_of_the_sea" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/stamping/prismarine_blade.json b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/stamping/prismarine_blade.json new file mode 100644 index 000000000..02840466f --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/stamping/prismarine_blade.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_prismarine_cluster": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:prismarine_cluster" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:stamping/prismarine_blade" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_prismarine_cluster", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:stamping/prismarine_blade" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/stamping/sea_heart_shell_shard.json b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/stamping/sea_heart_shell_shard.json new file mode 100644 index 000000000..485619363 --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/stamping/sea_heart_shell_shard.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_heart_of_the_sea": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:heart_of_the_sea" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:stamping/sea_heart_shell_shard" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_heart_of_the_sea", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:stamping/sea_heart_shell_shard" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_1.json b/fabric/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_1.json new file mode 100644 index 000000000..416293fa2 --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_1.json @@ -0,0 +1,66 @@ +{ + "type": "anvilcraft:anvil_processing", + "icon": { + "item": "anvilcraft:prismarine_cluster" + }, + "outcomes": [ + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "item": "anvilcraft:prismarine_cluster" + } + }, + { + "type": "set_block", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "block": "minecraft:cauldron" + } + } + ], + "predicates": [ + { + "type": "has_block", + "match_block": { + "blocks": [ + "minecraft:powder_snow_cauldron" + ], + "state": { + "level": "1" + } + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + }, + { + "type": "has_item_ingredient", + "match_item": { + "count": { + "min": 1 + }, + "items": [ + "anvilcraft:sea_heart_shell_shard" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + } + ] +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_2.json b/fabric/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_2.json new file mode 100644 index 000000000..24d03ddde --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_2.json @@ -0,0 +1,67 @@ +{ + "type": "anvilcraft:anvil_processing", + "icon": { + "item": "anvilcraft:prismarine_cluster" + }, + "outcomes": [ + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "item": "anvilcraft:prismarine_cluster" + } + }, + { + "type": "set_block", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "block": "minecraft:powder_snow_cauldron", + "state": "[level=1]" + } + } + ], + "predicates": [ + { + "type": "has_block", + "match_block": { + "blocks": [ + "minecraft:powder_snow_cauldron" + ], + "state": { + "level": "2" + } + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + }, + { + "type": "has_item_ingredient", + "match_item": { + "count": { + "min": 1 + }, + "items": [ + "anvilcraft:sea_heart_shell_shard" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + } + ] +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_3.json b/fabric/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_3.json new file mode 100644 index 000000000..820056fb8 --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_3.json @@ -0,0 +1,67 @@ +{ + "type": "anvilcraft:anvil_processing", + "icon": { + "item": "anvilcraft:prismarine_cluster" + }, + "outcomes": [ + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "item": "anvilcraft:prismarine_cluster" + } + }, + { + "type": "set_block", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "block": "minecraft:powder_snow_cauldron", + "state": "[level=2]" + } + } + ], + "predicates": [ + { + "type": "has_block", + "match_block": { + "blocks": [ + "minecraft:powder_snow_cauldron" + ], + "state": { + "level": "3" + } + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + }, + { + "type": "has_item_ingredient", + "match_item": { + "count": { + "min": 1 + }, + "items": [ + "anvilcraft:sea_heart_shell_shard" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + } + ] +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/heart_of_the_sea.json b/fabric/src/generated/resources/data/anvilcraft/recipes/heart_of_the_sea.json new file mode 100644 index 000000000..97099392f --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/heart_of_the_sea.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": { + "item": "anvilcraft:sea_heart_shell" + }, + "B": { + "item": "anvilcraft:sapphire" + } + }, + "pattern": [ + "A", + "B", + "A" + ], + "result": { + "item": "minecraft:heart_of_the_sea" + }, + "show_notification": true +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/stamping/prismarine_blade.json b/fabric/src/generated/resources/data/anvilcraft/recipes/stamping/prismarine_blade.json new file mode 100644 index 000000000..d3e621e73 --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/stamping/prismarine_blade.json @@ -0,0 +1,76 @@ +{ + "type": "anvilcraft:anvil_processing", + "icon": { + "item": "anvilcraft:prismarine_blade" + }, + "outcomes": [ + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -0.75, + 0.0 + ], + "result": { + "item": "anvilcraft:prismarine_blade" + } + }, + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -0.75, + 0.0 + ], + "result": { + "count": 2, + "item": "minecraft:prismarine_crystals" + } + }, + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -0.75, + 0.0 + ], + "result": { + "item": "minecraft:prismarine_shard" + } + } + ], + "predicates": [ + { + "type": "has_block", + "match_block": { + "blocks": [ + "anvilcraft:stamping_platform" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + }, + { + "type": "has_item_ingredient", + "match_item": { + "count": { + "min": 1 + }, + "items": [ + "anvilcraft:prismarine_cluster" + ] + }, + "offset": [ + 0.0, + -0.75, + 0.0 + ] + } + ] +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/stamping/sea_heart_shell_shard.json b/fabric/src/generated/resources/data/anvilcraft/recipes/stamping/sea_heart_shell_shard.json new file mode 100644 index 000000000..ac26a656d --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/stamping/sea_heart_shell_shard.json @@ -0,0 +1,65 @@ +{ + "type": "anvilcraft:anvil_processing", + "icon": { + "count": 3, + "item": "anvilcraft:sea_heart_shell_shard" + }, + "outcomes": [ + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -0.75, + 0.0 + ], + "result": { + "count": 3, + "item": "anvilcraft:sea_heart_shell_shard" + } + }, + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -0.75, + 0.0 + ], + "result": { + "item": "anvilcraft:sapphire" + } + } + ], + "predicates": [ + { + "type": "has_block", + "match_block": { + "blocks": [ + "anvilcraft:stamping_platform" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + }, + { + "type": "has_item_ingredient", + "match_item": { + "count": { + "min": 1 + }, + "items": [ + "minecraft:heart_of_the_sea" + ] + }, + "offset": [ + 0.0, + -0.75, + 0.0 + ] + } + ] +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/trident.json b/fabric/src/generated/resources/data/anvilcraft/recipes/trident.json new file mode 100644 index 000000000..2767311b4 --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/trident.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "A": { + "item": "anvilcraft:prismarine_blade" + }, + "B": { + "item": "minecraft:prismarine_bricks" + } + }, + "pattern": [ + " AA", + " BA", + "B " + ], + "result": { + "item": "minecraft:trident" + }, + "show_notification": true +} \ No newline at end of file diff --git a/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json b/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json index 916501c5a..fe999c8bf 100644 --- a/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json +++ b/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json @@ -52,6 +52,8 @@ "item.anvilcraft.nether_star_shard": "pɹɐɥS ɹɐʇS ɹǝɥʇǝN", "item.anvilcraft.netherite_coil": "ןıoƆ ǝʇıɹǝɥʇǝN", "item.anvilcraft.netherite_core": "ǝɹoƆ ǝʇıɹǝɥʇǝN", + "item.anvilcraft.prismarine_blade": "ǝpɐןᗺ ǝuıɹɐɯsıɹԀ", + "item.anvilcraft.prismarine_cluster": "ɹǝʇsnןƆ ǝuıɹɐɯsıɹԀ", "item.anvilcraft.pulp": "dןnԀ", "item.anvilcraft.resin": "uısǝᴚ", "item.anvilcraft.royal_steel_ingot": "ʇobuI ןǝǝʇS ןɐʎoᴚ", @@ -59,6 +61,8 @@ "item.anvilcraft.royal_steel_pickaxe": "ǝxɐʞɔıԀ ןǝǝʇS ןɐʎoᴚ", "item.anvilcraft.ruby": "ʎqnᴚ", "item.anvilcraft.sapphire": "ǝɹıɥddɐS", + "item.anvilcraft.sea_heart_shell": "ןןǝɥS ʇɹɐǝH ɐǝS", + "item.anvilcraft.sea_heart_shell_shard": "pɹɐɥS ןןǝɥS ʇɹɐǝH ɐǝS", "item.anvilcraft.sponge_gemmule": "ǝןnɯɯǝ⅁ ǝbuodS", "item.anvilcraft.topaz": "zɐdo⟘", "item.anvilcraft.utusan": "uɐsnʇ∩", diff --git a/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json b/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json index a97466a4b..1e4dc093f 100644 --- a/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json +++ b/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json @@ -52,6 +52,8 @@ "item.anvilcraft.nether_star_shard": "Nether Star Shard", "item.anvilcraft.netherite_coil": "Netherite Coil", "item.anvilcraft.netherite_core": "Netherite Core", + "item.anvilcraft.prismarine_blade": "Prismarine Blade", + "item.anvilcraft.prismarine_cluster": "Prismarine Cluster", "item.anvilcraft.pulp": "Pulp", "item.anvilcraft.resin": "Resin", "item.anvilcraft.royal_steel_ingot": "Royal Steel Ingot", @@ -59,6 +61,8 @@ "item.anvilcraft.royal_steel_pickaxe": "Royal Steel Pickaxe", "item.anvilcraft.ruby": "Ruby", "item.anvilcraft.sapphire": "Sapphire", + "item.anvilcraft.sea_heart_shell": "Sea Heart Shell", + "item.anvilcraft.sea_heart_shell_shard": "Sea Heart Shell Shard", "item.anvilcraft.sponge_gemmule": "Sponge Gemmule", "item.anvilcraft.topaz": "Topaz", "item.anvilcraft.utusan": "Utusan", diff --git a/forge/src/generated/resources/assets/anvilcraft/models/item/prismarine_blade.json b/forge/src/generated/resources/assets/anvilcraft/models/item/prismarine_blade.json new file mode 100644 index 000000000..67723e544 --- /dev/null +++ b/forge/src/generated/resources/assets/anvilcraft/models/item/prismarine_blade.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "anvilcraft:item/prismarine_blade" + } +} \ No newline at end of file diff --git a/forge/src/generated/resources/assets/anvilcraft/models/item/prismarine_cluster.json b/forge/src/generated/resources/assets/anvilcraft/models/item/prismarine_cluster.json new file mode 100644 index 000000000..808788390 --- /dev/null +++ b/forge/src/generated/resources/assets/anvilcraft/models/item/prismarine_cluster.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "anvilcraft:item/prismarine_cluster" + } +} \ No newline at end of file diff --git a/forge/src/generated/resources/assets/anvilcraft/models/item/sea_heart_shell.json b/forge/src/generated/resources/assets/anvilcraft/models/item/sea_heart_shell.json new file mode 100644 index 000000000..ba8ad39e0 --- /dev/null +++ b/forge/src/generated/resources/assets/anvilcraft/models/item/sea_heart_shell.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "anvilcraft:item/sea_heart_shell" + } +} \ No newline at end of file diff --git a/forge/src/generated/resources/assets/anvilcraft/models/item/sea_heart_shell_shard.json b/forge/src/generated/resources/assets/anvilcraft/models/item/sea_heart_shell_shard.json new file mode 100644 index 000000000..c8837e349 --- /dev/null +++ b/forge/src/generated/resources/assets/anvilcraft/models/item/sea_heart_shell_shard.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "anvilcraft:item/sea_heart_shell_shard" + } +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/advancements/recipes/combat/trident.json b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/combat/trident.json new file mode 100644 index 000000000..8c41a7882 --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/combat/trident.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:trident" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "hasitem": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:prismarine_blade" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "hasitem", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:trident" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_1.json b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_1.json new file mode 100644 index 000000000..bc4f41111 --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_1.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_sea_heart_shell_shard": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:sea_heart_shell_shard" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:crystallize/prismarine_cluster_1" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_sea_heart_shell_shard", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:crystallize/prismarine_cluster_1" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_2.json b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_2.json new file mode 100644 index 000000000..d66dcde46 --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_2.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_sea_heart_shell_shard": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:sea_heart_shell_shard" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:crystallize/prismarine_cluster_2" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_sea_heart_shell_shard", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:crystallize/prismarine_cluster_2" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_3.json b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_3.json new file mode 100644 index 000000000..75ebcf5a8 --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/crystallize/prismarine_cluster_3.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_sea_heart_shell_shard": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:sea_heart_shell_shard" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:crystallize/prismarine_cluster_3" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_sea_heart_shell_shard", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:crystallize/prismarine_cluster_3" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/heart_of_the_sea.json b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/heart_of_the_sea.json new file mode 100644 index 000000000..ebdc61e5c --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/heart_of_the_sea.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:heart_of_the_sea" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "hasitem": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:sea_heart_shell" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "hasitem", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:heart_of_the_sea" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/stamping/prismarine_blade.json b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/stamping/prismarine_blade.json new file mode 100644 index 000000000..02840466f --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/stamping/prismarine_blade.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_prismarine_cluster": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:prismarine_cluster" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:stamping/prismarine_blade" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_prismarine_cluster", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:stamping/prismarine_blade" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/stamping/sea_heart_shell_shard.json b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/stamping/sea_heart_shell_shard.json new file mode 100644 index 000000000..485619363 --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/stamping/sea_heart_shell_shard.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_heart_of_the_sea": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:heart_of_the_sea" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:stamping/sea_heart_shell_shard" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_heart_of_the_sea", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:stamping/sea_heart_shell_shard" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_1.json b/forge/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_1.json new file mode 100644 index 000000000..416293fa2 --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_1.json @@ -0,0 +1,66 @@ +{ + "type": "anvilcraft:anvil_processing", + "icon": { + "item": "anvilcraft:prismarine_cluster" + }, + "outcomes": [ + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "item": "anvilcraft:prismarine_cluster" + } + }, + { + "type": "set_block", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "block": "minecraft:cauldron" + } + } + ], + "predicates": [ + { + "type": "has_block", + "match_block": { + "blocks": [ + "minecraft:powder_snow_cauldron" + ], + "state": { + "level": "1" + } + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + }, + { + "type": "has_item_ingredient", + "match_item": { + "count": { + "min": 1 + }, + "items": [ + "anvilcraft:sea_heart_shell_shard" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + } + ] +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_2.json b/forge/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_2.json new file mode 100644 index 000000000..24d03ddde --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_2.json @@ -0,0 +1,67 @@ +{ + "type": "anvilcraft:anvil_processing", + "icon": { + "item": "anvilcraft:prismarine_cluster" + }, + "outcomes": [ + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "item": "anvilcraft:prismarine_cluster" + } + }, + { + "type": "set_block", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "block": "minecraft:powder_snow_cauldron", + "state": "[level=1]" + } + } + ], + "predicates": [ + { + "type": "has_block", + "match_block": { + "blocks": [ + "minecraft:powder_snow_cauldron" + ], + "state": { + "level": "2" + } + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + }, + { + "type": "has_item_ingredient", + "match_item": { + "count": { + "min": 1 + }, + "items": [ + "anvilcraft:sea_heart_shell_shard" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + } + ] +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_3.json b/forge/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_3.json new file mode 100644 index 000000000..820056fb8 --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/recipes/crystallize/prismarine_cluster_3.json @@ -0,0 +1,67 @@ +{ + "type": "anvilcraft:anvil_processing", + "icon": { + "item": "anvilcraft:prismarine_cluster" + }, + "outcomes": [ + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "item": "anvilcraft:prismarine_cluster" + } + }, + { + "type": "set_block", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "block": "minecraft:powder_snow_cauldron", + "state": "[level=2]" + } + } + ], + "predicates": [ + { + "type": "has_block", + "match_block": { + "blocks": [ + "minecraft:powder_snow_cauldron" + ], + "state": { + "level": "3" + } + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + }, + { + "type": "has_item_ingredient", + "match_item": { + "count": { + "min": 1 + }, + "items": [ + "anvilcraft:sea_heart_shell_shard" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + } + ] +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/heart_of_the_sea.json b/forge/src/generated/resources/data/anvilcraft/recipes/heart_of_the_sea.json new file mode 100644 index 000000000..97099392f --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/recipes/heart_of_the_sea.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": { + "item": "anvilcraft:sea_heart_shell" + }, + "B": { + "item": "anvilcraft:sapphire" + } + }, + "pattern": [ + "A", + "B", + "A" + ], + "result": { + "item": "minecraft:heart_of_the_sea" + }, + "show_notification": true +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/stamping/prismarine_blade.json b/forge/src/generated/resources/data/anvilcraft/recipes/stamping/prismarine_blade.json new file mode 100644 index 000000000..d3e621e73 --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/recipes/stamping/prismarine_blade.json @@ -0,0 +1,76 @@ +{ + "type": "anvilcraft:anvil_processing", + "icon": { + "item": "anvilcraft:prismarine_blade" + }, + "outcomes": [ + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -0.75, + 0.0 + ], + "result": { + "item": "anvilcraft:prismarine_blade" + } + }, + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -0.75, + 0.0 + ], + "result": { + "count": 2, + "item": "minecraft:prismarine_crystals" + } + }, + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -0.75, + 0.0 + ], + "result": { + "item": "minecraft:prismarine_shard" + } + } + ], + "predicates": [ + { + "type": "has_block", + "match_block": { + "blocks": [ + "anvilcraft:stamping_platform" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + }, + { + "type": "has_item_ingredient", + "match_item": { + "count": { + "min": 1 + }, + "items": [ + "anvilcraft:prismarine_cluster" + ] + }, + "offset": [ + 0.0, + -0.75, + 0.0 + ] + } + ] +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/stamping/sea_heart_shell_shard.json b/forge/src/generated/resources/data/anvilcraft/recipes/stamping/sea_heart_shell_shard.json new file mode 100644 index 000000000..ac26a656d --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/recipes/stamping/sea_heart_shell_shard.json @@ -0,0 +1,65 @@ +{ + "type": "anvilcraft:anvil_processing", + "icon": { + "count": 3, + "item": "anvilcraft:sea_heart_shell_shard" + }, + "outcomes": [ + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -0.75, + 0.0 + ], + "result": { + "count": 3, + "item": "anvilcraft:sea_heart_shell_shard" + } + }, + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -0.75, + 0.0 + ], + "result": { + "item": "anvilcraft:sapphire" + } + } + ], + "predicates": [ + { + "type": "has_block", + "match_block": { + "blocks": [ + "anvilcraft:stamping_platform" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + }, + { + "type": "has_item_ingredient", + "match_item": { + "count": { + "min": 1 + }, + "items": [ + "minecraft:heart_of_the_sea" + ] + }, + "offset": [ + 0.0, + -0.75, + 0.0 + ] + } + ] +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/trident.json b/forge/src/generated/resources/data/anvilcraft/recipes/trident.json new file mode 100644 index 000000000..2767311b4 --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/recipes/trident.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "A": { + "item": "anvilcraft:prismarine_blade" + }, + "B": { + "item": "minecraft:prismarine_bricks" + } + }, + "pattern": [ + " AA", + " BA", + "B " + ], + "result": { + "item": "minecraft:trident" + }, + "show_notification": true +} \ No newline at end of file From 45b556b88b2d0007efe10d1616ae6f1047d0b372 Mon Sep 17 00:00:00 2001 From: wdfaESfaef <2622389575@qq.com> Date: Fri, 12 Apr 2024 19:29:40 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=85=8D=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../recipe/StampingRecipesLoader.java | 5 +++- .../recipes/stamping/prismarine_blade.json | 14 ++++++++++- .../stamping/sea_heart_shell_shard.json | 24 +++++++++++++++++++ .../recipes/stamping/prismarine_blade.json | 14 ++++++++++- .../stamping/sea_heart_shell_shard.json | 24 +++++++++++++++++++ 5 files changed, 78 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/StampingRecipesLoader.java b/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/StampingRecipesLoader.java index 18e0be1ea..405e371c2 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/StampingRecipesLoader.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/StampingRecipesLoader.java @@ -33,14 +33,17 @@ public static void init(RegistrateRecipeProvider provider) { .hasBlock(ModBlocks.STAMPING_PLATFORM.get()) .hasItemIngredient(new Vec3(0.0, -0.75, 0.0), Items.HEART_OF_THE_SEA) .spawnItem(new Vec3(0.0, -0.75, 0.0), ModItems.SEA_HEART_SHELL_SHARD,3) + .spawnItem(new Vec3(0.0, -0.75, 0.0), 0.5,ModItems.SEA_HEART_SHELL_SHARD) + .spawnItem(new Vec3(0.0, -0.75, 0.0), 0.5,ModItems.SEA_HEART_SHELL_SHARD) .spawnItem(new Vec3(0.0, -0.75, 0.0), ModItems.SAPPHIRE) .unlockedBy(AnvilCraftDatagen.hasItem(Items.HEART_OF_THE_SEA), AnvilCraftDatagen.has(Items.HEART_OF_THE_SEA)) .save(provider, AnvilCraft.of("stamping/sea_heart_shell_shard")); AnvilRecipe.Builder.create(RecipeCategory.MISC) .hasBlock(ModBlocks.STAMPING_PLATFORM.get()) .hasItemIngredient(new Vec3(0.0, -0.75, 0.0), ModItems.PRISMARINE_CLUSTER) - .spawnItem(new Vec3(0.0, -0.75, 0.0), ModItems.PRISMARINE_BLADE) + .spawnItem(new Vec3(0.0, -0.75, 0.0),0.15, ModItems.PRISMARINE_BLADE) .spawnItem(new Vec3(0.0, -0.75, 0.0), Items.PRISMARINE_CRYSTALS,2) + .spawnItem(new Vec3(0.0, -0.75, 0.0), 0.5, Items.PRISMARINE_CRYSTALS) .spawnItem(new Vec3(0.0, -0.75, 0.0), Items.PRISMARINE_SHARD) .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.PRISMARINE_CLUSTER.get()), AnvilCraftDatagen.has(ModItems.PRISMARINE_CLUSTER)) .save(provider, AnvilCraft.of("stamping/prismarine_blade")); diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/stamping/prismarine_blade.json b/fabric/src/generated/resources/data/anvilcraft/recipes/stamping/prismarine_blade.json index d3e621e73..a3a11b391 100644 --- a/fabric/src/generated/resources/data/anvilcraft/recipes/stamping/prismarine_blade.json +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/stamping/prismarine_blade.json @@ -6,7 +6,7 @@ "outcomes": [ { "type": "spawn_item", - "chance": 1.0, + "chance": 0.15, "offset": [ 0.0, -0.75, @@ -29,6 +29,18 @@ "item": "minecraft:prismarine_crystals" } }, + { + "type": "spawn_item", + "chance": 0.5, + "offset": [ + 0.0, + -0.75, + 0.0 + ], + "result": { + "item": "minecraft:prismarine_crystals" + } + }, { "type": "spawn_item", "chance": 1.0, diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/stamping/sea_heart_shell_shard.json b/fabric/src/generated/resources/data/anvilcraft/recipes/stamping/sea_heart_shell_shard.json index ac26a656d..967b5c06f 100644 --- a/fabric/src/generated/resources/data/anvilcraft/recipes/stamping/sea_heart_shell_shard.json +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/stamping/sea_heart_shell_shard.json @@ -18,6 +18,30 @@ "item": "anvilcraft:sea_heart_shell_shard" } }, + { + "type": "spawn_item", + "chance": 0.5, + "offset": [ + 0.0, + -0.75, + 0.0 + ], + "result": { + "item": "anvilcraft:sea_heart_shell_shard" + } + }, + { + "type": "spawn_item", + "chance": 0.5, + "offset": [ + 0.0, + -0.75, + 0.0 + ], + "result": { + "item": "anvilcraft:sea_heart_shell_shard" + } + }, { "type": "spawn_item", "chance": 1.0, diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/stamping/prismarine_blade.json b/forge/src/generated/resources/data/anvilcraft/recipes/stamping/prismarine_blade.json index d3e621e73..a3a11b391 100644 --- a/forge/src/generated/resources/data/anvilcraft/recipes/stamping/prismarine_blade.json +++ b/forge/src/generated/resources/data/anvilcraft/recipes/stamping/prismarine_blade.json @@ -6,7 +6,7 @@ "outcomes": [ { "type": "spawn_item", - "chance": 1.0, + "chance": 0.15, "offset": [ 0.0, -0.75, @@ -29,6 +29,18 @@ "item": "minecraft:prismarine_crystals" } }, + { + "type": "spawn_item", + "chance": 0.5, + "offset": [ + 0.0, + -0.75, + 0.0 + ], + "result": { + "item": "minecraft:prismarine_crystals" + } + }, { "type": "spawn_item", "chance": 1.0, diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/stamping/sea_heart_shell_shard.json b/forge/src/generated/resources/data/anvilcraft/recipes/stamping/sea_heart_shell_shard.json index ac26a656d..967b5c06f 100644 --- a/forge/src/generated/resources/data/anvilcraft/recipes/stamping/sea_heart_shell_shard.json +++ b/forge/src/generated/resources/data/anvilcraft/recipes/stamping/sea_heart_shell_shard.json @@ -18,6 +18,30 @@ "item": "anvilcraft:sea_heart_shell_shard" } }, + { + "type": "spawn_item", + "chance": 0.5, + "offset": [ + 0.0, + -0.75, + 0.0 + ], + "result": { + "item": "anvilcraft:sea_heart_shell_shard" + } + }, + { + "type": "spawn_item", + "chance": 0.5, + "offset": [ + 0.0, + -0.75, + 0.0 + ], + "result": { + "item": "anvilcraft:sea_heart_shell_shard" + } + }, { "type": "spawn_item", "chance": 1.0, From 41119f8493ef0e6d7514853969f1adaa6fb89e93 Mon Sep 17 00:00:00 2001 From: DancingSnow <1121149616@qq.com> Date: Sat, 13 Apr 2024 00:05:47 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=93=81=E7=A0=A7?= =?UTF-8?q?=E9=94=A4=E5=AD=90=E9=85=8D=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dev/dubhe/anvilcraft/init/ModItems.java | 8 ++ .../anvilcraft/models/block/resin_block.json | 7 ++ .../recipes/tools/anvil_hammer.json | 6 +- .../data/anvilcraft/recipes/anvil_hammer.json | 12 +-- .../tags/blocks/hammer_changeable.json | 6 +- .../tags/blocks/hammer_removable.json | 8 +- .../anvilcraft/models/block/resin_block.json | 7 ++ .../recipes/tools/anvil_hammer.json} | 6 +- .../recipes/anvil_hammer.json} | 12 +-- .../tags/blocks/hammer_changeable.json | 6 +- .../tags/blocks/hammer_removable.json | 8 +- ...k_from_royal_steel_block_stonecutting.json | 35 --------- ...om_cut_royal_steel_block_stonecutting.json | 35 --------- ...b_from_royal_steel_block_stonecutting.json | 35 --------- ...om_cut_royal_steel_block_stonecutting.json | 35 --------- ...s_from_royal_steel_block_stonecutting.json | 35 --------- ...k_from_royal_steel_block_stonecutting.json | 35 --------- .../food/boil/beef_mushroom_stew_1.json | 35 --------- .../food/boil/beef_mushroom_stew_2.json | 35 --------- .../food/boil/beef_mushroom_stew_3.json | 35 --------- .../recipes/food/cook/utusan.json | 35 --------- .../recipes/misc/ancient_debris.json | 48 ------------ .../advancements/recipes/misc/bone_block.json | 35 --------- .../recipes/misc/heart_of_the_sea.json | 35 --------- .../recipes/tools/chipped_anvil.json | 48 ------------ .../recipes/tools/damaged_anvil.json | 48 ------------ .../minecraft/recipes/ancient_debris.json | 51 ------------ .../recipes/boil/beef_mushroom_stew_1.json | 77 ------------------ .../recipes/boil/beef_mushroom_stew_2.json | 78 ------------------- .../recipes/boil/beef_mushroom_stew_3.json | 78 ------------------- .../data/minecraft/recipes/bone_block.json | 51 ------------ .../data/minecraft/recipes/cook/utusan.json | 62 --------------- ...k_from_royal_steel_block_stonecutting.json | 8 -- ...om_cut_royal_steel_block_stonecutting.json | 8 -- ...b_from_royal_steel_block_stonecutting.json | 8 -- ...om_cut_royal_steel_block_stonecutting.json | 8 -- ...s_from_royal_steel_block_stonecutting.json | 8 -- .../data/minecraft/recipes/elytra.json | 24 ------ .../minecraft/recipes/heart_of_the_sea.json | 63 --------------- ...k_from_royal_steel_block_stonecutting.json | 8 -- .../data/minecraft/recipes/trident.json | 21 ----- .../tags/blocks/beacon_base_blocks.json | 5 +- .../tags/items/beacon_payment_items.json | 5 +- 43 files changed, 60 insertions(+), 1153 deletions(-) create mode 100644 fabric/src/generated/resources/assets/anvilcraft/models/block/resin_block.json rename forge/src/generated/resources/data/minecraft/advancements/recipes/tools/trident.json => fabric/src/generated/resources/data/anvilcraft/advancements/recipes/tools/anvil_hammer.json (81%) rename forge/src/generated/resources/data/minecraft/recipes/chipped_anvil.json => fabric/src/generated/resources/data/anvilcraft/recipes/anvil_hammer.json (56%) create mode 100644 forge/src/generated/resources/assets/anvilcraft/models/block/resin_block.json rename forge/src/generated/resources/data/{minecraft/advancements/recipes/tools/elytra.json => anvilcraft/advancements/recipes/tools/anvil_hammer.json} (81%) rename forge/src/generated/resources/data/{minecraft/recipes/damaged_anvil.json => anvilcraft/recipes/anvil_hammer.json} (56%) delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_block_from_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_slab_from_cut_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_slab_from_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_stairs_from_cut_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_stairs_from_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/smooth_royal_steel_block_from_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_1.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_2.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_3.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/food/cook/utusan.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/misc/ancient_debris.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/misc/bone_block.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/misc/heart_of_the_sea.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/tools/chipped_anvil.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/tools/damaged_anvil.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/ancient_debris.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_1.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_2.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_3.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/bone_block.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/cook/utusan.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_block_from_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_slab_from_cut_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_slab_from_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_stairs_from_cut_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_stairs_from_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/elytra.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/heart_of_the_sea.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/smooth_royal_steel_block_from_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/trident.json diff --git a/common/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java b/common/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java index 8542a330c..d657d83cc 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java @@ -429,6 +429,14 @@ public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, @No .item("anvil_hammer", properties -> new AnvilHammerItem(properties.durability(35))) .model((ctx, provider) -> { }) + .recipe((ctx, provider) -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, ctx.get()) + .pattern(" A") + .pattern(" B") + .pattern(" B") + .define('A', Items.ANVIL) + .define('B', Items.LIGHTNING_ROD) + .unlockedBy("hasitem", RegistrateRecipeProvider.has(Items.LIGHTNING_ROD)) + .save(provider)) .register(); public static void register() { diff --git a/fabric/src/generated/resources/assets/anvilcraft/models/block/resin_block.json b/fabric/src/generated/resources/assets/anvilcraft/models/block/resin_block.json new file mode 100644 index 000000000..8b210632e --- /dev/null +++ b/fabric/src/generated/resources/assets/anvilcraft/models/block/resin_block.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "render_type": "minecraft:translucent", + "textures": { + "all": "anvilcraft:block/resin_block" + } +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/tools/trident.json b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/tools/anvil_hammer.json similarity index 81% rename from forge/src/generated/resources/data/minecraft/advancements/recipes/tools/trident.json rename to fabric/src/generated/resources/data/anvilcraft/advancements/recipes/tools/anvil_hammer.json index d0066ccc5..648b4f671 100644 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/tools/trident.json +++ b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/tools/anvil_hammer.json @@ -3,7 +3,7 @@ "criteria": { "has_the_recipe": { "conditions": { - "recipe": "minecraft:trident" + "recipe": "anvilcraft:anvil_hammer" }, "trigger": "minecraft:recipe_unlocked" }, @@ -12,7 +12,7 @@ "items": [ { "items": [ - "anvilcraft:blade_of_the_sea" + "minecraft:lightning_rod" ] } ] @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "minecraft:trident" + "anvilcraft:anvil_hammer" ] }, "sends_telemetry_event": false diff --git a/forge/src/generated/resources/data/minecraft/recipes/chipped_anvil.json b/fabric/src/generated/resources/data/anvilcraft/recipes/anvil_hammer.json similarity index 56% rename from forge/src/generated/resources/data/minecraft/recipes/chipped_anvil.json rename to fabric/src/generated/resources/data/anvilcraft/recipes/anvil_hammer.json index 1b860b6fc..144119d3a 100644 --- a/forge/src/generated/resources/data/minecraft/recipes/chipped_anvil.json +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/anvil_hammer.json @@ -3,19 +3,19 @@ "category": "equipment", "key": { "A": { - "item": "minecraft:iron_block" + "item": "minecraft:anvil" }, "B": { - "item": "minecraft:iron_ingot" + "item": "minecraft:lightning_rod" } }, "pattern": [ - "AAB", - " B ", - "BBB" + " A", + " B", + " B" ], "result": { - "item": "minecraft:chipped_anvil" + "item": "anvilcraft:anvil_hammer" }, "show_notification": true } \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/tags/blocks/hammer_changeable.json b/fabric/src/generated/resources/data/anvilcraft/tags/blocks/hammer_changeable.json index f4ea87936..657c06330 100644 --- a/fabric/src/generated/resources/data/anvilcraft/tags/blocks/hammer_changeable.json +++ b/fabric/src/generated/resources/data/anvilcraft/tags/blocks/hammer_changeable.json @@ -1,6 +1,10 @@ { "replace": false, "values": [ - "minecraft:piston" + "minecraft:observer", + "minecraft:hopper", + "minecraft:dropper", + "minecraft:dispenser", + "minecraft:lightning_rod" ] } \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/tags/blocks/hammer_removable.json b/fabric/src/generated/resources/data/anvilcraft/tags/blocks/hammer_removable.json index e5bb88043..38594ca05 100644 --- a/fabric/src/generated/resources/data/anvilcraft/tags/blocks/hammer_removable.json +++ b/fabric/src/generated/resources/data/anvilcraft/tags/blocks/hammer_removable.json @@ -45,12 +45,6 @@ "minecraft:campfire", "minecraft:anvil", "minecraft:chipped_anvil", - "minecraft:damaged_anvil", - "anvilcraft:royal_smithing_table", - "anvilcraft:auto_crafter", - "anvilcraft:chute", - "anvilcraft:stamping_platform", - "anvilcraft:royal_anvil", - "anvilcraft:royal_grindstone" + "minecraft:damaged_anvil" ] } \ No newline at end of file diff --git a/forge/src/generated/resources/assets/anvilcraft/models/block/resin_block.json b/forge/src/generated/resources/assets/anvilcraft/models/block/resin_block.json new file mode 100644 index 000000000..8b210632e --- /dev/null +++ b/forge/src/generated/resources/assets/anvilcraft/models/block/resin_block.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "render_type": "minecraft:translucent", + "textures": { + "all": "anvilcraft:block/resin_block" + } +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/tools/elytra.json b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/tools/anvil_hammer.json similarity index 81% rename from forge/src/generated/resources/data/minecraft/advancements/recipes/tools/elytra.json rename to forge/src/generated/resources/data/anvilcraft/advancements/recipes/tools/anvil_hammer.json index 9422c66eb..648b4f671 100644 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/tools/elytra.json +++ b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/tools/anvil_hammer.json @@ -3,7 +3,7 @@ "criteria": { "has_the_recipe": { "conditions": { - "recipe": "minecraft:elytra" + "recipe": "anvilcraft:anvil_hammer" }, "trigger": "minecraft:recipe_unlocked" }, @@ -12,7 +12,7 @@ "items": [ { "items": [ - "anvilcraft:elytra_membrane" + "minecraft:lightning_rod" ] } ] @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "minecraft:elytra" + "anvilcraft:anvil_hammer" ] }, "sends_telemetry_event": false diff --git a/forge/src/generated/resources/data/minecraft/recipes/damaged_anvil.json b/forge/src/generated/resources/data/anvilcraft/recipes/anvil_hammer.json similarity index 56% rename from forge/src/generated/resources/data/minecraft/recipes/damaged_anvil.json rename to forge/src/generated/resources/data/anvilcraft/recipes/anvil_hammer.json index 51eb0a616..144119d3a 100644 --- a/forge/src/generated/resources/data/minecraft/recipes/damaged_anvil.json +++ b/forge/src/generated/resources/data/anvilcraft/recipes/anvil_hammer.json @@ -3,19 +3,19 @@ "category": "equipment", "key": { "A": { - "item": "minecraft:iron_block" + "item": "minecraft:anvil" }, "B": { - "item": "minecraft:iron_ingot" + "item": "minecraft:lightning_rod" } }, "pattern": [ - "BAB", - " B ", - "BBB" + " A", + " B", + " B" ], "result": { - "item": "minecraft:damaged_anvil" + "item": "anvilcraft:anvil_hammer" }, "show_notification": true } \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/tags/blocks/hammer_changeable.json b/forge/src/generated/resources/data/anvilcraft/tags/blocks/hammer_changeable.json index f4ea87936..657c06330 100644 --- a/forge/src/generated/resources/data/anvilcraft/tags/blocks/hammer_changeable.json +++ b/forge/src/generated/resources/data/anvilcraft/tags/blocks/hammer_changeable.json @@ -1,6 +1,10 @@ { "replace": false, "values": [ - "minecraft:piston" + "minecraft:observer", + "minecraft:hopper", + "minecraft:dropper", + "minecraft:dispenser", + "minecraft:lightning_rod" ] } \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/tags/blocks/hammer_removable.json b/forge/src/generated/resources/data/anvilcraft/tags/blocks/hammer_removable.json index e5bb88043..38594ca05 100644 --- a/forge/src/generated/resources/data/anvilcraft/tags/blocks/hammer_removable.json +++ b/forge/src/generated/resources/data/anvilcraft/tags/blocks/hammer_removable.json @@ -45,12 +45,6 @@ "minecraft:campfire", "minecraft:anvil", "minecraft:chipped_anvil", - "minecraft:damaged_anvil", - "anvilcraft:royal_smithing_table", - "anvilcraft:auto_crafter", - "anvilcraft:chute", - "anvilcraft:stamping_platform", - "anvilcraft:royal_anvil", - "anvilcraft:royal_grindstone" + "minecraft:damaged_anvil" ] } \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_block_from_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_block_from_royal_steel_block_stonecutting.json deleted file mode 100644 index 5af457156..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_block_from_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_royal_steel_block": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:royal_steel_block" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:cut_royal_steel_block_from_royal_steel_block_stonecutting" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_royal_steel_block", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:cut_royal_steel_block_from_royal_steel_block_stonecutting" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_slab_from_cut_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_slab_from_cut_royal_steel_block_stonecutting.json deleted file mode 100644 index ed43c92e6..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_slab_from_cut_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cut_royal_steel_block": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:cut_royal_steel_block" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:cut_royal_steel_slab_from_cut_royal_steel_block_stonecutting" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_cut_royal_steel_block", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:cut_royal_steel_slab_from_cut_royal_steel_block_stonecutting" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_slab_from_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_slab_from_royal_steel_block_stonecutting.json deleted file mode 100644 index 6df343893..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_slab_from_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_royal_steel_block": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:royal_steel_block" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:cut_royal_steel_slab_from_royal_steel_block_stonecutting" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_royal_steel_block", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:cut_royal_steel_slab_from_royal_steel_block_stonecutting" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_stairs_from_cut_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_stairs_from_cut_royal_steel_block_stonecutting.json deleted file mode 100644 index f93f9a6a7..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_stairs_from_cut_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cut_royal_steel_block": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:cut_royal_steel_block" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:cut_royal_steel_stairs_from_cut_royal_steel_block_stonecutting" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_cut_royal_steel_block", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:cut_royal_steel_stairs_from_cut_royal_steel_block_stonecutting" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_stairs_from_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_stairs_from_royal_steel_block_stonecutting.json deleted file mode 100644 index 39fef3a83..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_stairs_from_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_royal_steel_block": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:royal_steel_block" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:cut_royal_steel_stairs_from_royal_steel_block_stonecutting" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_royal_steel_block", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:cut_royal_steel_stairs_from_royal_steel_block_stonecutting" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/smooth_royal_steel_block_from_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/smooth_royal_steel_block_from_royal_steel_block_stonecutting.json deleted file mode 100644 index 90c03d662..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/smooth_royal_steel_block_from_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_royal_steel_block": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:royal_steel_block" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:smooth_royal_steel_block_from_royal_steel_block_stonecutting" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_royal_steel_block", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:smooth_royal_steel_block_from_royal_steel_block_stonecutting" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_1.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_1.json deleted file mode 100644 index a67070139..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_1.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_beef_mushroom_stew_raw": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:beef_mushroom_stew_raw" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:boil/beef_mushroom_stew_1" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_beef_mushroom_stew_raw", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:boil/beef_mushroom_stew_1" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_2.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_2.json deleted file mode 100644 index 1f723f229..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_2.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_beef_mushroom_stew_raw": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:beef_mushroom_stew_raw" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:boil/beef_mushroom_stew_2" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_beef_mushroom_stew_raw", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:boil/beef_mushroom_stew_2" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_3.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_3.json deleted file mode 100644 index d61e8309d..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_3.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_beef_mushroom_stew_raw": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:beef_mushroom_stew_raw" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:boil/beef_mushroom_stew_3" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_beef_mushroom_stew_raw", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:boil/beef_mushroom_stew_3" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/food/cook/utusan.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/food/cook/utusan.json deleted file mode 100644 index 7c0f3c618..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/food/cook/utusan.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:cook/utusan" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_utusan_raw": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:utusan_raw" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_utusan_raw", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:cook/utusan" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/misc/ancient_debris.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/misc/ancient_debris.json deleted file mode 100644 index b342b7078..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/misc/ancient_debris.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_netherite_coil": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:netherite_coil" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_soul_soil": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:soul_soil" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:ancient_debris" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_soul_soil", - "has_netherite_coil", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:ancient_debris" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/misc/bone_block.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/misc/bone_block.json deleted file mode 100644 index c79af545c..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/misc/bone_block.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_bone": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:bone" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:bone_block" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_bone", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:bone_block" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/misc/heart_of_the_sea.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/misc/heart_of_the_sea.json deleted file mode 100644 index 3d9ff22cc..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/misc/heart_of_the_sea.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_kernel_of_the_sea": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:kernel_of_the_sea" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:heart_of_the_sea" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_kernel_of_the_sea", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:heart_of_the_sea" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/tools/chipped_anvil.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/tools/chipped_anvil.json deleted file mode 100644 index 893622ec7..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/tools/chipped_anvil.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_iron_block": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:iron_block" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_iron_ingot": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:iron_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:chipped_anvil" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_iron_block", - "has_iron_ingot", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:chipped_anvil" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/tools/damaged_anvil.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/tools/damaged_anvil.json deleted file mode 100644 index 74a3dcef0..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/tools/damaged_anvil.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_iron_block": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:iron_block" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_iron_ingot": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:iron_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:damaged_anvil" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_iron_block", - "has_iron_ingot", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:damaged_anvil" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/ancient_debris.json b/forge/src/generated/resources/data/minecraft/recipes/ancient_debris.json deleted file mode 100644 index 0ba7c2a89..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/ancient_debris.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "type": "anvilcraft:anvil_processing", - "icon": { - "item": "minecraft:ancient_debris" - }, - "outcomes": [ - { - "type": "set_block", - "chance": 1.0, - "offset": [ - 0.0, - -1.0, - 0.0 - ], - "result": { - "block": "minecraft:ancient_debris" - } - } - ], - "predicates": [ - { - "type": "has_block", - "match_block": { - "blocks": [ - "minecraft:soul_soil" - ] - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - }, - { - "type": "has_item_ingredient", - "match_item": { - "count": { - "min": 1 - }, - "items": [ - "anvilcraft:netherite_coil" - ] - }, - "offset": [ - 0.0, - 0.0, - 0.0 - ] - } - ] -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_1.json b/forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_1.json deleted file mode 100644 index 58cf000f2..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_1.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "type": "anvilcraft:anvil_processing", - "icon": { - "item": "minecraft:cauldron" - }, - "outcomes": [ - { - "type": "set_block", - "chance": 1.0, - "offset": [ - 0.0, - -1.0, - 0.0 - ], - "result": { - "block": "minecraft:cauldron" - } - }, - { - "type": "spawn_item", - "chance": 1.0, - "offset": [ - 0.0, - 0.0, - 0.0 - ], - "result": { - "item": "anvilcraft:beef_mushroom_stew" - } - } - ], - "predicates": [ - { - "type": "has_block", - "match_block": { - "blocks": [ - "minecraft:water_cauldron" - ], - "state": { - "level": "1" - } - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - }, - { - "type": "has_block", - "match_block": { - "tag": "minecraft:campfires" - }, - "offset": [ - 0.0, - -2.0, - 0.0 - ] - }, - { - "type": "has_item_ingredient", - "match_item": { - "count": { - "min": 1 - }, - "items": [ - "anvilcraft:beef_mushroom_stew_raw" - ] - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - } - ] -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_2.json b/forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_2.json deleted file mode 100644 index 25ada3cc4..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_2.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "type": "anvilcraft:anvil_processing", - "icon": { - "item": "minecraft:cauldron" - }, - "outcomes": [ - { - "type": "set_block", - "chance": 1.0, - "offset": [ - 0.0, - -1.0, - 0.0 - ], - "result": { - "block": "minecraft:water_cauldron", - "state": "[level=1]" - } - }, - { - "type": "spawn_item", - "chance": 1.0, - "offset": [ - 0.0, - 0.0, - 0.0 - ], - "result": { - "item": "anvilcraft:beef_mushroom_stew" - } - } - ], - "predicates": [ - { - "type": "has_block", - "match_block": { - "blocks": [ - "minecraft:water_cauldron" - ], - "state": { - "level": "2" - } - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - }, - { - "type": "has_block", - "match_block": { - "tag": "minecraft:campfires" - }, - "offset": [ - 0.0, - -2.0, - 0.0 - ] - }, - { - "type": "has_item_ingredient", - "match_item": { - "count": { - "min": 1 - }, - "items": [ - "anvilcraft:beef_mushroom_stew_raw" - ] - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - } - ] -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_3.json b/forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_3.json deleted file mode 100644 index 6d74aea6d..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_3.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "type": "anvilcraft:anvil_processing", - "icon": { - "item": "minecraft:cauldron" - }, - "outcomes": [ - { - "type": "set_block", - "chance": 1.0, - "offset": [ - 0.0, - -1.0, - 0.0 - ], - "result": { - "block": "minecraft:water_cauldron", - "state": "[level=2]" - } - }, - { - "type": "spawn_item", - "chance": 1.0, - "offset": [ - 0.0, - 0.0, - 0.0 - ], - "result": { - "item": "anvilcraft:beef_mushroom_stew" - } - } - ], - "predicates": [ - { - "type": "has_block", - "match_block": { - "blocks": [ - "minecraft:water_cauldron" - ], - "state": { - "level": "3" - } - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - }, - { - "type": "has_block", - "match_block": { - "tag": "minecraft:campfires" - }, - "offset": [ - 0.0, - -2.0, - 0.0 - ] - }, - { - "type": "has_item_ingredient", - "match_item": { - "count": { - "min": 1 - }, - "items": [ - "anvilcraft:beef_mushroom_stew_raw" - ] - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - } - ] -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/bone_block.json b/forge/src/generated/resources/data/minecraft/recipes/bone_block.json deleted file mode 100644 index af87c40c0..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/bone_block.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "type": "anvilcraft:anvil_processing", - "icon": { - "item": "minecraft:bone_block" - }, - "outcomes": [ - { - "type": "spawn_item", - "chance": 1.0, - "offset": [ - 0.0, - 0.0, - 0.0 - ], - "result": { - "item": "minecraft:bone_block" - } - } - ], - "predicates": [ - { - "type": "has_block", - "match_block": { - "blocks": [ - "minecraft:cauldron" - ] - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - }, - { - "type": "has_item_ingredient", - "match_item": { - "count": { - "min": 3 - }, - "items": [ - "minecraft:bone" - ] - }, - "offset": [ - 0.0, - 0.0, - 0.0 - ] - } - ] -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/cook/utusan.json b/forge/src/generated/resources/data/minecraft/recipes/cook/utusan.json deleted file mode 100644 index 328d3e514..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/cook/utusan.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "type": "anvilcraft:anvil_processing", - "icon": { - "item": "anvilcraft:utusan" - }, - "outcomes": [ - { - "type": "spawn_item", - "chance": 1.0, - "offset": [ - 0.0, - 0.0, - 0.0 - ], - "result": { - "item": "anvilcraft:utusan" - } - } - ], - "predicates": [ - { - "type": "has_block", - "match_block": { - "blocks": [ - "minecraft:cauldron" - ] - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - }, - { - "type": "has_block", - "match_block": { - "tag": "minecraft:campfires" - }, - "offset": [ - 0.0, - -2.0, - 0.0 - ] - }, - { - "type": "has_item_ingredient", - "match_item": { - "count": { - "min": 1 - }, - "items": [ - "anvilcraft:utusan_raw" - ] - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - } - ] -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_block_from_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_block_from_royal_steel_block_stonecutting.json deleted file mode 100644 index 5b4bb91ef..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_block_from_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 4, - "ingredient": { - "item": "anvilcraft:royal_steel_block" - }, - "result": "anvilcraft:cut_royal_steel_block" -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_slab_from_cut_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_slab_from_cut_royal_steel_block_stonecutting.json deleted file mode 100644 index 757926d55..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_slab_from_cut_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 2, - "ingredient": { - "item": "anvilcraft:cut_royal_steel_block" - }, - "result": "anvilcraft:cut_royal_steel_slab" -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_slab_from_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_slab_from_royal_steel_block_stonecutting.json deleted file mode 100644 index ceebd14da..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_slab_from_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 8, - "ingredient": { - "item": "anvilcraft:royal_steel_block" - }, - "result": "anvilcraft:cut_royal_steel_slab" -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_stairs_from_cut_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_stairs_from_cut_royal_steel_block_stonecutting.json deleted file mode 100644 index 577455d62..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_stairs_from_cut_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "anvilcraft:cut_royal_steel_block" - }, - "result": "anvilcraft:cut_royal_steel_stairs" -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_stairs_from_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_stairs_from_royal_steel_block_stonecutting.json deleted file mode 100644 index e6a10455c..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_stairs_from_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 4, - "ingredient": { - "item": "anvilcraft:royal_steel_block" - }, - "result": "anvilcraft:cut_royal_steel_stairs" -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/elytra.json b/forge/src/generated/resources/data/minecraft/recipes/elytra.json deleted file mode 100644 index bb97d4294..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/elytra.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "key": { - "A": { - "item": "anvilcraft:elytra_membrane" - }, - "B": { - "item": "minecraft:string" - }, - "C": { - "item": "minecraft:feather" - } - }, - "pattern": [ - "ABA", - "C C", - "C C" - ], - "result": { - "item": "minecraft:elytra" - }, - "show_notification": true -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/heart_of_the_sea.json b/forge/src/generated/resources/data/minecraft/recipes/heart_of_the_sea.json deleted file mode 100644 index 269ab1295..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/heart_of_the_sea.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "type": "anvilcraft:anvil_processing", - "icon": { - "item": "minecraft:heart_of_the_sea" - }, - "outcomes": [ - { - "type": "spawn_item", - "chance": 1.0, - "offset": [ - 0.0, - 0.0, - 0.0 - ], - "result": { - "item": "minecraft:heart_of_the_sea" - } - }, - { - "type": "spawn_item", - "chance": 1.0, - "offset": [ - 0.0, - 0.0, - 0.0 - ], - "result": { - "item": "minecraft:prismarine_shard" - } - } - ], - "predicates": [ - { - "type": "has_block", - "match_block": { - "blocks": [ - "minecraft:smithing_table" - ] - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - }, - { - "type": "has_item_ingredient", - "match_item": { - "count": { - "min": 1 - }, - "items": [ - "anvilcraft:kernel_of_the_sea" - ] - }, - "offset": [ - 0.0, - 0.0, - 0.0 - ] - } - ] -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/smooth_royal_steel_block_from_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/recipes/smooth_royal_steel_block_from_royal_steel_block_stonecutting.json deleted file mode 100644 index 6bc012282..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/smooth_royal_steel_block_from_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 4, - "ingredient": { - "item": "anvilcraft:royal_steel_block" - }, - "result": "anvilcraft:smooth_royal_steel_block" -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/trident.json b/forge/src/generated/resources/data/minecraft/recipes/trident.json deleted file mode 100644 index a342d4de1..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/trident.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "key": { - "A": { - "item": "anvilcraft:blade_of_the_sea" - }, - "B": { - "item": "minecraft:prismarine_shard" - } - }, - "pattern": [ - " AA", - " BA", - "B " - ], - "result": { - "item": "minecraft:trident" - }, - "show_notification": true -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json b/forge/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json index 607731ac6..4b2ce19d6 100644 --- a/forge/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json +++ b/forge/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json @@ -2,6 +2,9 @@ "replace": false, "values": [ "anvilcraft:royal_steel_block", - "anvilcraft:cursed_gold_block" + "anvilcraft:cursed_gold_block", + "anvilcraft:topaz_block", + "anvilcraft:ruby_block", + "anvilcraft:sapphire_block" ] } \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/tags/items/beacon_payment_items.json b/forge/src/generated/resources/data/minecraft/tags/items/beacon_payment_items.json index b8f541030..48440cdfe 100644 --- a/forge/src/generated/resources/data/minecraft/tags/items/beacon_payment_items.json +++ b/forge/src/generated/resources/data/minecraft/tags/items/beacon_payment_items.json @@ -2,6 +2,9 @@ "replace": false, "values": [ "anvilcraft:royal_steel_ingot", - "anvilcraft:cursed_gold_ingot" + "anvilcraft:cursed_gold_ingot", + "anvilcraft:topaz", + "anvilcraft:ruby", + "anvilcraft:sapphire" ] } \ No newline at end of file From d0cfb0670f3aff0ae23c080e1edaae92e63d8477 Mon Sep 17 00:00:00 2001 From: wdfaESfaef <2622389575@qq.com> Date: Sat, 13 Apr 2024 00:06:05 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=B6=E7=A7=BB?= =?UTF-8?q?=E9=85=8D=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/generator/recipe/RecipesHandler.java | 2 +- .../recipe/TimeWarpRecipesLoader.java | 27 +++++++ .../misc/timewarp/sea_heart_shell.json | 35 ++++++++ .../recipes/timewarp/sea_heart_shell.json | 80 +++++++++++++++++++ .../misc/timewarp/sea_heart_shell.json | 35 ++++++++ .../recipes/timewarp/sea_heart_shell.json | 80 +++++++++++++++++++ 6 files changed, 258 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/TimeWarpRecipesLoader.java create mode 100644 fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/sea_heart_shell.json create mode 100644 fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/sea_heart_shell.json create mode 100644 forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/sea_heart_shell.json create mode 100644 forge/src/generated/resources/data/anvilcraft/recipes/timewarp/sea_heart_shell.json diff --git a/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/RecipesHandler.java b/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/RecipesHandler.java index f44e27798..4b0d19960 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/RecipesHandler.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/RecipesHandler.java @@ -18,6 +18,6 @@ public static void init(RegistrateRecipeProvider provider) { SmashRecipesLoader.init(provider); SqueezeRecipesLoader.init(provider); StampingRecipesLoader.init(provider); - + TimeWarpRecipesLoader.init(provider); } } diff --git a/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/TimeWarpRecipesLoader.java b/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/TimeWarpRecipesLoader.java new file mode 100644 index 000000000..31e6f1566 --- /dev/null +++ b/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/TimeWarpRecipesLoader.java @@ -0,0 +1,27 @@ +package dev.dubhe.anvilcraft.data.generator.recipe; + +import com.tterrag.registrate.providers.RegistrateRecipeProvider; +import dev.dubhe.anvilcraft.AnvilCraft; +import dev.dubhe.anvilcraft.data.generator.AnvilCraftDatagen; +import dev.dubhe.anvilcraft.data.recipe.anvil.AnvilRecipe; +import dev.dubhe.anvilcraft.init.ModBlocks; +import dev.dubhe.anvilcraft.init.ModItems; +import java.util.Map; +import net.minecraft.data.recipes.RecipeCategory; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.LayeredCauldronBlock; +import net.minecraft.world.phys.Vec3; + +public class TimeWarpRecipesLoader { + public static void init(RegistrateRecipeProvider provider) { + AnvilRecipe.Builder.create(RecipeCategory.MISC) + .icon(ModItems.SEA_HEART_SHELL) + .hasBlock(ModBlocks.CORRUPTED_BEACON.get(), new Vec3(0.0, -2.0, 0.0)) + .hasBlock(Blocks.WATER_CAULDRON, new Vec3(0.0, -1.0, 0.0), Map.entry(LayeredCauldronBlock.LEVEL, 3)) + .hasItemIngredient(new Vec3(0.0, -1.0, 0.0), ModItems.SEA_HEART_SHELL_SHARD) + .spawnItem(new Vec3(0.0, -1.0, 0.0), ModItems.SEA_HEART_SHELL) + .setBlock(Blocks.CAULDRON.defaultBlockState()) + .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.SEA_HEART_SHELL_SHARD.get()), AnvilCraftDatagen.has(ModItems.SEA_HEART_SHELL_SHARD)) + .save(provider, AnvilCraft.of("timewarp/sea_heart_shell")); + } +} diff --git a/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/sea_heart_shell.json b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/sea_heart_shell.json new file mode 100644 index 000000000..8a9e3ead0 --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/sea_heart_shell.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_sea_heart_shell_shard": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:sea_heart_shell_shard" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:timewarp/sea_heart_shell" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_sea_heart_shell_shard", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:timewarp/sea_heart_shell" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/sea_heart_shell.json b/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/sea_heart_shell.json new file mode 100644 index 000000000..c284f8185 --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/sea_heart_shell.json @@ -0,0 +1,80 @@ +{ + "type": "anvilcraft:anvil_processing", + "icon": { + "item": "anvilcraft:sea_heart_shell" + }, + "outcomes": [ + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "item": "anvilcraft:sea_heart_shell" + } + }, + { + "type": "set_block", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "block": "minecraft:cauldron" + } + } + ], + "predicates": [ + { + "type": "has_block", + "match_block": { + "blocks": [ + "anvilcraft:corrupted_beacon" + ], + "state": {} + }, + "offset": [ + 0.0, + -2.0, + 0.0 + ] + }, + { + "type": "has_block", + "match_block": { + "blocks": [ + "minecraft:water_cauldron" + ], + "state": { + "level": "3" + } + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + }, + { + "type": "has_item_ingredient", + "match_item": { + "count": { + "min": 1 + }, + "items": [ + "anvilcraft:sea_heart_shell_shard" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + } + ] +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/sea_heart_shell.json b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/sea_heart_shell.json new file mode 100644 index 000000000..8a9e3ead0 --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/sea_heart_shell.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_sea_heart_shell_shard": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:sea_heart_shell_shard" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:timewarp/sea_heart_shell" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_sea_heart_shell_shard", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:timewarp/sea_heart_shell" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/sea_heart_shell.json b/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/sea_heart_shell.json new file mode 100644 index 000000000..c284f8185 --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/sea_heart_shell.json @@ -0,0 +1,80 @@ +{ + "type": "anvilcraft:anvil_processing", + "icon": { + "item": "anvilcraft:sea_heart_shell" + }, + "outcomes": [ + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "item": "anvilcraft:sea_heart_shell" + } + }, + { + "type": "set_block", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "block": "minecraft:cauldron" + } + } + ], + "predicates": [ + { + "type": "has_block", + "match_block": { + "blocks": [ + "anvilcraft:corrupted_beacon" + ], + "state": {} + }, + "offset": [ + 0.0, + -2.0, + 0.0 + ] + }, + { + "type": "has_block", + "match_block": { + "blocks": [ + "minecraft:water_cauldron" + ], + "state": { + "level": "3" + } + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + }, + { + "type": "has_item_ingredient", + "match_item": { + "count": { + "min": 1 + }, + "items": [ + "anvilcraft:sea_heart_shell_shard" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + } + ] +} \ No newline at end of file From fa526a623532bdd504bedcac7fa316718212e278 Mon Sep 17 00:00:00 2001 From: DancingSnow <1121149616@qq.com> Date: Sat, 13 Apr 2024 00:09:14 +0800 Subject: [PATCH 05/10] {} --- style.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/style.xml b/style.xml index 0a2405761..d9df1ba48 100644 --- a/style.xml +++ b/style.xml @@ -74,7 +74,7 @@ + value="LITERAL_DO, LITERAL_WHILE"/> Date: Sat, 13 Apr 2024 00:13:40 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java | 2 -- .../assets/anvilcraft/models/block/resin_block.json | 1 + .../assets/anvilcraft/blockstates/resin_block.json | 7 ------- .../assets/anvilcraft/models/block/resin_block.json | 7 ------- .../assets/anvilcraft/blockstates/resin_block.json | 7 ------- .../assets/anvilcraft/models/block/resin_block.json | 7 ------- 6 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 fabric/src/generated/resources/assets/anvilcraft/blockstates/resin_block.json delete mode 100644 fabric/src/generated/resources/assets/anvilcraft/models/block/resin_block.json delete mode 100644 forge/src/generated/resources/assets/anvilcraft/blockstates/resin_block.json delete mode 100644 forge/src/generated/resources/assets/anvilcraft/models/block/resin_block.json diff --git a/common/src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java b/common/src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java index 5304b19aa..b10d9ab38 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java @@ -329,8 +329,6 @@ public class ModBlocks { .block("resin_block", SlimeBlock::new) .initialProperties(() -> Blocks.SLIME_BLOCK) .blockstate((ctx, provider) -> { - provider.simpleBlock(ctx.get()); - provider.models().cubeAll(ctx.getName(), provider.modLoc("block/" + ctx.getName())).renderType("translucent"); }) .properties(properties -> properties.sound(SoundType.HONEY_BLOCK)) .simpleItem() diff --git a/common/src/main/resources/assets/anvilcraft/models/block/resin_block.json b/common/src/main/resources/assets/anvilcraft/models/block/resin_block.json index 246d54a3d..41c122ee7 100644 --- a/common/src/main/resources/assets/anvilcraft/models/block/resin_block.json +++ b/common/src/main/resources/assets/anvilcraft/models/block/resin_block.json @@ -1,6 +1,7 @@ { "credit": "Made by XeKr with Blockbench", "parent": "minecraft:block/block", + "render_type": "minecraft:translucent", "textures": { "0": "anvilcraft:block/resin_block", "particle": "anvilcraft:block/resin_block" diff --git a/fabric/src/generated/resources/assets/anvilcraft/blockstates/resin_block.json b/fabric/src/generated/resources/assets/anvilcraft/blockstates/resin_block.json deleted file mode 100644 index 81faaf42a..000000000 --- a/fabric/src/generated/resources/assets/anvilcraft/blockstates/resin_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "anvilcraft:block/resin_block" - } - } -} \ No newline at end of file diff --git a/fabric/src/generated/resources/assets/anvilcraft/models/block/resin_block.json b/fabric/src/generated/resources/assets/anvilcraft/models/block/resin_block.json deleted file mode 100644 index 8b210632e..000000000 --- a/fabric/src/generated/resources/assets/anvilcraft/models/block/resin_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "render_type": "minecraft:translucent", - "textures": { - "all": "anvilcraft:block/resin_block" - } -} \ No newline at end of file diff --git a/forge/src/generated/resources/assets/anvilcraft/blockstates/resin_block.json b/forge/src/generated/resources/assets/anvilcraft/blockstates/resin_block.json deleted file mode 100644 index 81faaf42a..000000000 --- a/forge/src/generated/resources/assets/anvilcraft/blockstates/resin_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "anvilcraft:block/resin_block" - } - } -} \ No newline at end of file diff --git a/forge/src/generated/resources/assets/anvilcraft/models/block/resin_block.json b/forge/src/generated/resources/assets/anvilcraft/models/block/resin_block.json deleted file mode 100644 index 8b210632e..000000000 --- a/forge/src/generated/resources/assets/anvilcraft/models/block/resin_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "render_type": "minecraft:translucent", - "textures": { - "all": "anvilcraft:block/resin_block" - } -} \ No newline at end of file From e8dcccc184e8a85be805d6d0a9c6f0f05ec173c9 Mon Sep 17 00:00:00 2001 From: Gugle Date: Sat, 13 Apr 2024 00:22:19 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=B8=BA=E6=99=B6=E6=B4=9E=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=86=B7=E5=8D=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anvilcraft/config/AnvilCraftConfig.java | 6 ++ .../dev/dubhe/anvilcraft/item/GeodeItem.java | 9 ++- .../dev/dubhe/anvilcraft/item/MagnetItem.java | 12 ++- .../assets/anvilcraft/lang/en_ud.json | 2 + .../assets/anvilcraft/lang/en_us.json | 2 + .../anvilcraft/models/block/resin_block.json | 7 ++ .../assets/anvilcraft/lang/en_ud.json | 2 + .../assets/anvilcraft/lang/en_us.json | 2 + .../anvilcraft/models/block/resin_block.json | 7 ++ ...k_from_royal_steel_block_stonecutting.json | 35 --------- ...om_cut_royal_steel_block_stonecutting.json | 35 --------- ...b_from_royal_steel_block_stonecutting.json | 35 --------- ...om_cut_royal_steel_block_stonecutting.json | 35 --------- ...s_from_royal_steel_block_stonecutting.json | 35 --------- ...k_from_royal_steel_block_stonecutting.json | 35 --------- .../food/boil/beef_mushroom_stew_1.json | 35 --------- .../food/boil/beef_mushroom_stew_2.json | 35 --------- .../food/boil/beef_mushroom_stew_3.json | 35 --------- .../recipes/food/cook/utusan.json | 35 --------- .../recipes/misc/ancient_debris.json | 48 ------------ .../advancements/recipes/misc/bone_block.json | 35 --------- .../recipes/misc/heart_of_the_sea.json | 35 --------- .../recipes/tools/chipped_anvil.json | 48 ------------ .../recipes/tools/damaged_anvil.json | 48 ------------ .../advancements/recipes/tools/elytra.json | 35 --------- .../advancements/recipes/tools/trident.json | 35 --------- .../minecraft/recipes/ancient_debris.json | 51 ------------ .../recipes/boil/beef_mushroom_stew_1.json | 77 ------------------ .../recipes/boil/beef_mushroom_stew_2.json | 78 ------------------- .../recipes/boil/beef_mushroom_stew_3.json | 78 ------------------- .../data/minecraft/recipes/bone_block.json | 51 ------------ .../data/minecraft/recipes/chipped_anvil.json | 21 ----- .../data/minecraft/recipes/cook/utusan.json | 62 --------------- ...k_from_royal_steel_block_stonecutting.json | 8 -- ...om_cut_royal_steel_block_stonecutting.json | 8 -- ...b_from_royal_steel_block_stonecutting.json | 8 -- ...om_cut_royal_steel_block_stonecutting.json | 8 -- ...s_from_royal_steel_block_stonecutting.json | 8 -- .../data/minecraft/recipes/damaged_anvil.json | 21 ----- .../data/minecraft/recipes/elytra.json | 24 ------ .../minecraft/recipes/heart_of_the_sea.json | 63 --------------- ...k_from_royal_steel_block_stonecutting.json | 8 -- .../data/minecraft/recipes/trident.json | 21 ----- .../tags/blocks/beacon_base_blocks.json | 5 +- .../tags/items/beacon_payment_items.json | 5 +- 45 files changed, 52 insertions(+), 1236 deletions(-) create mode 100644 fabric/src/generated/resources/assets/anvilcraft/models/block/resin_block.json create mode 100644 forge/src/generated/resources/assets/anvilcraft/models/block/resin_block.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_block_from_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_slab_from_cut_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_slab_from_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_stairs_from_cut_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_stairs_from_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/smooth_royal_steel_block_from_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_1.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_2.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_3.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/food/cook/utusan.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/misc/ancient_debris.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/misc/bone_block.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/misc/heart_of_the_sea.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/tools/chipped_anvil.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/tools/damaged_anvil.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/tools/elytra.json delete mode 100644 forge/src/generated/resources/data/minecraft/advancements/recipes/tools/trident.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/ancient_debris.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_1.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_2.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_3.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/bone_block.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/chipped_anvil.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/cook/utusan.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_block_from_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_slab_from_cut_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_slab_from_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_stairs_from_cut_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_stairs_from_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/damaged_anvil.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/elytra.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/heart_of_the_sea.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/smooth_royal_steel_block_from_royal_steel_block_stonecutting.json delete mode 100644 forge/src/generated/resources/data/minecraft/recipes/trident.json diff --git a/common/src/main/java/dev/dubhe/anvilcraft/config/AnvilCraftConfig.java b/common/src/main/java/dev/dubhe/anvilcraft/config/AnvilCraftConfig.java index 91d2df941..475b38b7b 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/config/AnvilCraftConfig.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/config/AnvilCraftConfig.java @@ -63,4 +63,10 @@ public class AnvilCraftConfig implements ConfigData { @ConfigEntry.BoundedDiscrete(max = 8, min = 1) @SerializedName("Geode Search Interval") public int geodeInterval = 4; + + @Comment("The search cooldown of the geode (in seconds)") + @ConfigEntry.Gui.Tooltip + @ConfigEntry.BoundedDiscrete(max = 30, min = 5) + @SerializedName("Geode Search Cooldown") + public int geodeCooldown = 5; } \ No newline at end of file diff --git a/common/src/main/java/dev/dubhe/anvilcraft/item/GeodeItem.java b/common/src/main/java/dev/dubhe/anvilcraft/item/GeodeItem.java index 398abb5bd..28834b3a6 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/item/GeodeItem.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/item/GeodeItem.java @@ -20,9 +20,14 @@ public GeodeItem(Properties properties) { } @Override - public @NotNull InteractionResultHolder use(Level level, Player player, @NotNull InteractionHand usedHand) { + public @NotNull InteractionResultHolder use( + @NotNull Level level, + @NotNull Player player, + @NotNull InteractionHand usedHand + ) { ItemStack itemStack = player.getItemInHand(usedHand); BlockPos pos = player.getOnPos().below(); + player.getCooldowns().addCooldown(itemStack.getItem(), AnvilCraft.config.geodeCooldown * 20); if (!level.isClientSide) return InteractionResultHolder.success(itemStack); int interval = AnvilCraft.config.geodeInterval; int radius = AnvilCraft.config.geodeRadius; @@ -32,7 +37,7 @@ public GeodeItem(Properties properties) { for (int y = level.getMinBuildHeight(); y <= height; y += interval) { BlockPos offsetPos = pos.offset(x, y, z); BlockState state = level.getBlockState(offsetPos); - if(!state.is(BlockTags.CRYSTAL_SOUND_BLOCKS)) continue; + if (!state.is(BlockTags.CRYSTAL_SOUND_BLOCKS)) continue; BlockHighlightUtil.highlightBlock(level, offsetPos); break; } diff --git a/common/src/main/java/dev/dubhe/anvilcraft/item/MagnetItem.java b/common/src/main/java/dev/dubhe/anvilcraft/item/MagnetItem.java index 2d2768edd..cee2c8d56 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/item/MagnetItem.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/item/MagnetItem.java @@ -19,11 +19,17 @@ public MagnetItem(Properties properties) { } @Override - public @NotNull InteractionResultHolder use(@NotNull Level level, @NotNull Player player, InteractionHand usedHand) { + public @NotNull InteractionResultHolder use( + @NotNull Level level, + @NotNull Player player, + @NotNull InteractionHand usedHand + ) { ItemStack item = player.getItemInHand(usedHand); double radius = AnvilCraft.config.magnetItemAttractsRadius; - AABB aabb = new AABB(player.position().add(-radius, -radius, -radius), player.position().add(radius, radius, radius)); - level.getEntities(EntityTypeTest.forClass(ItemEntity.class), aabb, Entity::isAlive).forEach(e -> e.moveTo(player.position())); + AABB aabb = new AABB(player.position().add(-radius, -radius, -radius), player.position() + .add(radius, radius, radius)); + level.getEntities(EntityTypeTest.forClass(ItemEntity.class), aabb, Entity::isAlive) + .forEach(e -> e.moveTo(player.position())); item.hurtAndBreak(1, player, p -> p.broadcastBreakEvent(usedHand)); return InteractionResultHolder.sidedSuccess(item, level.isClientSide()); } diff --git a/fabric/src/generated/resources/assets/anvilcraft/lang/en_ud.json b/fabric/src/generated/resources/assets/anvilcraft/lang/en_ud.json index a7a5fa203..f7b8508fa 100644 --- a/fabric/src/generated/resources/assets/anvilcraft/lang/en_ud.json +++ b/fabric/src/generated/resources/assets/anvilcraft/lang/en_ud.json @@ -92,6 +92,8 @@ "text.autoconfig.anvilcraft.option.autoCrafterCooldown.@Tooltip": ")sʞɔıʇ uı( ɹǝʇɟɐɹɔ oʇnɐ ɟo ǝɯıʇ uʍopןooɔ ɯnɯıxɐW", "text.autoconfig.anvilcraft.option.chuteMaxCooldown": "uʍopןooƆ xɐW ǝʇnɥƆ", "text.autoconfig.anvilcraft.option.chuteMaxCooldown.@Tooltip": ")sʞɔıʇ uı( ǝʇnɥɔ ɟo ǝɯıʇ uʍopןooɔ ɯnɯıxɐW", + "text.autoconfig.anvilcraft.option.geodeCooldown": "uʍopןooƆ ɥɔɹɐǝS ǝpoǝ⅁", + "text.autoconfig.anvilcraft.option.geodeCooldown.@Tooltip": ")spuoɔǝs uı( ǝpoǝb ǝɥʇ ɟo uʍopןooɔ ɥɔɹɐǝs ǝɥ⟘", "text.autoconfig.anvilcraft.option.geodeInterval": "ןɐʌɹǝʇuI ɥɔɹɐǝS ǝpoǝ⅁", "text.autoconfig.anvilcraft.option.geodeInterval.@Tooltip": "ǝpoǝb ǝɥʇ ɟo ןɐʌɹǝʇuı ɥɔɹɐǝs ǝɥ⟘", "text.autoconfig.anvilcraft.option.geodeRadius": "snıpɐᴚ ɥɔɹɐǝS ɯnɯıxɐW ǝpoǝ⅁", diff --git a/fabric/src/generated/resources/assets/anvilcraft/lang/en_us.json b/fabric/src/generated/resources/assets/anvilcraft/lang/en_us.json index b0ced67d9..35be2ec28 100644 --- a/fabric/src/generated/resources/assets/anvilcraft/lang/en_us.json +++ b/fabric/src/generated/resources/assets/anvilcraft/lang/en_us.json @@ -92,6 +92,8 @@ "text.autoconfig.anvilcraft.option.autoCrafterCooldown.@Tooltip": "Maximum cooldown time of auto crafter (in ticks)", "text.autoconfig.anvilcraft.option.chuteMaxCooldown": "Chute Max Cooldown", "text.autoconfig.anvilcraft.option.chuteMaxCooldown.@Tooltip": "Maximum cooldown time of chute (in ticks)", + "text.autoconfig.anvilcraft.option.geodeCooldown": "Geode Search Cooldown", + "text.autoconfig.anvilcraft.option.geodeCooldown.@Tooltip": "The search cooldown of the geode (in seconds)", "text.autoconfig.anvilcraft.option.geodeInterval": "Geode Search Interval", "text.autoconfig.anvilcraft.option.geodeInterval.@Tooltip": "The search interval of the geode", "text.autoconfig.anvilcraft.option.geodeRadius": "Geode Maximum Search Radius", diff --git a/fabric/src/generated/resources/assets/anvilcraft/models/block/resin_block.json b/fabric/src/generated/resources/assets/anvilcraft/models/block/resin_block.json new file mode 100644 index 000000000..8b210632e --- /dev/null +++ b/fabric/src/generated/resources/assets/anvilcraft/models/block/resin_block.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "render_type": "minecraft:translucent", + "textures": { + "all": "anvilcraft:block/resin_block" + } +} \ No newline at end of file diff --git a/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json b/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json index a7a5fa203..f7b8508fa 100644 --- a/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json +++ b/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json @@ -92,6 +92,8 @@ "text.autoconfig.anvilcraft.option.autoCrafterCooldown.@Tooltip": ")sʞɔıʇ uı( ɹǝʇɟɐɹɔ oʇnɐ ɟo ǝɯıʇ uʍopןooɔ ɯnɯıxɐW", "text.autoconfig.anvilcraft.option.chuteMaxCooldown": "uʍopןooƆ xɐW ǝʇnɥƆ", "text.autoconfig.anvilcraft.option.chuteMaxCooldown.@Tooltip": ")sʞɔıʇ uı( ǝʇnɥɔ ɟo ǝɯıʇ uʍopןooɔ ɯnɯıxɐW", + "text.autoconfig.anvilcraft.option.geodeCooldown": "uʍopןooƆ ɥɔɹɐǝS ǝpoǝ⅁", + "text.autoconfig.anvilcraft.option.geodeCooldown.@Tooltip": ")spuoɔǝs uı( ǝpoǝb ǝɥʇ ɟo uʍopןooɔ ɥɔɹɐǝs ǝɥ⟘", "text.autoconfig.anvilcraft.option.geodeInterval": "ןɐʌɹǝʇuI ɥɔɹɐǝS ǝpoǝ⅁", "text.autoconfig.anvilcraft.option.geodeInterval.@Tooltip": "ǝpoǝb ǝɥʇ ɟo ןɐʌɹǝʇuı ɥɔɹɐǝs ǝɥ⟘", "text.autoconfig.anvilcraft.option.geodeRadius": "snıpɐᴚ ɥɔɹɐǝS ɯnɯıxɐW ǝpoǝ⅁", diff --git a/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json b/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json index b0ced67d9..35be2ec28 100644 --- a/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json +++ b/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json @@ -92,6 +92,8 @@ "text.autoconfig.anvilcraft.option.autoCrafterCooldown.@Tooltip": "Maximum cooldown time of auto crafter (in ticks)", "text.autoconfig.anvilcraft.option.chuteMaxCooldown": "Chute Max Cooldown", "text.autoconfig.anvilcraft.option.chuteMaxCooldown.@Tooltip": "Maximum cooldown time of chute (in ticks)", + "text.autoconfig.anvilcraft.option.geodeCooldown": "Geode Search Cooldown", + "text.autoconfig.anvilcraft.option.geodeCooldown.@Tooltip": "The search cooldown of the geode (in seconds)", "text.autoconfig.anvilcraft.option.geodeInterval": "Geode Search Interval", "text.autoconfig.anvilcraft.option.geodeInterval.@Tooltip": "The search interval of the geode", "text.autoconfig.anvilcraft.option.geodeRadius": "Geode Maximum Search Radius", diff --git a/forge/src/generated/resources/assets/anvilcraft/models/block/resin_block.json b/forge/src/generated/resources/assets/anvilcraft/models/block/resin_block.json new file mode 100644 index 000000000..8b210632e --- /dev/null +++ b/forge/src/generated/resources/assets/anvilcraft/models/block/resin_block.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "render_type": "minecraft:translucent", + "textures": { + "all": "anvilcraft:block/resin_block" + } +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_block_from_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_block_from_royal_steel_block_stonecutting.json deleted file mode 100644 index 5af457156..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_block_from_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_royal_steel_block": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:royal_steel_block" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:cut_royal_steel_block_from_royal_steel_block_stonecutting" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_royal_steel_block", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:cut_royal_steel_block_from_royal_steel_block_stonecutting" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_slab_from_cut_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_slab_from_cut_royal_steel_block_stonecutting.json deleted file mode 100644 index ed43c92e6..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_slab_from_cut_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cut_royal_steel_block": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:cut_royal_steel_block" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:cut_royal_steel_slab_from_cut_royal_steel_block_stonecutting" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_cut_royal_steel_block", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:cut_royal_steel_slab_from_cut_royal_steel_block_stonecutting" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_slab_from_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_slab_from_royal_steel_block_stonecutting.json deleted file mode 100644 index 6df343893..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_slab_from_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_royal_steel_block": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:royal_steel_block" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:cut_royal_steel_slab_from_royal_steel_block_stonecutting" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_royal_steel_block", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:cut_royal_steel_slab_from_royal_steel_block_stonecutting" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_stairs_from_cut_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_stairs_from_cut_royal_steel_block_stonecutting.json deleted file mode 100644 index f93f9a6a7..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_stairs_from_cut_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cut_royal_steel_block": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:cut_royal_steel_block" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:cut_royal_steel_stairs_from_cut_royal_steel_block_stonecutting" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_cut_royal_steel_block", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:cut_royal_steel_stairs_from_cut_royal_steel_block_stonecutting" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_stairs_from_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_stairs_from_royal_steel_block_stonecutting.json deleted file mode 100644 index 39fef3a83..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/cut_royal_steel_stairs_from_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_royal_steel_block": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:royal_steel_block" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:cut_royal_steel_stairs_from_royal_steel_block_stonecutting" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_royal_steel_block", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:cut_royal_steel_stairs_from_royal_steel_block_stonecutting" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/smooth_royal_steel_block_from_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/smooth_royal_steel_block_from_royal_steel_block_stonecutting.json deleted file mode 100644 index 90c03d662..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/smooth_royal_steel_block_from_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_royal_steel_block": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:royal_steel_block" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:smooth_royal_steel_block_from_royal_steel_block_stonecutting" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_royal_steel_block", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:smooth_royal_steel_block_from_royal_steel_block_stonecutting" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_1.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_1.json deleted file mode 100644 index a67070139..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_1.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_beef_mushroom_stew_raw": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:beef_mushroom_stew_raw" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:boil/beef_mushroom_stew_1" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_beef_mushroom_stew_raw", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:boil/beef_mushroom_stew_1" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_2.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_2.json deleted file mode 100644 index 1f723f229..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_2.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_beef_mushroom_stew_raw": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:beef_mushroom_stew_raw" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:boil/beef_mushroom_stew_2" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_beef_mushroom_stew_raw", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:boil/beef_mushroom_stew_2" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_3.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_3.json deleted file mode 100644 index d61e8309d..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/food/boil/beef_mushroom_stew_3.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_beef_mushroom_stew_raw": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:beef_mushroom_stew_raw" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:boil/beef_mushroom_stew_3" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_beef_mushroom_stew_raw", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:boil/beef_mushroom_stew_3" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/food/cook/utusan.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/food/cook/utusan.json deleted file mode 100644 index 7c0f3c618..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/food/cook/utusan.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:cook/utusan" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_utusan_raw": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:utusan_raw" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_utusan_raw", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:cook/utusan" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/misc/ancient_debris.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/misc/ancient_debris.json deleted file mode 100644 index b342b7078..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/misc/ancient_debris.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_netherite_coil": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:netherite_coil" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_soul_soil": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:soul_soil" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:ancient_debris" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_soul_soil", - "has_netherite_coil", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:ancient_debris" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/misc/bone_block.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/misc/bone_block.json deleted file mode 100644 index c79af545c..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/misc/bone_block.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_bone": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:bone" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:bone_block" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_bone", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:bone_block" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/misc/heart_of_the_sea.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/misc/heart_of_the_sea.json deleted file mode 100644 index 3d9ff22cc..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/misc/heart_of_the_sea.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_kernel_of_the_sea": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:kernel_of_the_sea" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:heart_of_the_sea" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_kernel_of_the_sea", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:heart_of_the_sea" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/tools/chipped_anvil.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/tools/chipped_anvil.json deleted file mode 100644 index 893622ec7..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/tools/chipped_anvil.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_iron_block": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:iron_block" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_iron_ingot": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:iron_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:chipped_anvil" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_iron_block", - "has_iron_ingot", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:chipped_anvil" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/tools/damaged_anvil.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/tools/damaged_anvil.json deleted file mode 100644 index 74a3dcef0..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/tools/damaged_anvil.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_iron_block": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:iron_block" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_iron_ingot": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:iron_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:damaged_anvil" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_iron_block", - "has_iron_ingot", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:damaged_anvil" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/tools/elytra.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/tools/elytra.json deleted file mode 100644 index 9422c66eb..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/tools/elytra.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:elytra" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "hasitem": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:elytra_membrane" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "hasitem", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:elytra" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/advancements/recipes/tools/trident.json b/forge/src/generated/resources/data/minecraft/advancements/recipes/tools/trident.json deleted file mode 100644 index d0066ccc5..000000000 --- a/forge/src/generated/resources/data/minecraft/advancements/recipes/tools/trident.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:trident" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "hasitem": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:blade_of_the_sea" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "hasitem", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:trident" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/ancient_debris.json b/forge/src/generated/resources/data/minecraft/recipes/ancient_debris.json deleted file mode 100644 index 0ba7c2a89..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/ancient_debris.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "type": "anvilcraft:anvil_processing", - "icon": { - "item": "minecraft:ancient_debris" - }, - "outcomes": [ - { - "type": "set_block", - "chance": 1.0, - "offset": [ - 0.0, - -1.0, - 0.0 - ], - "result": { - "block": "minecraft:ancient_debris" - } - } - ], - "predicates": [ - { - "type": "has_block", - "match_block": { - "blocks": [ - "minecraft:soul_soil" - ] - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - }, - { - "type": "has_item_ingredient", - "match_item": { - "count": { - "min": 1 - }, - "items": [ - "anvilcraft:netherite_coil" - ] - }, - "offset": [ - 0.0, - 0.0, - 0.0 - ] - } - ] -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_1.json b/forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_1.json deleted file mode 100644 index 58cf000f2..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_1.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "type": "anvilcraft:anvil_processing", - "icon": { - "item": "minecraft:cauldron" - }, - "outcomes": [ - { - "type": "set_block", - "chance": 1.0, - "offset": [ - 0.0, - -1.0, - 0.0 - ], - "result": { - "block": "minecraft:cauldron" - } - }, - { - "type": "spawn_item", - "chance": 1.0, - "offset": [ - 0.0, - 0.0, - 0.0 - ], - "result": { - "item": "anvilcraft:beef_mushroom_stew" - } - } - ], - "predicates": [ - { - "type": "has_block", - "match_block": { - "blocks": [ - "minecraft:water_cauldron" - ], - "state": { - "level": "1" - } - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - }, - { - "type": "has_block", - "match_block": { - "tag": "minecraft:campfires" - }, - "offset": [ - 0.0, - -2.0, - 0.0 - ] - }, - { - "type": "has_item_ingredient", - "match_item": { - "count": { - "min": 1 - }, - "items": [ - "anvilcraft:beef_mushroom_stew_raw" - ] - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - } - ] -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_2.json b/forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_2.json deleted file mode 100644 index 25ada3cc4..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_2.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "type": "anvilcraft:anvil_processing", - "icon": { - "item": "minecraft:cauldron" - }, - "outcomes": [ - { - "type": "set_block", - "chance": 1.0, - "offset": [ - 0.0, - -1.0, - 0.0 - ], - "result": { - "block": "minecraft:water_cauldron", - "state": "[level=1]" - } - }, - { - "type": "spawn_item", - "chance": 1.0, - "offset": [ - 0.0, - 0.0, - 0.0 - ], - "result": { - "item": "anvilcraft:beef_mushroom_stew" - } - } - ], - "predicates": [ - { - "type": "has_block", - "match_block": { - "blocks": [ - "minecraft:water_cauldron" - ], - "state": { - "level": "2" - } - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - }, - { - "type": "has_block", - "match_block": { - "tag": "minecraft:campfires" - }, - "offset": [ - 0.0, - -2.0, - 0.0 - ] - }, - { - "type": "has_item_ingredient", - "match_item": { - "count": { - "min": 1 - }, - "items": [ - "anvilcraft:beef_mushroom_stew_raw" - ] - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - } - ] -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_3.json b/forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_3.json deleted file mode 100644 index 6d74aea6d..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/boil/beef_mushroom_stew_3.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "type": "anvilcraft:anvil_processing", - "icon": { - "item": "minecraft:cauldron" - }, - "outcomes": [ - { - "type": "set_block", - "chance": 1.0, - "offset": [ - 0.0, - -1.0, - 0.0 - ], - "result": { - "block": "minecraft:water_cauldron", - "state": "[level=2]" - } - }, - { - "type": "spawn_item", - "chance": 1.0, - "offset": [ - 0.0, - 0.0, - 0.0 - ], - "result": { - "item": "anvilcraft:beef_mushroom_stew" - } - } - ], - "predicates": [ - { - "type": "has_block", - "match_block": { - "blocks": [ - "minecraft:water_cauldron" - ], - "state": { - "level": "3" - } - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - }, - { - "type": "has_block", - "match_block": { - "tag": "minecraft:campfires" - }, - "offset": [ - 0.0, - -2.0, - 0.0 - ] - }, - { - "type": "has_item_ingredient", - "match_item": { - "count": { - "min": 1 - }, - "items": [ - "anvilcraft:beef_mushroom_stew_raw" - ] - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - } - ] -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/bone_block.json b/forge/src/generated/resources/data/minecraft/recipes/bone_block.json deleted file mode 100644 index af87c40c0..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/bone_block.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "type": "anvilcraft:anvil_processing", - "icon": { - "item": "minecraft:bone_block" - }, - "outcomes": [ - { - "type": "spawn_item", - "chance": 1.0, - "offset": [ - 0.0, - 0.0, - 0.0 - ], - "result": { - "item": "minecraft:bone_block" - } - } - ], - "predicates": [ - { - "type": "has_block", - "match_block": { - "blocks": [ - "minecraft:cauldron" - ] - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - }, - { - "type": "has_item_ingredient", - "match_item": { - "count": { - "min": 3 - }, - "items": [ - "minecraft:bone" - ] - }, - "offset": [ - 0.0, - 0.0, - 0.0 - ] - } - ] -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/chipped_anvil.json b/forge/src/generated/resources/data/minecraft/recipes/chipped_anvil.json deleted file mode 100644 index 1b860b6fc..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/chipped_anvil.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "key": { - "A": { - "item": "minecraft:iron_block" - }, - "B": { - "item": "minecraft:iron_ingot" - } - }, - "pattern": [ - "AAB", - " B ", - "BBB" - ], - "result": { - "item": "minecraft:chipped_anvil" - }, - "show_notification": true -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/cook/utusan.json b/forge/src/generated/resources/data/minecraft/recipes/cook/utusan.json deleted file mode 100644 index 328d3e514..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/cook/utusan.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "type": "anvilcraft:anvil_processing", - "icon": { - "item": "anvilcraft:utusan" - }, - "outcomes": [ - { - "type": "spawn_item", - "chance": 1.0, - "offset": [ - 0.0, - 0.0, - 0.0 - ], - "result": { - "item": "anvilcraft:utusan" - } - } - ], - "predicates": [ - { - "type": "has_block", - "match_block": { - "blocks": [ - "minecraft:cauldron" - ] - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - }, - { - "type": "has_block", - "match_block": { - "tag": "minecraft:campfires" - }, - "offset": [ - 0.0, - -2.0, - 0.0 - ] - }, - { - "type": "has_item_ingredient", - "match_item": { - "count": { - "min": 1 - }, - "items": [ - "anvilcraft:utusan_raw" - ] - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - } - ] -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_block_from_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_block_from_royal_steel_block_stonecutting.json deleted file mode 100644 index 5b4bb91ef..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_block_from_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 4, - "ingredient": { - "item": "anvilcraft:royal_steel_block" - }, - "result": "anvilcraft:cut_royal_steel_block" -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_slab_from_cut_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_slab_from_cut_royal_steel_block_stonecutting.json deleted file mode 100644 index 757926d55..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_slab_from_cut_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 2, - "ingredient": { - "item": "anvilcraft:cut_royal_steel_block" - }, - "result": "anvilcraft:cut_royal_steel_slab" -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_slab_from_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_slab_from_royal_steel_block_stonecutting.json deleted file mode 100644 index ceebd14da..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_slab_from_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 8, - "ingredient": { - "item": "anvilcraft:royal_steel_block" - }, - "result": "anvilcraft:cut_royal_steel_slab" -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_stairs_from_cut_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_stairs_from_cut_royal_steel_block_stonecutting.json deleted file mode 100644 index 577455d62..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_stairs_from_cut_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "anvilcraft:cut_royal_steel_block" - }, - "result": "anvilcraft:cut_royal_steel_stairs" -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_stairs_from_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_stairs_from_royal_steel_block_stonecutting.json deleted file mode 100644 index e6a10455c..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/cut_royal_steel_stairs_from_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 4, - "ingredient": { - "item": "anvilcraft:royal_steel_block" - }, - "result": "anvilcraft:cut_royal_steel_stairs" -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/damaged_anvil.json b/forge/src/generated/resources/data/minecraft/recipes/damaged_anvil.json deleted file mode 100644 index 51eb0a616..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/damaged_anvil.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "key": { - "A": { - "item": "minecraft:iron_block" - }, - "B": { - "item": "minecraft:iron_ingot" - } - }, - "pattern": [ - "BAB", - " B ", - "BBB" - ], - "result": { - "item": "minecraft:damaged_anvil" - }, - "show_notification": true -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/elytra.json b/forge/src/generated/resources/data/minecraft/recipes/elytra.json deleted file mode 100644 index bb97d4294..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/elytra.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "key": { - "A": { - "item": "anvilcraft:elytra_membrane" - }, - "B": { - "item": "minecraft:string" - }, - "C": { - "item": "minecraft:feather" - } - }, - "pattern": [ - "ABA", - "C C", - "C C" - ], - "result": { - "item": "minecraft:elytra" - }, - "show_notification": true -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/heart_of_the_sea.json b/forge/src/generated/resources/data/minecraft/recipes/heart_of_the_sea.json deleted file mode 100644 index 269ab1295..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/heart_of_the_sea.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "type": "anvilcraft:anvil_processing", - "icon": { - "item": "minecraft:heart_of_the_sea" - }, - "outcomes": [ - { - "type": "spawn_item", - "chance": 1.0, - "offset": [ - 0.0, - 0.0, - 0.0 - ], - "result": { - "item": "minecraft:heart_of_the_sea" - } - }, - { - "type": "spawn_item", - "chance": 1.0, - "offset": [ - 0.0, - 0.0, - 0.0 - ], - "result": { - "item": "minecraft:prismarine_shard" - } - } - ], - "predicates": [ - { - "type": "has_block", - "match_block": { - "blocks": [ - "minecraft:smithing_table" - ] - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - }, - { - "type": "has_item_ingredient", - "match_item": { - "count": { - "min": 1 - }, - "items": [ - "anvilcraft:kernel_of_the_sea" - ] - }, - "offset": [ - 0.0, - 0.0, - 0.0 - ] - } - ] -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/smooth_royal_steel_block_from_royal_steel_block_stonecutting.json b/forge/src/generated/resources/data/minecraft/recipes/smooth_royal_steel_block_from_royal_steel_block_stonecutting.json deleted file mode 100644 index 6bc012282..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/smooth_royal_steel_block_from_royal_steel_block_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 4, - "ingredient": { - "item": "anvilcraft:royal_steel_block" - }, - "result": "anvilcraft:smooth_royal_steel_block" -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/recipes/trident.json b/forge/src/generated/resources/data/minecraft/recipes/trident.json deleted file mode 100644 index a342d4de1..000000000 --- a/forge/src/generated/resources/data/minecraft/recipes/trident.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "key": { - "A": { - "item": "anvilcraft:blade_of_the_sea" - }, - "B": { - "item": "minecraft:prismarine_shard" - } - }, - "pattern": [ - " AA", - " BA", - "B " - ], - "result": { - "item": "minecraft:trident" - }, - "show_notification": true -} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json b/forge/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json index 607731ac6..4b2ce19d6 100644 --- a/forge/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json +++ b/forge/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json @@ -2,6 +2,9 @@ "replace": false, "values": [ "anvilcraft:royal_steel_block", - "anvilcraft:cursed_gold_block" + "anvilcraft:cursed_gold_block", + "anvilcraft:topaz_block", + "anvilcraft:ruby_block", + "anvilcraft:sapphire_block" ] } \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/tags/items/beacon_payment_items.json b/forge/src/generated/resources/data/minecraft/tags/items/beacon_payment_items.json index b8f541030..48440cdfe 100644 --- a/forge/src/generated/resources/data/minecraft/tags/items/beacon_payment_items.json +++ b/forge/src/generated/resources/data/minecraft/tags/items/beacon_payment_items.json @@ -2,6 +2,9 @@ "replace": false, "values": [ "anvilcraft:royal_steel_ingot", - "anvilcraft:cursed_gold_ingot" + "anvilcraft:cursed_gold_ingot", + "anvilcraft:topaz", + "anvilcraft:ruby", + "anvilcraft:sapphire" ] } \ No newline at end of file From 6e307fc11c17798d602d25b0b9c8b8087b001f36 Mon Sep 17 00:00:00 2001 From: Gugle Date: Sat, 13 Apr 2024 00:27:56 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/anvilcraft/models/block/resin_block.json | 7 ------- .../assets/anvilcraft/models/block/resin_block.json | 7 ------- 2 files changed, 14 deletions(-) delete mode 100644 fabric/src/generated/resources/assets/anvilcraft/models/block/resin_block.json delete mode 100644 forge/src/generated/resources/assets/anvilcraft/models/block/resin_block.json diff --git a/fabric/src/generated/resources/assets/anvilcraft/models/block/resin_block.json b/fabric/src/generated/resources/assets/anvilcraft/models/block/resin_block.json deleted file mode 100644 index 8b210632e..000000000 --- a/fabric/src/generated/resources/assets/anvilcraft/models/block/resin_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "render_type": "minecraft:translucent", - "textures": { - "all": "anvilcraft:block/resin_block" - } -} \ No newline at end of file diff --git a/forge/src/generated/resources/assets/anvilcraft/models/block/resin_block.json b/forge/src/generated/resources/assets/anvilcraft/models/block/resin_block.json deleted file mode 100644 index 8b210632e..000000000 --- a/forge/src/generated/resources/assets/anvilcraft/models/block/resin_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "render_type": "minecraft:translucent", - "textures": { - "all": "anvilcraft:block/resin_block" - } -} \ No newline at end of file From b0d39f102ca95148f1f3ee808a03935cd1a7c585 Mon Sep 17 00:00:00 2001 From: DancingSnow <1121149616@qq.com> Date: Sat, 13 Apr 2024 00:33:00 +0800 Subject: [PATCH 09/10] w --- style.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/style.xml b/style.xml index d9df1ba48..2bae951cc 100644 --- a/style.xml +++ b/style.xml @@ -73,8 +73,7 @@ value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/> - + Date: Sat, 13 Apr 2024 00:36:45 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=93=81=E7=A0=A7?= =?UTF-8?q?=E9=94=A4=E9=85=8D=E6=96=B9=E4=B8=AD=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dev/dubhe/anvilcraft/init/ModItems.java | 23 +++++++++++-------- .../data/anvilcraft/recipes/anvil_hammer.json | 5 ++-- .../data/anvilcraft/recipes/anvil_hammer.json | 5 ++-- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/common/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java b/common/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java index f6c775589..d4ffafd98 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java @@ -332,7 +332,8 @@ public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, @No .pattern("AAA") .pattern("AAA") .define('A', ModItems.ROYAL_STEEL_NUGGET) - .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.ROYAL_STEEL_NUGGET.get()), AnvilCraftDatagen.has(ModItems.ROYAL_STEEL_NUGGET)) + .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.ROYAL_STEEL_NUGGET.get()), + AnvilCraftDatagen.has(ModItems.ROYAL_STEEL_NUGGET)) .save(provider, AnvilCraft.of("royal_steel_ingot_from_royal_steel_nugget")); }) .register(); @@ -340,12 +341,14 @@ public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, @No .item("royal_steel_nugget", Item::new) .recipe((ctx, provider) -> ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ctx.get(), 9) .requires(ModItems.ROYAL_STEEL_INGOT) - .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.ROYAL_STEEL_NUGGET.get()), AnvilCraftDatagen.has(ModItems.ROYAL_STEEL_NUGGET)) + .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.ROYAL_STEEL_NUGGET.get()), + AnvilCraftDatagen.has(ModItems.ROYAL_STEEL_NUGGET)) .save(provider) ) .register(); public static final ItemEntry ROYAL_STEEL_PICKAXE = REGISTRATE - .item("royal_steel_pickaxe", properties -> new PickaxeItem(Tiers.DIAMOND, 1, -2.8f, properties.durability(2559)) { + .item("royal_steel_pickaxe", properties -> new PickaxeItem(Tiers.DIAMOND, 1, -2.8f, + properties.durability(2559)) { @Override public @NotNull ItemStack getDefaultInstance() { return super.getDefaultInstance(); @@ -364,14 +367,16 @@ public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, @No .recipe((ctx, provider) -> { ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ctx.get(), 9) .requires(ModBlocks.CURSED_GOLD_BLOCK) - .unlockedBy(AnvilCraftDatagen.hasItem(ModBlocks.CURSED_GOLD_BLOCK.asItem()), AnvilCraftDatagen.has(ModBlocks.CURSED_GOLD_BLOCK)) + .unlockedBy(AnvilCraftDatagen.hasItem(ModBlocks.CURSED_GOLD_BLOCK.asItem()), + AnvilCraftDatagen.has(ModBlocks.CURSED_GOLD_BLOCK)) .save(provider, AnvilCraft.of("craft/cursed_gold_ingot_1")); ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ctx.get()) .pattern("AAA") .pattern("AAA") .pattern("AAA") .define('A', ModItems.CURSED_GOLD_NUGGET) - .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.CURSED_GOLD_NUGGET.get()), AnvilCraftDatagen.has(ModItems.CURSED_GOLD_NUGGET)) + .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.CURSED_GOLD_NUGGET.get()), + AnvilCraftDatagen.has(ModItems.CURSED_GOLD_NUGGET)) .save(provider, AnvilCraft.of("craft/cursed_gold_ingot_2")); }) .register(); @@ -379,7 +384,8 @@ public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, @No .item("cursed_gold_nugget", CursedItem::new) .recipe((ctx, provider) -> ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ctx.get(), 9) .requires(ModItems.CURSED_GOLD_INGOT) - .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.CURSED_GOLD_INGOT.get()), AnvilCraftDatagen.has(ModItems.CURSED_GOLD_INGOT)) + .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.CURSED_GOLD_INGOT.get()), + AnvilCraftDatagen.has(ModItems.CURSED_GOLD_INGOT)) .save(provider)) .register(); public static final ItemEntry TOPAZ = REGISTRATE @@ -442,9 +448,8 @@ public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, @No .model((ctx, provider) -> { }) .recipe((ctx, provider) -> ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, ctx.get()) - .pattern(" A") - .pattern(" B") - .pattern(" B") + .pattern("A") + .pattern("B") .define('A', Items.ANVIL) .define('B', Items.LIGHTNING_ROD) .unlockedBy("hasitem", RegistrateRecipeProvider.has(Items.LIGHTNING_ROD)) diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/anvil_hammer.json b/fabric/src/generated/resources/data/anvilcraft/recipes/anvil_hammer.json index 144119d3a..19fbd2549 100644 --- a/fabric/src/generated/resources/data/anvilcraft/recipes/anvil_hammer.json +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/anvil_hammer.json @@ -10,9 +10,8 @@ } }, "pattern": [ - " A", - " B", - " B" + "A", + "B" ], "result": { "item": "anvilcraft:anvil_hammer" diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/anvil_hammer.json b/forge/src/generated/resources/data/anvilcraft/recipes/anvil_hammer.json index 144119d3a..19fbd2549 100644 --- a/forge/src/generated/resources/data/anvilcraft/recipes/anvil_hammer.json +++ b/forge/src/generated/resources/data/anvilcraft/recipes/anvil_hammer.json @@ -10,9 +10,8 @@ } }, "pattern": [ - " A", - " B", - " B" + "A", + "B" ], "result": { "item": "anvilcraft:anvil_hammer"