一些修改

Anvil-Dev · Jun 10, 2024 · 9a221fc · 9a221fc
1 parent 6a4bff5
commit 9a221fc
Show file tree

Hide file tree

Showing 22 changed files with 32 additions and 22 deletions.
diff --git a/common/src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java b/common/src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java
@@ -852,6 +852,7 @@ public class ModBlocks {
             HasItem hasItem = new HasItemIngredient(new Vec3(0.0, -1.0, 0.0), item).notHasTag("BlockEntityTag.entity");
             AnvilRecipe.Builder.create(RecipeCategory.MISC)
                 .icon(ctx.get())
+                .type(AnvilRecipeType.TIMEWARP)
                 .hasBlock(
                     ModBlocks.CORRUPTED_BEACON.get(),
                     new Vec3(0.0, -2.0, 0.0),
@@ -892,6 +893,7 @@ public class ModBlocks {
             ).loadItemData("resin");
             AnvilRecipe.Builder.create(RecipeCategory.MISC)
                 .icon(ctx.get())
+                .type(AnvilRecipeType.TIMEWARP)
                 .hasBlock(
                     ModBlocks.CORRUPTED_BEACON.get(),
                     new Vec3(0.0, -2.0, 0.0),
@@ -929,6 +931,7 @@ public class ModBlocks {
             ).loadItemData("resin");
             AnvilRecipe.Builder.create(RecipeCategory.MISC)
                 .icon(ctx.get())
+                .type(AnvilRecipeType.TIMEWARP)
                 .hasBlock(
                     ModBlocks.CORRUPTED_BEACON.get(),
                     new Vec3(0.0, -2.0, 0.0),

diff --git a/common/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java b/common/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java
@@ -8,6 +8,7 @@
 import dev.dubhe.anvilcraft.data.generator.AnvilCraftDatagen;
 import dev.dubhe.anvilcraft.data.generator.recipe.TimeWarpRecipesLoader;
 import dev.dubhe.anvilcraft.data.recipe.anvil.AnvilRecipe;
+import dev.dubhe.anvilcraft.data.recipe.anvil.AnvilRecipeType;
 import dev.dubhe.anvilcraft.data.recipe.crafting.ShapedTagRecipeBuilder;
 import dev.dubhe.anvilcraft.item.AmethystAxeItem;
 import dev.dubhe.anvilcraft.item.AmethystHoeItem;
@@ -174,6 +175,7 @@ public class ModItems {
         .item("flour", Item::new)
         .tag(ModItemTags.FLOUR, ModItemTags.WHEAT_FLOUR)
         .recipe((ctx, provider) -> AnvilRecipe.Builder.create(RecipeCategory.MISC, ctx.get().getDefaultInstance())
+            .type(AnvilRecipeType.ITEM_SMASH)
             .hasBlock(ModBlocks.STAMPING_PLATFORM.get())
             .hasItemIngredient(new Vec3(0.0, -0.75, 0.0), Items.WHEAT)
             .spawnItem(new Vec3(0.0, -0.75, 0.0), ctx.get())
@@ -592,6 +594,7 @@ public class ModItems {
                 .save(provider, BuiltInRegistries.ITEM.getKey(ctx.get()).getPath() + "_forge");
             AnvilRecipe.Builder.create(RecipeCategory.MISC)
                 .icon(Items.ANCIENT_DEBRIS)
+                .type(AnvilRecipeType.TIMEWARP)
                 .hasBlock(
                     ModBlocks.CORRUPTED_BEACON.get(),
                     new Vec3(0.0, -2.0, 0.0),
@@ -975,6 +978,7 @@ public class ModItems {
                 )
                 .save(provider, BuiltInRegistries.ITEM.getKey(ctx.get()).getPath() + "_forge");
             AnvilRecipe.Builder.create(RecipeCategory.MISC, ctx.get().getDefaultInstance())
+                .type(AnvilRecipeType.SUPER_HEATING)
                 .hasBlock(ModBlocks.HEATER.get(), new Vec3(0.0, -2.0, 0.0), Map.entry(OVERLOAD, false))
                 .hasBlock(Blocks.CAULDRON)
                 .hasItemIngredient(new Vec3(0.0, -1.0, 0.0), 1, ModItemTags.TIN_INGOTS)
@@ -995,6 +999,7 @@ public class ModItems {
                     )
                 );
             AnvilRecipe.Builder.create(RecipeCategory.MISC, ctx.get().getDefaultInstance())
+                .type(AnvilRecipeType.SUPER_HEATING)
                 .hasBlock(ModBlocks.HEATER.get(), new Vec3(0.0, -2.0, 0.0), Map.entry(OVERLOAD, false))
                 .hasBlock(Blocks.CAULDRON)
                 .hasItemIngredient(new Vec3(0.0, -1.0, 0.0), 1, ModItemTags.TIN_INGOTS_FORGE)
@@ -1068,6 +1073,7 @@ public class ModItems {
                 )
                 .save(provider, BuiltInRegistries.ITEM.getKey(ctx.get()).getPath() + "_forge");
             AnvilRecipe.Builder.create(RecipeCategory.MISC, ctx.get().getDefaultInstance())
+                .type(AnvilRecipeType.SUPER_HEATING)
                 .hasBlock(ModBlocks.HEATER.get(), new Vec3(0.0, -2.0, 0.0), Map.entry(OVERLOAD, false))
                 .hasBlock(Blocks.CAULDRON)
                 .hasItemIngredient(new Vec3(0.0, -1.0, 0.0), 1, ModItemTags.ZINC_INGOTS)
@@ -1088,6 +1094,7 @@ public class ModItems {
                     )
                 );
             AnvilRecipe.Builder.create(RecipeCategory.MISC, ctx.get().getDefaultInstance())
+                .type(AnvilRecipeType.SUPER_HEATING)
                 .hasBlock(ModBlocks.HEATER.get(), new Vec3(0.0, -2.0, 0.0), Map.entry(OVERLOAD, false))
                 .hasBlock(Blocks.CAULDRON)
                 .hasItemIngredient(new Vec3(0.0, -1.0, 0.0), 1, ModItemTags.ZINC_INGOTS_FORGE)

diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/flour.json b/fabric/src/generated/resources/data/anvilcraft/recipes/flour.json
@@ -1,6 +1,6 @@
 {
   "type": "anvilcraft:anvil_processing",
-  "anvil_recipe_type": "generic",
+  "anvil_recipe_type": "item_smash",
   "icon": {
     "item": "anvilcraft:flour"
   },

diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/heating/brass_ingot.json b/fabric/src/generated/resources/data/anvilcraft/recipes/heating/brass_ingot.json
@@ -1,6 +1,6 @@
 {
   "type": "anvilcraft:anvil_processing",
-  "anvil_recipe_type": "generic",
+  "anvil_recipe_type": "super_heating",
   "icon": {
     "item": "anvilcraft:brass_ingot"
   },

diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/heating/brass_ingot_forge.json b/fabric/src/generated/resources/data/anvilcraft/recipes/heating/brass_ingot_forge.json
@@ -1,6 +1,6 @@
 {
   "type": "anvilcraft:anvil_processing",
-  "anvil_recipe_type": "generic",
+  "anvil_recipe_type": "super_heating",
   "icon": {
     "item": "anvilcraft:brass_ingot"
   },

diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/heating/bronze_ingot.json b/fabric/src/generated/resources/data/anvilcraft/recipes/heating/bronze_ingot.json
@@ -1,6 +1,6 @@
 {
   "type": "anvilcraft:anvil_processing",
-  "anvil_recipe_type": "generic",
+  "anvil_recipe_type": "super_heating",
   "icon": {
     "item": "anvilcraft:bronze_ingot"
   },

diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/heating/bronze_ingot_forge.json b/fabric/src/generated/resources/data/anvilcraft/recipes/heating/bronze_ingot_forge.json
@@ -1,6 +1,6 @@
 {
   "type": "anvilcraft:anvil_processing",
-  "anvil_recipe_type": "generic",
+  "anvil_recipe_type": "super_heating",
   "icon": {
     "item": "anvilcraft:bronze_ingot"
   },

diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/amber_block.json b/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/amber_block.json
@@ -1,6 +1,6 @@
 {
   "type": "anvilcraft:anvil_processing",
-  "anvil_recipe_type": "generic",
+  "anvil_recipe_type": "timewarp",
   "icon": {
     "item": "anvilcraft:amber_block"
   },

diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/ancient_debris_first.json b/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/ancient_debris_first.json
@@ -1,6 +1,6 @@
 {
   "type": "anvilcraft:anvil_processing",
-  "anvil_recipe_type": "generic",
+  "anvil_recipe_type": "timewarp",
   "icon": {
     "item": "minecraft:ancient_debris"
   },

diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/mob_amber_block.json b/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/mob_amber_block.json
@@ -1,6 +1,6 @@
 {
   "type": "anvilcraft:anvil_processing",
-  "anvil_recipe_type": "generic",
+  "anvil_recipe_type": "timewarp",
   "icon": {
     "item": "anvilcraft:mob_amber_block"
   },

diff --git a/...c/src/generated/resources/data/anvilcraft/recipes/timewarp/mob_amber_block_resentful.json b/...c/src/generated/resources/data/anvilcraft/recipes/timewarp/mob_amber_block_resentful.json
@@ -1,6 +1,6 @@
 {
   "type": "anvilcraft:anvil_processing",
-  "anvil_recipe_type": "generic",
+  "anvil_recipe_type": "timewarp",
   "icon": {
     "item": "anvilcraft:mob_amber_block"
   },

diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/zombie.json b/fabric/src/generated/resources/data/anvilcraft/recipes/zombie.json
@@ -17,7 +17,7 @@
     }
   ],
   "transformOptions": [
-    "replaceAnvil",
-    "keepInventory"
+    "keepInventory",
+    "replaceAnvil"
   ]
 }
diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/flour.json b/forge/src/generated/resources/data/anvilcraft/recipes/flour.json
@@ -1,6 +1,6 @@
 {
   "type": "anvilcraft:anvil_processing",
-  "anvil_recipe_type": "generic",
+  "anvil_recipe_type": "item_smash",
   "icon": {
     "item": "anvilcraft:flour"
   },

diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/heating/brass_ingot.json b/forge/src/generated/resources/data/anvilcraft/recipes/heating/brass_ingot.json
@@ -1,6 +1,6 @@
 {
   "type": "anvilcraft:anvil_processing",
-  "anvil_recipe_type": "generic",
+  "anvil_recipe_type": "super_heating",
   "icon": {
     "item": "anvilcraft:brass_ingot"
   },

diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/heating/brass_ingot_forge.json b/forge/src/generated/resources/data/anvilcraft/recipes/heating/brass_ingot_forge.json
@@ -1,6 +1,6 @@
 {
   "type": "anvilcraft:anvil_processing",
-  "anvil_recipe_type": "generic",
+  "anvil_recipe_type": "super_heating",
   "icon": {
     "item": "anvilcraft:brass_ingot"
   },

diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/heating/bronze_ingot.json b/forge/src/generated/resources/data/anvilcraft/recipes/heating/bronze_ingot.json
@@ -1,6 +1,6 @@
 {
   "type": "anvilcraft:anvil_processing",
-  "anvil_recipe_type": "generic",
+  "anvil_recipe_type": "super_heating",
   "icon": {
     "item": "anvilcraft:bronze_ingot"
   },

diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/heating/bronze_ingot_forge.json b/forge/src/generated/resources/data/anvilcraft/recipes/heating/bronze_ingot_forge.json
@@ -1,6 +1,6 @@
 {
   "type": "anvilcraft:anvil_processing",
-  "anvil_recipe_type": "generic",
+  "anvil_recipe_type": "super_heating",
   "icon": {
     "item": "anvilcraft:bronze_ingot"
   },

diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/amber_block.json b/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/amber_block.json
@@ -1,6 +1,6 @@
 {
   "type": "anvilcraft:anvil_processing",
-  "anvil_recipe_type": "generic",
+  "anvil_recipe_type": "timewarp",
   "icon": {
     "item": "anvilcraft:amber_block"
   },

diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/ancient_debris_first.json b/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/ancient_debris_first.json
@@ -1,6 +1,6 @@
 {
   "type": "anvilcraft:anvil_processing",
-  "anvil_recipe_type": "generic",
+  "anvil_recipe_type": "timewarp",
   "icon": {
     "item": "minecraft:ancient_debris"
   },

diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/mob_amber_block.json b/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/mob_amber_block.json
@@ -1,6 +1,6 @@
 {
   "type": "anvilcraft:anvil_processing",
-  "anvil_recipe_type": "generic",
+  "anvil_recipe_type": "timewarp",
   "icon": {
     "item": "anvilcraft:mob_amber_block"
   },

diff --git a/...e/src/generated/resources/data/anvilcraft/recipes/timewarp/mob_amber_block_resentful.json b/...e/src/generated/resources/data/anvilcraft/recipes/timewarp/mob_amber_block_resentful.json
@@ -1,6 +1,6 @@
 {
   "type": "anvilcraft:anvil_processing",
-  "anvil_recipe_type": "generic",
+  "anvil_recipe_type": "timewarp",
   "icon": {
     "item": "anvilcraft:mob_amber_block"
   },

diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/zombie.json b/forge/src/generated/resources/data/anvilcraft/recipes/zombie.json
@@ -17,7 +17,7 @@
     }
   ],
   "transformOptions": [
-    "replaceAnvil",
-    "keepInventory"
+    "keepInventory",
+    "replaceAnvil"
   ]
 }