more staves! more shards!

FallingColors · Feb 18, 2023 · f42a088 · f42a088
1 parent 70a7100
commit f42a088
Show file tree

Hide file tree

Showing 38 changed files with 403 additions and 64 deletions.
diff --git a/Common/src/main/java/at/petrak/hexcasting/api/mod/HexTags.java b/Common/src/main/java/at/petrak/hexcasting/api/mod/HexTags.java
@@ -20,6 +20,10 @@ public static final class Items {
         public static final TagKey<Item> GRANTS_ROOT_ADVANCEMENT = create("grants_root_advancement");
         public static final TagKey<Item> SEAL_MATERIALS = create("seal_materials");
 
+        public static final TagKey<Item> IMPETI = create("impeti");
+        public static final TagKey<Item> DIRECTRICES = create("directrices");
+        public static final TagKey<Item> MINDFLAYED_CIRCLE_COMPONENTS = create("brainswept_circle_components");
+
         public static TagKey<Item> create(String name) {
             return create(modLoc(name));
         }
@@ -33,6 +37,11 @@ public static final class Blocks {
         public static final TagKey<Block> EDIFIED_LOGS = create("edified_logs");
         public static final TagKey<Block> EDIFIED_PLANKS = create("edified_planks");
 
+
+        public static final TagKey<Block> IMPETI = create("impeti");
+        public static final TagKey<Block> DIRECTRICES = create("directrices");
+        public static final TagKey<Block> MINDFLAYED_CIRCLE_COMPONENTS = create("brainswept_circle_components");
+
         public static TagKey<Block> create(String name) {
             return TagKey.create(Registry.BLOCK_REGISTRY, modLoc(name));
         }

diff --git a/Common/src/main/java/at/petrak/hexcasting/client/RegisterClientStuff.java b/Common/src/main/java/at/petrak/hexcasting/client/RegisterClientStuff.java
@@ -104,6 +104,7 @@ public static void init() {
 
         registerGaslight4(HexItems.STAFF_QUENCHED);
         registerGaslight4(HexBlocks.QUENCHED_ALLAY.asItem());
+        registerGaslight4(HexItems.QUENCHED_SHARD);
 
         x.setRenderLayer(HexBlocks.CONJURED_LIGHT, RenderType.cutout());
         x.setRenderLayer(HexBlocks.CONJURED_BLOCK, RenderType.cutout());

diff --git a/Common/src/main/java/at/petrak/hexcasting/datagen/HexLootTables.java b/Common/src/main/java/at/petrak/hexcasting/datagen/HexLootTables.java
@@ -22,7 +22,6 @@
 import net.minecraft.world.level.storage.loot.LootPool;
 import net.minecraft.world.level.storage.loot.LootTable;
 import net.minecraft.world.level.storage.loot.entries.AlternativesEntry;
-import net.minecraft.world.level.storage.loot.entries.EntryGroup;
 import net.minecraft.world.level.storage.loot.entries.LootItem;
 import net.minecraft.world.level.storage.loot.functions.ApplyBonusCount;
 import net.minecraft.world.level.storage.loot.functions.ApplyExplosionDecay;
@@ -114,15 +113,15 @@ protected void makeLootTables(Map<Block, LootTable.Builder> blockTables,
             .withPool(isThatAnMFingBrandonSandersonReference)
             .withPool(isThatAnMFingBadBrandonSandersonReference));
 
+        // it looks like loot groups are bugged?
+        // so instead we add some and then *increment* the amount, gated behind the cond
         var quenchedPool = LootPool.lootPool().add(AlternativesEntry.alternatives(
             LootItem.lootTableItem(HexBlocks.QUENCHED_ALLAY).when(silkTouchCond),
-            EntryGroup.list(
-                LootItem.lootTableItem(HexItems.QUENCHED_SHARD)
-                    .apply(SetItemCountFunction.setCount(UniformGenerator.between(2f, 4f))),
-                LootItem.lootTableItem(HexItems.QUENCHED_SHARD)
+            LootItem.lootTableItem(HexItems.QUENCHED_SHARD)
+                .apply(SetItemCountFunction.setCount(UniformGenerator.between(2f, 4f)))
+                .apply(SetItemCountFunction.setCount(ConstantValue.exactly(1), true)
                     .when(BonusLevelTableCondition.bonusLevelFlatChance(Enchantments.BLOCK_FORTUNE,
-                        0.25f, 0.35f, 0.5f, 0.75f, 1.0f))
-            )
+                        0.25f, 0.5f, 0.75f, 1.0f)))
         ));
         blockTables.put(HexBlocks.QUENCHED_ALLAY, LootTable.lootTable().withPool(quenchedPool));
     }

diff --git a/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java b/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java
@@ -67,6 +67,8 @@ protected void makeRecipes(Consumer<FinishedRecipe> recipes) {
         staffRecipe(recipes, HexItems.STAFF_WARPED, Items.WARPED_PLANKS);
         staffRecipe(recipes, HexItems.STAFF_MANGROVE, Items.MANGROVE_PLANKS);
         staffRecipe(recipes, HexItems.STAFF_EDIFIED, HexBlocks.EDIFIED_PLANKS.asItem());
+        staffRecipe(recipes, HexItems.STAFF_QUENCHED, HexItems.QUENCHED_SHARD);
+        staffRecipe(recipes, HexItems.STAFF_MINDSPLICE, Ingredient.of(HexTags.Items.MINDFLAYED_CIRCLE_COMPONENTS));
 
         ShapelessRecipeBuilder.shapeless(HexItems.THOUGHT_KNOT)
             .requires(HexItems.AMETHYST_DUST)
@@ -501,6 +503,10 @@ protected void makeRecipes(Consumer<FinishedRecipe> recipes) {
     }
 
     private void staffRecipe(Consumer<FinishedRecipe> recipes, ItemStaff staff, Item plank) {
+        staffRecipe(recipes, staff, Ingredient.of(plank));
+    }
+
+    private void staffRecipe(Consumer<FinishedRecipe> recipes, ItemStaff staff, Ingredient plank) {
         ShapedRecipeBuilder.shaped(staff)
             .define('W', plank)
             .define('S', Items.STICK)

diff --git a/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexBlockTagProvider.java b/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexBlockTagProvider.java
@@ -17,6 +17,14 @@ public HexBlockTagProvider(DataGenerator pGenerator, IXplatTags xtags) {
 
     @Override
     public void addTags() {
+        tag(HexTags.Blocks.IMPETI)
+            .add(HexBlocks.IMPETUS_LOOK, HexBlocks.IMPETUS_RIGHTCLICK, HexBlocks.IMPETUS_STOREDPLAYER);
+        tag(HexTags.Blocks.DIRECTRICES)
+            .add(HexBlocks.DIRECTRIX_REDSTONE);
+        tag(HexTags.Blocks.MINDFLAYED_CIRCLE_COMPONENTS)
+            .addTag(HexTags.Blocks.IMPETI)
+            .addTag(HexTags.Blocks.DIRECTRICES);
+
         tag(BlockTags.MINEABLE_WITH_PICKAXE)
             .add(HexBlocks.SLATE_BLOCK, HexBlocks.SLATE,
                 HexBlocks.EMPTY_DIRECTRIX, HexBlocks.DIRECTRIX_REDSTONE,

diff --git a/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexItemTagProvider.java b/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexItemTagProvider.java
@@ -37,6 +37,9 @@ protected void addTags() {
 
         this.copy(HexTags.Blocks.EDIFIED_LOGS, HexTags.Items.EDIFIED_LOGS);
         this.copy(HexTags.Blocks.EDIFIED_PLANKS, HexTags.Items.EDIFIED_PLANKS);
+        this.copy(HexTags.Blocks.IMPETI, HexTags.Items.IMPETI);
+        this.copy(HexTags.Blocks.DIRECTRICES, HexTags.Items.DIRECTRICES);
+        this.copy(HexTags.Blocks.MINDFLAYED_CIRCLE_COMPONENTS, HexTags.Items.MINDFLAYED_CIRCLE_COMPONENTS);
         this.copy(BlockTags.LOGS_THAT_BURN, ItemTags.LOGS_THAT_BURN);
         this.copy(BlockTags.LOGS, ItemTags.LOGS);
         this.copy(BlockTags.PLANKS, ItemTags.PLANKS);

diff --git a/Common/src/main/resources/assets/hexcasting/lang/en_us.json b/Common/src/main/resources/assets/hexcasting/lang/en_us.json
@@ -22,6 +22,7 @@
   "item.hexcasting.battery": "Phial of Media",
   "item.hexcasting.amethyst_dust": "Amethyst Dust",
   "item.hexcasting.charged_amethyst": "Charged Amethyst",
+  "item.hexcasting.quenched_allay_shard": "Shard of Quenched Allay",
   "item.hexcasting.lens": "Scrying Lens",
   "item.hexcasting.scroll_small": "Small Scroll",
   "item.hexcasting.scroll_small.of": "How did you get this item of %s",

diff --git a/Fabric/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b b/Fabric/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b
@@ -1,4 +1,5 @@
-// 1.19.2	2023-02-17T23:47:13.460414023	Tags for minecraft:item
+// 1.19.2	2023-02-18T11:41:21.846317687	Tags for minecraft:item
+b61c62d136132d63889fccca2055c5f7e9b25112 data/hexcasting/tags/items/impeti.json
 5928bad07d3872bb60f29ef4f3c885c8e1967c20 data/hexcasting/tags/items/phial_base.json
 fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data/minecraft/tags/items/wooden_doors.json
 e5df19a1dc6eadf14cd9b0f0fe45a74330b745e9 data/hexcasting/tags/items/edified_planks.json
@@ -13,10 +14,12 @@ fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data/minecraft/tags/items/doors.json
 684c3206f38cc9cc494d5875c5e56aad004486af data/hexcasting/tags/items/edified_logs.json
 e186f43ed06770e698c886691f91b2c6acdb5a2a data/hexcasting/tags/items/seal_materials.json
 5f3b600b4fd98744bd08c993ce7bcb9c2f195cd2 data/minecraft/tags/items/leaves.json
+9818dcd28edc496bc434b4f7b6b9cc27658d545e data/hexcasting/tags/items/directrices.json
 684c3206f38cc9cc494d5875c5e56aad004486af data/minecraft/tags/items/logs.json
 5bbfd513fd2eb2090b0c2d1ec33504deb79d53b9 data/minecraft/tags/items/slabs.json
 5bbfd513fd2eb2090b0c2d1ec33504deb79d53b9 data/minecraft/tags/items/wooden_slabs.json
 4461ef6db41a675fd077dd833cfd0ea537e755be data/c/tags/items/amethyst_dusts.json
 5216ba5c57db29b8dee9aebc63a2e3b17c97dc17 data/minecraft/tags/items/trapdoors.json
 e5df19a1dc6eadf14cd9b0f0fe45a74330b745e9 data/minecraft/tags/items/planks.json
+c72a147bc65d26424df199388969ebd11119aed3 data/hexcasting/tags/items/brainswept_circle_components.json
 5216ba5c57db29b8dee9aebc63a2e3b17c97dc17 data/minecraft/tags/items/wooden_trapdoors.json
diff --git a/Fabric/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 b/Fabric/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2
@@ -1,4 +1,4 @@
-// 1.19.2	2023-02-17T23:47:13.480823941	LootTables
+// 1.19.2	2023-02-18T11:41:21.846932255	LootTables
 dec1d3592e82f99d9e059d9c771530f103b2bda5 data/hexcasting/loot_tables/blocks/empty_directrix.json
 2c42fc5d8c74c98ad15b8bd50f56541fccbef750 data/hexcasting/loot_tables/blocks/edified_tile.json
 cfb39e2151725fe4f9a7269d9b5de8031ea54a44 data/hexcasting/loot_tables/blocks/directrix_redstone.json
@@ -34,4 +34,4 @@ b7f7af68760b51d0c438f5c6039f1cd7157fa452 data/hexcasting/loot_tables/blocks/anci
 9ee4259b51cccd4582fb2e52ab9f64e92af857bb data/hexcasting/loot_tables/blocks/edified_log.json
 c089d3d230ae5354f2a9953f65bba77b6e26d976 data/hexcasting/loot_tables/blocks/edified_trapdoor.json
 745b510161cfff804b115f566ad6b50e0cb492d1 data/hexcasting/loot_tables/blocks/slate.json
-468f68d1e889afe4f7ce28d1a597a57a17f5a6c3 data/hexcasting/loot_tables/blocks/quenched_allay.json
+33ac65cb8351f73958f6d1cb9a5dacfe53d4a2a7 data/hexcasting/loot_tables/blocks/quenched_allay.json
diff --git a/Fabric/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 b/Fabric/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4
@@ -1,24 +1,27 @@
-// 1.19.2	2023-02-17T23:47:13.479469333	Tags for minecraft:block
-20183cd61968ff6548df2dde1100b6378d68d64b data/minecraft/tags/blocks/wooden_buttons.json
+// 1.19.2	2023-02-18T11:41:21.839953411	Tags for minecraft:block
+c72a147bc65d26424df199388969ebd11119aed3 data/hexcasting/tags/blocks/brainswept_circle_components.json
 357eddf3cee6f16725bed0701d57b2ca3097d74d data/minecraft/tags/blocks/mineable/shovel.json
-5216ba5c57db29b8dee9aebc63a2e3b17c97dc17 data/minecraft/tags/blocks/wooden_trapdoors.json
 20183cd61968ff6548df2dde1100b6378d68d64b data/minecraft/tags/blocks/buttons.json
 2044a90007e0e25b8d973c936476ac9ae8bc4c5b data/minecraft/tags/blocks/mineable/pickaxe.json
 d5a3405be832907cb12fd9d1f423e297fe8e3e66 data/minecraft/tags/blocks/mineable/axe.json
 5f3b600b4fd98744bd08c993ce7bcb9c2f195cd2 data/minecraft/tags/blocks/mineable/hoe.json
+684c3206f38cc9cc494d5875c5e56aad004486af data/minecraft/tags/blocks/logs_that_burn.json
+5f3b600b4fd98744bd08c993ce7bcb9c2f195cd2 data/minecraft/tags/blocks/leaves.json
+281cb08b9b68ef049820c4f3f36b40820044681e data/minecraft/tags/blocks/wooden_stairs.json
+36b54a86d2ed41c8a503f7a61817a7a9d7a94536 data/minecraft/tags/blocks/crystal_sound_blocks.json
+5216ba5c57db29b8dee9aebc63a2e3b17c97dc17 data/minecraft/tags/blocks/trapdoors.json
+37cff4ce449b8069b59b2327d78e073fc026d348 data/minecraft/tags/blocks/wooden_pressure_plates.json
+20183cd61968ff6548df2dde1100b6378d68d64b data/minecraft/tags/blocks/wooden_buttons.json
+5216ba5c57db29b8dee9aebc63a2e3b17c97dc17 data/minecraft/tags/blocks/wooden_trapdoors.json
 fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data/minecraft/tags/blocks/wooden_doors.json
 684c3206f38cc9cc494d5875c5e56aad004486af data/minecraft/tags/blocks/logs.json
 684c3206f38cc9cc494d5875c5e56aad004486af data/hexcasting/tags/blocks/edified_logs.json
 5bbfd513fd2eb2090b0c2d1ec33504deb79d53b9 data/minecraft/tags/blocks/slabs.json
-684c3206f38cc9cc494d5875c5e56aad004486af data/minecraft/tags/blocks/logs_that_burn.json
 e5df19a1dc6eadf14cd9b0f0fe45a74330b745e9 data/minecraft/tags/blocks/planks.json
-5f3b600b4fd98744bd08c993ce7bcb9c2f195cd2 data/minecraft/tags/blocks/leaves.json
+b61c62d136132d63889fccca2055c5f7e9b25112 data/hexcasting/tags/blocks/impeti.json
 281cb08b9b68ef049820c4f3f36b40820044681e data/minecraft/tags/blocks/stairs.json
-281cb08b9b68ef049820c4f3f36b40820044681e data/minecraft/tags/blocks/wooden_stairs.json
+9818dcd28edc496bc434b4f7b6b9cc27658d545e data/hexcasting/tags/blocks/directrices.json
 37cff4ce449b8069b59b2327d78e073fc026d348 data/minecraft/tags/blocks/pressure_plates.json
-36b54a86d2ed41c8a503f7a61817a7a9d7a94536 data/minecraft/tags/blocks/crystal_sound_blocks.json
 fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data/minecraft/tags/blocks/doors.json
-5216ba5c57db29b8dee9aebc63a2e3b17c97dc17 data/minecraft/tags/blocks/trapdoors.json
 5bbfd513fd2eb2090b0c2d1ec33504deb79d53b9 data/minecraft/tags/blocks/wooden_slabs.json
-37cff4ce449b8069b59b2327d78e073fc026d348 data/minecraft/tags/blocks/wooden_pressure_plates.json
 e5df19a1dc6eadf14cd9b0f0fe45a74330b745e9 data/hexcasting/tags/blocks/edified_planks.json
diff --git a/Fabric/src/generated/resources/.cache/844611d4af49e23072b8a888c8e73c6c5d8c0768 b/Fabric/src/generated/resources/.cache/844611d4af49e23072b8a888c8e73c6c5d8c0768
@@ -1,4 +1,4 @@
-// 1.19.2	2023-02-17T23:47:13.480402857	Tags for hexcasting:action
+// 1.19.2	2023-02-18T11:41:21.842737196	Tags for hexcasting:action
 e5afc567ea17f035e4eb1d1d48825100b7f6ad68 data/hexcasting/tags/action/per_world_pattern.json
 e5afc567ea17f035e4eb1d1d48825100b7f6ad68 data/hexcasting/tags/action/requires_enlightenment.json
 e5afc567ea17f035e4eb1d1d48825100b7f6ad68 data/hexcasting/tags/action/can_start_enlighten.json
diff --git a/Fabric/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/Fabric/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -1,7 +1,8 @@
-// 1.19.2	2023-02-17T23:47:13.464974503	Recipes
+// 1.19.2	2023-02-18T11:41:21.843161249	Recipes
 9f75d3e93ecbbbf3ed9a92b2943397e09dcae1a9 data/hexcasting/recipes/dye_colorizer_light_blue.json
 04569ccadfd99f203b0485d0c3e877209290f2b3 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_pink.json
 2a9d4a0f3618abf9e9b8699b318a984d2c836913 data/hexcasting/advancements/recipes/brainsweep/brainsweep/directrix_redstone.json
+e8933b048f77673c0d278b238be2a41e76c5fa88 data/hexcasting/recipes/quenched_staff.json
 1b510d32bad1a51ad6795fb8e7702d34c8c8cfbe data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_green.json
 d73e5d8fec4d3f7d15888bd292f4ad9c1b37cac5 data/hexcasting/advancements/recipes/hexcasting.creative_tab/ageing_scroll_paper_lantern.json
 b54339a9e990419e4820491001c4cbdb7aa9fddb data/hexcasting/recipes/artifact.json
@@ -31,6 +32,7 @@ ebfa29e0a62a629afbe18681e09cc7be95a3529e data/hexcasting/advancements/recipes/he
 2aa2e5c268ae440238eaf4cea20011b0c8f81a49 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_demiboy.json
 326925a948aeb17aabafbc25ed2562a257796d29 data/hexcasting/recipes/dye_colorizer_yellow.json
 9f55e6ff1f2633e4ad390868e7952b700e5309a4 data/hexcasting/advancements/recipes/brainsweep/brainsweep/impetus_rightclick.json
+8293ffbca8a83c19bdb4684a6f8676791b5f0884 data/hexcasting/advancements/recipes/hexcasting.creative_tab/quenched_staff.json
 4440b41499c9c32e297dc184c39da010ff82ac5e data/hexcasting/advancements/recipes/hexcasting.creative_tab/uuid_colorizer.json
 5a90084c03d6e8424872870c8b65f4771b447f03 data/hexcasting/recipes/brainsweep/budding_amethyst.json
 638c534059597cebb9dc1e927c76a2809ddbfd42 data/hexcasting/recipes/akashic_connector.json
@@ -111,6 +113,7 @@ ef5a19ab2710fd0ce836d767588fe6a54a528a48 data/hexcasting/recipes/dye_colorizer_w
 229931adf8d62f659de5950d711afd24fb5aa535 data/hexcasting/advancements/recipes/brainsweep/brainsweep/akashic_record.json
 1754e1304908edf58a70fe8548f9d0ede22a1dd3 data/hexcasting/recipes/pride_colorizer_pansexual.json
 d684142c75bee35e6035d1829e271704d4ccdff3 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_lesbian.json
+7fc1a033a4c628c72539e8b4941b488234f57045 data/hexcasting/recipes/mindsplice_staff.json
 4ffed306e5f640054a6f269ae0e548388f087996 data/hexcasting/recipes/warped_staff.json
 f45428f892d2064fafa29ea644eea21354e2e322 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_staff.json
 8715e71c2fb59ee458ce217040c9a8dd0db04789 data/hexcasting/advancements/recipes/hexcasting.creative_tab/lens.json
@@ -177,6 +180,7 @@ d323e21de69d0606d1fac03fa8820e5857e4e1f1 data/hexcasting/recipes/dynamicseal_spe
 5902d75cd2474604f2bb1067187ba574eb1e15fc data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_wood.json
 07902912a9ca6f8da48ed579ec318bb760d4f8df data/hexcasting/recipes/pride_colorizer_nonbinary.json
 7a51e934846a0d7fe00a808cfa22fd85da67fe9d data/hexcasting/recipes/brainsweep/impetus_look.json
+01fe458d83b9f196b59407d2099b70f93656fc71 data/hexcasting/advancements/recipes/hexcasting.creative_tab/mindsplice_staff.json
 1407fa19f33b98ad0f125a0cba0cf8388b1441e5 data/hexcasting/advancements/recipes/hexcasting.creative_tab/decompose_quenched_shard/charged.json
 a184ee70962538e4f8641c707d6dca8796ca36e7 data/hexcasting/recipes/edified_slab.json
 22ff2d626da7f5fdc1411b4df75a6fc6a0e52df7 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_slab.json

diff --git a/...ources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/mindsplice_staff.json b/...ources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/mindsplice_staff.json
@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_item": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "hexcasting:charged_amethyst"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "hexcasting:mindsplice_staff"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "hexcasting:mindsplice_staff"
+    ]
+  }
+}
diff --git a/...esources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/quenched_staff.json b/...esources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/quenched_staff.json
@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_item": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "hexcasting:charged_amethyst"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "hexcasting:quenched_staff"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "hexcasting:quenched_staff"
+    ]
+  }
+}
diff --git a/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/quenched_allay.json b/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/quenched_allay.json
@@ -24,30 +24,23 @@
               "name": "hexcasting:quenched_allay"
             },
             {
-              "type": "minecraft:group",
-              "children": [
+              "type": "minecraft:item",
+              "functions": [
                 {
-                  "type": "minecraft:item",
-                  "functions": [
-                    {
-                      "add": false,
-                      "count": {
-                        "type": "minecraft:uniform",
-                        "max": 4.0,
-                        "min": 2.0
-                      },
-                      "function": "minecraft:set_count"
-                    }
-                  ],
-                  "name": "hexcasting:quenched_allay_shard"
+                  "add": false,
+                  "count": {
+                    "type": "minecraft:uniform",
+                    "max": 4.0,
+                    "min": 2.0
+                  },
+                  "function": "minecraft:set_count"
                 },
                 {
-                  "type": "minecraft:item",
+                  "add": true,
                   "conditions": [
                     {
                       "chances": [
                         0.25,
-                        0.35,
                         0.5,
                         0.75,
                         1.0
@@ -56,9 +49,11 @@
                       "enchantment": "minecraft:fortune"
                     }
                   ],
-                  "name": "hexcasting:quenched_allay_shard"
+                  "count": 1.0,
+                  "function": "minecraft:set_count"
                 }
-              ]
+              ],
+              "name": "hexcasting:quenched_allay_shard"
             }
           ]
         }

diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/mindsplice_staff.json b/Fabric/src/generated/resources/data/hexcasting/recipes/mindsplice_staff.json
@@ -0,0 +1,22 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "key": {
+    "A": {
+      "item": "hexcasting:charged_amethyst"
+    },
+    "S": {
+      "item": "minecraft:stick"
+    },
+    "W": {
+      "tag": "hexcasting:brainswept_circle_components"
+    }
+  },
+  "pattern": [
+    " SA",
+    " WS",
+    "S  "
+  ],
+  "result": {
+    "item": "hexcasting:mindsplice_staff"
+  }
+}
diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/quenched_staff.json b/Fabric/src/generated/resources/data/hexcasting/recipes/quenched_staff.json
@@ -0,0 +1,22 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "key": {
+    "A": {
+      "item": "hexcasting:charged_amethyst"
+    },
+    "S": {
+      "item": "minecraft:stick"
+    },
+    "W": {
+      "item": "hexcasting:quenched_allay_shard"
+    }
+  },
+  "pattern": [
+    " SA",
+    " WS",
+    "S  "
+  ],
+  "result": {
+    "item": "hexcasting:quenched_staff"
+  }
+}