Fix datagen I believe

src/generated/resources/assets/malum/lang/en_us.json

@@ -1156,7 +1156,9 @@
   "malum.gui.book.entry.page.text.void.material_study_void_salts.1": "When passed through the Well, Hex Ash is reduced to a substance I call Void Salt. This dark powder appears to be chemically similar to Hex Ash, but without the carbonization that gives the Ash its name.",
   "malum.gui.book.entry.page.text.void.material_study_void_salts.2": "It appears to be comprised of an unknown and unstable metal, bonded to something caustic I cannot identify. It is baffling beyond the physical, though. Carbon is the basis of life, and yet removing carbon makes this substance... almost seem to move? I haven't been able to verify that experimentally, but I could swear that the material is alive and shifting.",
   "malum.gui.book.entry.page.text.void.material_study_void_salts.reexamination.1": "The fact that $iabsence/$ is creating $ipresence/$ implies Umbral. Perhaps it $iis/$ alive... but with life defined by deeper nothingness instead of the presence of matter. Might this indicate there is more complex life adapted to the Void?",
-  "malum.gui.book.entry.page.text.void.necklace_of_the_hidden_blade.1": "The Narrow Edge concentrates my scythe's edge, but the Hidden Blade goes further, inverting the edge and making it hunger. I lose the sweeping attack, yes, but as I am harmed, the blade drinks of my pain, intensifying my next strike.",
+  "malum.gui.book.entry.page.text.void.necklace_of_the_hidden_blade.1": "The Narrow Edge concentrates my scythe's edge, but the Hidden Blade goes further, inverting the edge and making it hunger. I lose the sweeping attack, yes, but as I am harmed, the blade drinks of my pain- feeding upon it to enable a seemingly impossible flurry of cuts and slashes.",
+  "malum.gui.book.entry.page.text.void.necklace_of_the_hidden_blade.2": "Upon activation, the necklace remains inert for a total of ten seconds, requiring rest and concentration in order to recover it's effect. Attacking at any point in this state will prolong this absence of function.",
+  "malum.gui.book.entry.page.text.void.necklace_of_the_hidden_blade.3": "The counterattack's nature is a strange one, one I have not fully identified. It is as though the blade asserts its existence in multiple places at once, demanding reality make it so.",
   "malum.gui.book.entry.page.text.void.necklace_of_the_watcher.1": "Souls emit energy when damaged, not merely when shattered. This necklace allows me to harness that energy, causing effects that normally only occur when I collect a spirit to also happen when I strike an enemy at full health.",
   "malum.gui.book.entry.page.text.void.ring_of_growing_flesh.1": "I have overclocked the Ring of Curative Talent, creating a ring that does not simply heal, but overheal, granting additional health instead of regeneration whenever I collect a spirit crystal.",
   "malum.gui.book.entry.page.text.void.ring_of_gruesome_concentration.1": "Why would Gluttony be restricted to the collection of spirits? By eating foul food, I can make myself hungrier, and so cultivate and concentrate what remains, increasing my magical might even as I starve.",
@@ -1398,6 +1400,7 @@
   "malum.gui.curio.effect.hunger_drain": "Actively Drains Hunger",
   "malum.gui.curio.effect.low_health_speed": "Speed at Low Health",
   "malum.gui.curio.effect.no_sweep": "Disables Scythe Sweeping",
+  "malum.gui.curio.effect.pacifist_recharge": "Cooldown Extends if the Scythe is Used",
   "malum.gui.curio.effect.passive_healing": "Passive Healing",
   "malum.gui.curio.effect.rotten_gluttony": "Eating Rotten Food Generates Gluttony",
   "malum.gui.curio.effect.scythe_chain": "Scythe Kill Chaining",
@@ -1565,6 +1568,9 @@
   "malum.subtitle.hallowed_gold_hit": "Block breaking",
   "malum.subtitle.hallowed_gold_place": "Block placed",
   "malum.subtitle.hallowed_gold_step": "Footsteps",
+  "malum.subtitle.hidden_blade_charged": "Hidden blade charged",
+  "malum.subtitle.hidden_blade_disrupted": "Hidden blade disrupted",
+  "malum.subtitle.hidden_blade_primed": "Hidden blade primed",
   "malum.subtitle.hidden_blade_unleashed": "Hidden blade unleashed",
   "malum.subtitle.hungry_belt_feeds": "Hungry belt feeds",
   "malum.subtitle.impetus_takes_damage": "Impetus takes damage",

src/generated/resources/data/malum/advancements/recipes/ether_torch_alternative.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_ether": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "malum:ether"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "malum:ether_torch_alternative"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_ether",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "malum:ether_torch_alternative"
+    ]
+  },
+  "sends_telemetry_event": true
+}

src/generated/resources/data/malum/advancements/recipes/iridescent_ether_torch_alternative.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_ether": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "malum:ether"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "malum:iridescent_ether_torch_alternative"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_ether",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "malum:iridescent_ether_torch_alternative"
+    ]
+  },
+  "sends_telemetry_event": true
+}

src/generated/resources/data/malum/advancements/recipes/tainted_ether_brazier.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_ether": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "malum:ether"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "malum:tainted_ether_brazier"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_ether",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "malum:tainted_ether_brazier"
+    ]
+  },
+  "sends_telemetry_event": true
+}

src/generated/resources/data/malum/advancements/recipes/tainted_iridescent_ether_brazier.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_ether": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "malum:ether"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "malum:tainted_iridescent_ether_brazier"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_ether",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "malum:tainted_iridescent_ether_brazier"
+    ]
+  },
+  "sends_telemetry_event": true
+}

src/generated/resources/data/malum/advancements/recipes/twisted_ether_brazier.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_ether": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "malum:ether"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "malum:twisted_ether_brazier"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_ether",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "malum:twisted_ether_brazier"
+    ]
+  },
+  "sends_telemetry_event": true
+}

src/generated/resources/data/malum/advancements/recipes/twisted_iridescent_ether_brazier.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_ether": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "malum:ether"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "malum:twisted_iridescent_ether_brazier"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_ether",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "malum:twisted_iridescent_ether_brazier"
+    ]
+  },
+  "sends_telemetry_event": true
+}

src/main/java/com/sammy/malum/data/recipe/MalumVanillaRecipeReplacements.java

@@ -35,11 +35,13 @@ protected void buildRecipes(Consumer<FinishedRecipe> pWriter) {
         replace(Items.QUARTZ, Tags.Items.GEMS_QUARTZ);
         replace(Items.SLIME_BALL, Tags.Items.SLIMEBALLS);
 
-        super.buildRecipes(vanilla -> {
-            FinishedRecipe modified = enhance(vanilla);
-            if (modified != null)
-                pWriter.accept(modified);
-        });
+
+        //this fucker literally for no reason makes datagen not work, 1.20 is close to it's end, we're just gonna figure it out in 1.21
+//        super.buildRecipes(vanilla -> {
+//            FinishedRecipe modified = enhance(vanilla);
+//            if (modified != null)
+//                pWriter.accept(modified);
+//        });
     }
 
 

src/main/java/com/sammy/malum/data/recipe/MalumVanillaRecipes.java

@@ -258,11 +258,11 @@ private static void nodeSmelting(Consumer<FinishedRecipe> recipeConsumer, Regist
     }
 
     private static void etherBrazier(Consumer<FinishedRecipe> recipeConsumer, ItemLike output, ItemLike rock, ItemLike ether) {
-        NBTCarryRecipeBuilder.shapedRecipe(output, 2, Ingredient.of(ether)).key('#', rock).key('S', Ingredient.of(Tags.Items.RODS_WOODEN)).key('X', ether).patternLine("#X#").patternLine("S#S").addCriterion("has_ether", has(ItemRegistry.ETHER.get())).build(recipeConsumer, ForgeRegistries.ITEMS.getKey(output.asItem()).getPath());
+        NBTCarryRecipeBuilder.shapedRecipe(output, 2, Ingredient.of(ether)).key('#', rock).key('S', Ingredient.of(Tags.Items.RODS_WOODEN)).key('X', ether).patternLine("#X#").patternLine("S#S").addCriterion("has_ether", has(ItemRegistry.ETHER.get())).build(recipeConsumer, MalumMod.malumPath(ForgeRegistries.ITEMS.getKey(output.asItem()).getPath()));
     }
 
     private static void etherTorch(Consumer<FinishedRecipe> recipeConsumer, ItemLike output, ItemLike ether) {
-        NBTCarryRecipeBuilder.shapedRecipe(output, 4, Ingredient.of(ether)).key('#', Ingredient.of(Tags.Items.RODS_WOODEN)).key('X', ether).patternLine("X").patternLine("#").addCriterion("has_ether", has(ItemRegistry.ETHER.get())).build(recipeConsumer, ForgeRegistries.ITEMS.getKey(output.asItem()).getPath() + "_alternative");
+        NBTCarryRecipeBuilder.shapedRecipe(output, 4, Ingredient.of(ether)).key('#', Ingredient.of(Tags.Items.RODS_WOODEN)).key('X', ether).patternLine("X").patternLine("#").addCriterion("has_ether", has(ItemRegistry.ETHER.get())).build(recipeConsumer, MalumMod.malumPath(ForgeRegistries.ITEMS.getKey(output.asItem()).getPath() + "_alternative"));
     }
 
     private static void shapelessPlanks(Consumer<FinishedRecipe> recipeConsumer, ItemLike planks, TagKey<Item> input) {

src/main/resources/data/minecraft/advancements/recipes/root.json

@@ -0,0 +1,13 @@
+{
+  "criteria": {
+    "impossible": {
+      "trigger": "minecraft:impossible"
+    }
+  },
+  "requirements": [
+    [
+      "impossible"
+    ]
+  ],
+  "sends_telemetry_event": false
+}