most resources ported, removed cthonicexchange and soulstainedsteelknife

SammySemicolon · Nov 29, 2024 · 5f484ab · 5f484ab
1 parent 98f090a
commit 5f484ab
Show file tree

Hide file tree

Showing 148 changed files with 299 additions and 387 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -64,7 +64,7 @@ neoForge {
         }
 
         configureEach {
-            systemProperty("forge.logging.markers", "REGISTRIES")
+            systemProperty("neoforge.logging.markers", "REGISTRIES")
             logLevel = org.slf4j.event.Level.DEBUG
         }
     }

diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/aluminum_from_node_blasting.json b/src/generated/resources/data/malum/advancement/recipes/misc/aluminum_from_node_blasting.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/aluminum"
+        "tag": "neoforge:nuggets/aluminum"
       }
     }
   ],

diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/aluminum_from_node_smelting.json b/src/generated/resources/data/malum/advancement/recipes/misc/aluminum_from_node_smelting.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/aluminum"
+        "tag": "neoforge:nuggets/aluminum"
       }
     }
   ],

diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/copper_ingot_from_nugget.json b/src/generated/resources/data/malum/advancement/recipes/misc/copper_ingot_from_nugget.json
@@ -5,7 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": "#forge:ingots/copper"
+            "items": "#c:ingots/copper"
           }
         ]
       },

diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/copper_nugget_from_ingot.json b/src/generated/resources/data/malum/advancement/recipes/misc/copper_nugget_from_ingot.json
@@ -5,7 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": "#forge:ingots/copper"
+            "items": "#c:ingots/copper"
           }
         ]
       },

diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/lead_from_node_blasting.json b/src/generated/resources/data/malum/advancement/recipes/misc/lead_from_node_blasting.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/lead"
+        "tag": "neoforge:nuggets/lead"
       }
     }
   ],

diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/lead_from_node_smelting.json b/src/generated/resources/data/malum/advancement/recipes/misc/lead_from_node_smelting.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/lead"
+        "tag": "neoforge:nuggets/lead"
       }
     }
   ],

diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/nickel_from_node_blasting.json b/src/generated/resources/data/malum/advancement/recipes/misc/nickel_from_node_blasting.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/nickel"
+        "tag": "neoforge:nuggets/nickel"
       }
     }
   ],

diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/nickel_from_node_smelting.json b/src/generated/resources/data/malum/advancement/recipes/misc/nickel_from_node_smelting.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/nickel"
+        "tag": "neoforge:nuggets/nickel"
       }
     }
   ],

diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/osmium_from_node_blasting.json b/src/generated/resources/data/malum/advancement/recipes/misc/osmium_from_node_blasting.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/osmium"
+        "tag": "neoforge:nuggets/osmium"
       }
     }
   ],

diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/osmium_from_node_smelting.json b/src/generated/resources/data/malum/advancement/recipes/misc/osmium_from_node_smelting.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/osmium"
+        "tag": "neoforge:nuggets/osmium"
       }
     }
   ],

diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/silver_from_node_blasting.json b/src/generated/resources/data/malum/advancement/recipes/misc/silver_from_node_blasting.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/silver"
+        "tag": "neoforge:nuggets/silver"
       }
     }
   ],

diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/silver_from_node_smelting.json b/src/generated/resources/data/malum/advancement/recipes/misc/silver_from_node_smelting.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/silver"
+        "tag": "neoforge:nuggets/silver"
       }
     }
   ],

diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/tin_from_node_blasting.json b/src/generated/resources/data/malum/advancement/recipes/misc/tin_from_node_blasting.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/tin"
+        "tag": "neoforge:nuggets/tin"
       }
     }
   ],

diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/tin_from_node_smelting.json b/src/generated/resources/data/malum/advancement/recipes/misc/tin_from_node_smelting.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/tin"
+        "tag": "neoforge:nuggets/tin"
       }
     }
   ],

diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/uranium_from_node_blasting.json b/src/generated/resources/data/malum/advancement/recipes/misc/uranium_from_node_blasting.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/uranium"
+        "tag": "neoforge:nuggets/uranium"
       }
     }
   ],

diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/uranium_from_node_smelting.json b/src/generated/resources/data/malum/advancement/recipes/misc/uranium_from_node_smelting.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/uranium"
+        "tag": "neoforge:nuggets/uranium"
       }
     }
   ],

diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/zinc_from_node_blasting.json b/src/generated/resources/data/malum/advancement/recipes/misc/zinc_from_node_blasting.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/zinc"
+        "tag": "neoforge:nuggets/zinc"
       }
     }
   ],

diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/zinc_from_node_smelting.json b/src/generated/resources/data/malum/advancement/recipes/misc/zinc_from_node_smelting.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/zinc"
+        "tag": "neoforge:nuggets/zinc"
       }
     }
   ],

diff --git a/...ated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_aluminum.json b/...ated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_aluminum.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/aluminum"
+        "tag": "neoforge:nuggets/aluminum"
       }
     }
   ],

diff --git a/...enerated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_lead.json b/...enerated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_lead.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/lead"
+        "tag": "neoforge:nuggets/lead"
       }
     }
   ],

diff --git a/...erated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_nickel.json b/...erated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_nickel.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/nickel"
+        "tag": "neoforge:nuggets/nickel"
       }
     }
   ],

diff --git a/...erated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_osmium.json b/...erated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_osmium.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/osmium"
+        "tag": "neoforge:nuggets/osmium"
       }
     }
   ],

diff --git a/...erated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_silver.json b/...erated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_silver.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/silver"
+        "tag": "neoforge:nuggets/silver"
       }
     }
   ],

diff --git a/...generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_tin.json b/...generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_tin.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/tin"
+        "tag": "neoforge:nuggets/tin"
       }
     }
   ],

diff --git a/...rated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_uranium.json b/...rated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_uranium.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/uranium"
+        "tag": "neoforge:nuggets/uranium"
       }
     }
   ],

diff --git a/...enerated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_zinc.json b/...enerated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_zinc.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/zinc"
+        "tag": "neoforge:nuggets/zinc"
       }
     }
   ],

diff --git a/src/generated/resources/data/malum/recipe/aluminum_from_node_blasting.json b/src/generated/resources/data/malum/recipe/aluminum_from_node_blasting.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/aluminum"
+        "tag": "neoforge:nuggets/aluminum"
       }
     }
   ],
@@ -13,7 +13,7 @@
   "cookingtime": 100,
   "experience": 0.25,
   "ingredient": {
-    "tag": "forge:nuggets/aluminum"
+    "tag": "neoforge:nuggets/aluminum"
   },
   "result": {
     "count": 1,

diff --git a/src/generated/resources/data/malum/recipe/aluminum_from_node_smelting.json b/src/generated/resources/data/malum/recipe/aluminum_from_node_smelting.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/aluminum"
+        "tag": "neoforge:nuggets/aluminum"
       }
     }
   ],
@@ -13,7 +13,7 @@
   "cookingtime": 200,
   "experience": 0.25,
   "ingredient": {
-    "tag": "forge:nuggets/aluminum"
+    "tag": "neoforge:nuggets/aluminum"
   },
   "result": {
     "count": 1,

diff --git a/src/generated/resources/data/malum/recipe/copper_ingot_from_nugget.json b/src/generated/resources/data/malum/recipe/copper_ingot_from_nugget.json
@@ -3,7 +3,7 @@
   "category": "misc",
   "key": {
     "#": {
-      "tag": "forge:nuggets/copper"
+      "tag": "neoforge:nuggets/copper"
     }
   },
   "pattern": [

diff --git a/src/generated/resources/data/malum/recipe/copper_nugget_from_ingot.json b/src/generated/resources/data/malum/recipe/copper_nugget_from_ingot.json
@@ -3,7 +3,7 @@
   "category": "misc",
   "ingredients": [
     {
-      "tag": "forge:ingots/copper"
+      "tag": "c:ingots/copper"
     }
   ],
   "result": {

diff --git a/src/generated/resources/data/malum/recipe/impetus_creation_aluminum.json b/src/generated/resources/data/malum/recipe/impetus_creation_aluminum.json
@@ -12,7 +12,7 @@
     },
     {
       "count": 6,
-      "tag": "forge:ingots/aluminum"
+      "tag": "neoforge:ingots/aluminum"
     }
   ],
   "ingredient": {

diff --git a/src/generated/resources/data/malum/recipe/impetus_creation_lead.json b/src/generated/resources/data/malum/recipe/impetus_creation_lead.json
@@ -12,7 +12,7 @@
     },
     {
       "count": 6,
-      "tag": "forge:ingots/lead"
+      "tag": "neoforge:ingots/lead"
     }
   ],
   "ingredient": {

diff --git a/src/generated/resources/data/malum/recipe/impetus_creation_nickel.json b/src/generated/resources/data/malum/recipe/impetus_creation_nickel.json
@@ -12,7 +12,7 @@
     },
     {
       "count": 6,
-      "tag": "forge:ingots/nickel"
+      "tag": "neoforge:ingots/nickel"
     }
   ],
   "ingredient": {

diff --git a/src/generated/resources/data/malum/recipe/impetus_creation_osmium.json b/src/generated/resources/data/malum/recipe/impetus_creation_osmium.json
@@ -12,7 +12,7 @@
     },
     {
       "count": 6,
-      "tag": "forge:ingots/osmium"
+      "tag": "neoforge:ingots/osmium"
     }
   ],
   "ingredient": {

diff --git a/src/generated/resources/data/malum/recipe/impetus_creation_silver.json b/src/generated/resources/data/malum/recipe/impetus_creation_silver.json
@@ -12,7 +12,7 @@
     },
     {
       "count": 6,
-      "tag": "forge:ingots/silver"
+      "tag": "neoforge:ingots/silver"
     }
   ],
   "ingredient": {

diff --git a/src/generated/resources/data/malum/recipe/impetus_creation_tin.json b/src/generated/resources/data/malum/recipe/impetus_creation_tin.json
@@ -12,7 +12,7 @@
     },
     {
       "count": 6,
-      "tag": "forge:ingots/tin"
+      "tag": "neoforge:ingots/tin"
     }
   ],
   "ingredient": {

diff --git a/src/generated/resources/data/malum/recipe/impetus_creation_uranium.json b/src/generated/resources/data/malum/recipe/impetus_creation_uranium.json
@@ -12,7 +12,7 @@
     },
     {
       "count": 6,
-      "tag": "forge:ingots/uranium"
+      "tag": "neoforge:ingots/uranium"
     }
   ],
   "ingredient": {

diff --git a/src/generated/resources/data/malum/recipe/impetus_creation_zinc.json b/src/generated/resources/data/malum/recipe/impetus_creation_zinc.json
@@ -12,7 +12,7 @@
     },
     {
       "count": 6,
-      "tag": "forge:ingots/zinc"
+      "tag": "neoforge:ingots/zinc"
     }
   ],
   "ingredient": {

diff --git a/src/generated/resources/data/malum/recipe/lead_from_node_blasting.json b/src/generated/resources/data/malum/recipe/lead_from_node_blasting.json
@@ -4,7 +4,7 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "forge:nuggets/lead"
+        "tag": "neoforge:nuggets/lead"
       }
     }
   ],
@@ -13,7 +13,7 @@
   "cookingtime": 100,
   "experience": 0.25,
   "ingredient": {
-    "tag": "forge:nuggets/lead"
+    "tag": "neoforge:nuggets/lead"
   },
   "result": {
     "count": 1,