fix #5082

AlexModGuy · Jan 16, 2024 · 11bb34e · 11bb34e
1 parent 0d53616
commit 11bb34e
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 13 deletions.
diff --git a/src/generated/resources/data/iceandfire/advancements/recipes/combat/sea_serpent_arrow.json b/src/generated/resources/data/iceandfire/advancements/recipes/combat/sea_serpent_arrow.json
@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_item": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "iceandfire:sea_serpent_fang"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "iceandfire:sea_serpent_arrow"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "iceandfire:sea_serpent_arrow"
+    ]
+  },
+  "sends_telemetry_event": false
+}
diff --git a/...iceandfire/recipes/sea_serpent_arrow.json → ...iceandfire/recipes/sea_serpent_arrow.json b/...iceandfire/recipes/sea_serpent_arrow.json → ...iceandfire/recipes/sea_serpent_arrow.json
@@ -1,10 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "X",
-    "#",
-    "Y"
-  ],
+  "category": "equipment",
   "key": {
     "#": {
       "tag": "forge:rods/wooden"
@@ -13,11 +9,17 @@
       "item": "iceandfire:sea_serpent_fang"
     },
     "Y": {
-      "tag": "forge:scales/sea_serpent"
+      "tag": "iceandfire:scales/sea_serpent"
     }
   },
+  "pattern": [
+    "X",
+    "#",
+    "Y"
+  ],
   "result": {
-    "item": "iceandfire:sea_serpent_arrow",
-    "count": 4
-  }
+    "count": 4,
+    "item": "iceandfire:sea_serpent_arrow"
+  },
+  "show_notification": true
 }
diff --git a/src/main/java/com/github/alexthe666/iceandfire/datagen/IafRecipes.java b/src/main/java/com/github/alexthe666/iceandfire/datagen/IafRecipes.java
@@ -21,11 +21,7 @@
 import net.minecraftforge.registries.ForgeRegistries;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
-import java.nio.file.Path;
 import java.util.Arrays;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 
 /**
@@ -545,6 +541,16 @@ private void createShaped(@NotNull final Consumer<FinishedRecipe> consumer) {
                 .unlockedBy("has_item", has(IafItemRegistry.MYRMEX_JUNGLE_RESIN.get()))
                 .save(consumer);
 
+        ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, IafItemRegistry.SEA_SERPENT_ARROW.get(), 4)
+                .pattern("X")
+                .pattern("#")
+                .pattern("Y")
+                .define('#', Tags.Items.RODS_WOODEN)
+                .define('X', IafItemRegistry.SERPENT_FANG.get())
+                .define('Y', IafItemTags.SCALES_SEA_SERPENT)
+                .unlockedBy("has_item", has(IafItemRegistry.SERPENT_FANG.get()))
+                .save(consumer);
+
         armorSet(consumer, IafItemRegistry.MYRMEX_DESERT_CHITIN.get(),
                 IafItemRegistry.MYRMEX_DESERT_HELMET.get(),
                 IafItemRegistry.MYRMEX_DESERT_CHESTPLATE.get(),