From bc9a35df1ca4120aecd50a8c320ae1027024e713 Mon Sep 17 00:00:00 2001
From: gamma-delta <29877714+gamma-delta@users.noreply.github.com>
Date: Tue, 29 Mar 2022 12:51:44 -0500
Subject: [PATCH] Revert "ah yes this lib mod will make everything better
 :clueless: (Close #41)"

This reverts commit 6cf4523d1131bb0e9ea1227d1739f6f601c7c659.
---
 src/generated/resources/.cache/cache                     | 4 ++--
 .../resources/data/hexcasting/recipes/cypher.json        | 7 +++++--
 .../resources/data/hexcasting/recipes/trinket.json       | 7 +++++--
 .../java/at/petrak/hexcasting/datagen/HexRecipes.java    | 9 +++------
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
index 0839f2ef..42267ade 100644
--- a/src/generated/resources/.cache/cache
+++ b/src/generated/resources/.cache/cache
@@ -297,7 +297,7 @@ e5c835d3866e8f5ecfb03c9e7c2c134a50951d67 data/hexcasting/recipes/amethyst_tiles.
 5861845c3cd84021c7c19ac4f5b3bcc8e1bd3916 data/hexcasting/recipes/brainsweep/impetus_look.json
 ab5d271371323d93ff6eed18179ee4f7fd8c939c data/hexcasting/recipes/brainsweep/impetus_rightclick.json
 34d21369f8879dd084c3215e709ae987a994372f data/hexcasting/recipes/brainsweep/impetus_storedplayer.json
-bc140b6c5d999b4bc5d12c302297f56bde3b161c data/hexcasting/recipes/cypher.json
+ea32d82fc3f2cb974038c311a3538aae481ea4c0 data/hexcasting/recipes/cypher.json
 33fed8fb8e34df026e1eea0df8161c7f842a8648 data/hexcasting/recipes/dye_colorizer_black.json
 c36caf44a941a4abc44a15141eba8fe634c76fb8 data/hexcasting/recipes/dye_colorizer_blue.json
 91348d69c8a49eae2bbaf9fb00b9604c43716527 data/hexcasting/recipes/dye_colorizer_brown.json
@@ -342,7 +342,7 @@ f3a33396e071f3afd61eadab2aabdb9acf2ae775 data/hexcasting/recipes/slate.json
 4f06f5f4ae181c8bb6b993d7b6047cd9ca7afbce data/hexcasting/recipes/spellbook.json
 ef936e73eea3be9d53c4ac5c78d1477675550375 data/hexcasting/recipes/stonecutting/amethyst_tiles.json
 d14cf2f8f0895a5b6dc09b7582c0abf1c2514adf data/hexcasting/recipes/sub_sandwich.json
-67b16cdb26f40234a7d4e49357724f24c197580a data/hexcasting/recipes/trinket.json
+7716dd89b2c4141dd7ecdb9f6adefe694ff22d70 data/hexcasting/recipes/trinket.json
 14d6be5d47b54676a349564ea32c045c76c39b45 data/hexcasting/recipes/uuid_colorizer.json
 0521d57838cb3e9795fc02ce47aa58db3b0188f9 data/hexcasting/recipes/wand.json
 a7965a0a1b78a7c6f7ebb06e219e8eaa2adb5cf5 data/minecraft/loot_tables/blocks/amethyst_cluster.json
diff --git a/src/generated/resources/data/hexcasting/recipes/cypher.json b/src/generated/resources/data/hexcasting/recipes/cypher.json
index f3de9a1b..4816ebdb 100644
--- a/src/generated/resources/data/hexcasting/recipes/cypher.json
+++ b/src/generated/resources/data/hexcasting/recipes/cypher.json
@@ -1,14 +1,17 @@
 {
   "type": "minecraft:crafting_shaped",
   "pattern": [
-    " C ",
+    "DCD",
     "CIC",
-    " C "
+    "DCD"
   ],
   "key": {
     "C": {
       "tag": "forge:ingots/copper"
     },
+    "D": {
+      "tag": "forge:ingots/copper"
+    },
     "I": {
       "item": "hexcasting:amethyst_dust"
     }
diff --git a/src/generated/resources/data/hexcasting/recipes/trinket.json b/src/generated/resources/data/hexcasting/recipes/trinket.json
index d9d666ef..caf0788a 100644
--- a/src/generated/resources/data/hexcasting/recipes/trinket.json
+++ b/src/generated/resources/data/hexcasting/recipes/trinket.json
@@ -1,14 +1,17 @@
 {
   "type": "minecraft:crafting_shaped",
   "pattern": [
-    " C ",
+    "DCD",
     "CIC",
-    " C "
+    "DCD"
   ],
   "key": {
     "C": {
       "tag": "forge:ingots/iron"
     },
+    "D": {
+      "tag": "forge:ingots/iron"
+    },
     "I": {
       "item": "minecraft:amethyst_shard"
     }
diff --git a/src/main/java/at/petrak/hexcasting/datagen/HexRecipes.java b/src/main/java/at/petrak/hexcasting/datagen/HexRecipes.java
index 5d362080..f6adfbea 100644
--- a/src/main/java/at/petrak/hexcasting/datagen/HexRecipes.java
+++ b/src/main/java/at/petrak/hexcasting/datagen/HexRecipes.java
@@ -65,14 +65,11 @@ public class HexRecipes extends PaucalRecipeProvider {
             .unlockedBy("has_focus", has(HexItems.FOCUS.get()))
             .unlockedBy("has_chorus", has(Items.CHORUS_FRUIT)).save(recipes);
 
-        ringCornerless(HexItems.CYPHER.get(), 1,
-            Ingredient.of(Tags.Items.INGOTS_COPPER),
+        ring(HexItems.CYPHER.get(), 1, Ingredient.of(Tags.Items.INGOTS_COPPER),
             Ingredient.of(HexItems.AMETHYST_DUST.get()))
             .unlockedBy("has_item", has(HexItems.WAND.get())).save(recipes);
 
-        ringCornerless(HexItems.TRINKET.get(), 1,
-            Ingredient.of(Tags.Items.INGOTS_IRON),
-            Ingredient.of(Items.AMETHYST_SHARD))
+        ring(HexItems.TRINKET.get(), 1, Ingredient.of(Tags.Items.INGOTS_IRON), Ingredient.of(Items.AMETHYST_SHARD))
             .unlockedBy("has_item", has(HexItems.WAND.get())).save(recipes);
 
         ShapedRecipeBuilder.shaped(HexItems.ARTIFACT.get())
@@ -259,7 +256,7 @@ public class HexRecipes extends PaucalRecipeProvider {
             HexBlocks.DIRECTRIX_REDSTONE.get().defaultBlockState())
             .unlockedBy("enlightenment", enlightenment)
             .save(recipes, modLoc("brainsweep/directrix_redstone"));
-
+        
         new BrainsweepRecipeBuilder(StateIngredientHelper.of(Blocks.AMETHYST_BLOCK),
             new VillagerIngredient(null, null, 3),
             Blocks.BUDDING_AMETHYST.defaultBlockState())