fix: merge error causing regression on conditional recipe loading

my merging of 1.20.1 stuff into 1.20.4 caused miner recipes to switch from neoforge to the no longer supported forge condition syntax.

Closes #1102

Author: klikli-dev

gradle.properties

@@ -31,7 +31,7 @@ group=com.klikli_dev
 mod_id=occultism
 mod_name=Occultism
 mod_license=MIT
-mod_version=1.81.4
+mod_version=1.124.0
 mod_authors=Kli Kli
 mod_description=A magic mod inspired by the world of Jonathan Stroud's Bartimaeus. With the help of occult rituals players can summon entities from the "Other Side" to perform magic.
 

src/generated/resources/data/occultism/recipes/miner/master/stella_arcanum.json

@@ -1,14 +1,14 @@
 {
-  "type": "occultism:miner",
-  "conditions": [
+  "neoforge:conditions": [
     {
-      "type": "forge:not",
+      "type": "neoforge:not",
       "value": {
-        "type": "forge:tag_empty",
+        "type": "neoforge:tag_empty",
         "tag": "forge:ores/stella_arcanum"
       }
     }
   ],
+  "type": "occultism:miner",
   "ingredient": {
     "tag": "occultism:miners/master"
   },

src/generated/resources/data/occultism/recipes/miner/ores/arcane_crystal.json

@@ -1,14 +1,14 @@
 {
-  "type": "occultism:miner",
-  "conditions": [
+  "neoforge:conditions": [
     {
-      "type": "forge:not",
+      "type": "neoforge:not",
       "value": {
-        "type": "forge:tag_empty",
+        "type": "neoforge:tag_empty",
         "tag": "forge:ores/arcane_crystal"
       }
     }
   ],
+  "type": "occultism:miner",
   "ingredient": {
     "tag": "occultism:miners/ores"
   },

src/generated/resources/data/occultism/recipes/miner/ores/runic_stone.json

@@ -1,14 +1,14 @@
 {
-  "type": "occultism:miner",
-  "conditions": [
+  "neoforge:conditions": [
     {
-      "type": "forge:not",
+      "type": "neoforge:not",
       "value": {
-        "type": "forge:tag_empty",
+        "type": "neoforge:tag_empty",
         "tag": "forbidden_arcanus:runic_stones"
       }
     }
   ],
+  "type": "occultism:miner",
   "ingredient": {
     "tag": "occultism:miners/ores"
   },

src/generated/resources/data/occultism/recipes/miner/ores/xpetrified.json

@@ -1,14 +1,14 @@
 {
-  "type": "occultism:miner",
-  "conditions": [
+  "neoforge:conditions": [
     {
-      "type": "forge:not",
+      "type": "neoforge:not",
       "value": {
-        "type": "forge:tag_empty",
+        "type": "neoforge:tag_empty",
         "tag": "forge:ores/xpetrified_ore"
       }
     }
   ],
+  "type": "occultism:miner",
   "ingredient": {
     "tag": "occultism:miners/ores"
   },

src/main/java/com/klikli_dev/occultism/datagen/MinerRecipeProvider.java

@@ -105,7 +105,7 @@ public JsonObject buildMinerRecipeJson(String minerTag, String outputTag, int we
         var recipe = new JsonObject();
         recipe.addProperty("type", "occultism:miner");
         var conditions = this.buildMinerRecipeConditionJson(outputTag);
-        recipe.add("conditions", conditions);
+        recipe.add("neoforge:conditions", conditions);
         var ingredient = new JsonObject();
         ingredient.addProperty("tag", minerTag);
         recipe.add("ingredient", ingredient);
@@ -120,9 +120,9 @@ public JsonArray buildMinerRecipeConditionJson(String outputTag) {
         var conditions = new JsonArray();
         //multiple conditions on the root level array are treated as AND by forge, but we only have one
         var condition = new JsonObject();
-        condition.addProperty("type", "forge:not");
+        condition.addProperty("type", "neoforge:not");
         var value = new JsonObject();
-        value.addProperty("type", "forge:tag_empty");
+        value.addProperty("type", "neoforge:tag_empty");
         value.addProperty("tag", outputTag);
         condition.add("value", value);
         conditions.add(condition);