Add boss hearts tag and change recipes

maityyy · Apr 4, 2024 · 2be19de · 2be19de
1 parent bc83214
commit 2be19de
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 16 deletions.
diff --git a/src/data/java/moriyashiine/aylyth/datagen/AylythRecipeProvider.java b/src/data/java/moriyashiine/aylyth/datagen/AylythRecipeProvider.java
@@ -101,23 +101,23 @@ public void generate(Consumer<RecipeJsonProvider> exporter) {
                 .input('D', Items.SOUL_SOIL)
                 .input('S', ModItems.YMPE_SAPLING)
                 .input('E', ModItems.ESSTLINE)
-                .input('C', ModItems.CORIC_SEED)
+                .input('H', ModItemTags.BOSS_HEARTS)
                 .pattern("DED")
-                .pattern("ECE")
+                .pattern("EHE")
                 .pattern("SDS")
-                .criterion("has_coric_seed", conditionsFromItem(ModItems.CORIC_SEED))
+                .criterion("has_coric_seed", conditionsFromTag(ModItemTags.BOSS_HEARTS))
                 .offerTo(exporter);
 
         ShapedRecipeJsonBuilder.create(RecipeCategory.MISC, ModItems.VITAL_THURIBLE)
                 .input('S', Items.POLISHED_DEEPSLATE_SLAB)
-                .input('H', ModItems.AYLYTHIAN_HEART)
+                .input('H', ModItemTags.BOSS_HEARTS)
                 .input('P', Items.POLISHED_DEEPSLATE_WALL)
                 .input('E', ModItems.ESSTLINE)
                 .input('C', Items.SOUL_CAMPFIRE)
                 .pattern("SHS")
                 .pattern("PEP")
                 .pattern("PCP")
-                .criterion("has_heart", conditionsFromItem(ModItems.AYLYTHIAN_HEART))
+                .criterion("has_heart", conditionsFromTag(ModItemTags.BOSS_HEARTS))
                 .offerTo(exporter);
 
         ShapedRecipeJsonBuilder.create(RecipeCategory.MISC, ModItems.SOUL_HEARTH)

diff --git a/src/data/java/moriyashiine/aylyth/datagen/tags/AylythItemTagProvider.java b/src/data/java/moriyashiine/aylyth/datagen/tags/AylythItemTagProvider.java
@@ -43,6 +43,7 @@ protected void configure(RegistryWrapper.WrapperLookup registries) {
         getOrCreateTagBuilder(ItemTags.CHEST_BOATS).add(ModItems.YMPE_CHEST_BOAT, ModItems.POMEGRANATE_CHEST_BOAT, ModItems.WRITHEWOOD_CHEST_BOAT);
         getOrCreateTagBuilder(ModItemTags.DECREASES_BRANCHES).add(ModItems.YMPE_FRUIT);
         getOrCreateTagBuilder(ModItemTags.PLEDGE_ITEMS).add(ModItems.NYSIAN_GRAPES);
+        getOrCreateTagBuilder(ModItemTags.BOSS_HEARTS).add(ModItems.YHONDYTH_HEART);
         getOrCreateTagBuilder(ModItemTags.NEPHRITE_TOOL_MATERIALS).add(ModItems.NEPHRITE);
         getOrCreateTagBuilder(ItemTags.SWORDS).add(ModItems.YMPE_DAGGER, ModItems.NEPHRITE_SWORD, ModItems.VAMPIRIC_SWORD, ModItems.BLIGHTED_SWORD);
         getOrCreateTagBuilder(ItemTags.SHOVELS).add(ModItems.NEPHRITE_SHOVEL);

diff --git a/src/main/generated/data/aylyth/advancements/recipes/food/ympe_effigy.json b/src/main/generated/data/aylyth/advancements/recipes/food/ympe_effigy.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "aylyth:coric_seed"
-            ]
+            "tag": "aylyth:boss_hearts"
           }
         ]
       },

diff --git a/src/main/generated/data/aylyth/advancements/recipes/misc/vital_thurible.json b/src/main/generated/data/aylyth/advancements/recipes/misc/vital_thurible.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "aylyth:aylythian_heart"
-            ]
+            "tag": "aylyth:boss_hearts"
           }
         ]
       },

diff --git a/src/main/generated/data/aylyth/recipes/vital_thurible.json b/src/main/generated/data/aylyth/recipes/vital_thurible.json
@@ -9,7 +9,7 @@
       "item": "aylyth:esstline"
     },
     "H": {
-      "item": "aylyth:aylythian_heart"
+      "tag": "aylyth:boss_hearts"
     },
     "P": {
       "item": "minecraft:polished_deepslate_wall"

diff --git a/src/main/generated/data/aylyth/recipes/ympe_effigy.json b/src/main/generated/data/aylyth/recipes/ympe_effigy.json
@@ -2,22 +2,22 @@
   "type": "minecraft:crafting_shaped",
   "category": "misc",
   "key": {
-    "C": {
-      "item": "aylyth:coric_seed"
-    },
     "D": {
       "item": "minecraft:soul_soil"
     },
     "E": {
       "item": "aylyth:esstline"
     },
+    "H": {
+      "tag": "aylyth:boss_hearts"
+    },
     "S": {
       "item": "aylyth:ympe_sapling"
     }
   },
   "pattern": [
     "DED",
-    "ECE",
+    "EHE",
     "SDS"
   ],
   "result": {

diff --git a/src/main/generated/data/aylyth/tags/items/boss_hearts.json b/src/main/generated/data/aylyth/tags/items/boss_hearts.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "aylyth:yhondyth_heart"
+  ]
+}
diff --git a/src/main/java/moriyashiine/aylyth/common/registry/tag/ModItemTags.java b/src/main/java/moriyashiine/aylyth/common/registry/tag/ModItemTags.java
@@ -20,6 +20,7 @@ public class ModItemTags {
     public static final TagKey<Item> VAMPIRIC_WEAPON = create("vampiric_weapons");
     public static final TagKey<Item> BLIGHTED_WEAPON = create("blighted_weapons");
     public static final TagKey<Item> NEPHRITE_FLASKS = create("nephrite_flasks");
+    public static final TagKey<Item> BOSS_HEARTS = create("boss_hearts");
 
     private static TagKey<Item> create(String tag) {
         return TagKey.of(RegistryKeys.ITEM, AylythUtil.id(tag));