Fixed recipe conditions

JackyyTV · Oct 9, 2023 · e823cf4 · e823cf4
1 parent ddfd948
commit e823cf4
Show file tree

Hide file tree

Showing 11 changed files with 166 additions and 147 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'eclipse'
     id 'idea'
-    id 'net.minecraftforge.gradle' version '[6.0,6.2)'
+    id 'net.minecraftforge.gradle' version '[6.0.14,6.2)'
 }
 
 import net.minecraftforge.gradle.common.tasks.SignJar

diff --git a/gradle.properties b/gradle.properties
@@ -7,8 +7,8 @@ mod_name=Simple Sponge
 mc_version=1.20.2
 mc_version_range=[1.20.2,1.21)
 
-forge_version=48.0.13
-forge_version_range=[48,)
+forge_version=48.0.20
+forge_version_range=[48.0.17,)
 loader_version_range=[48,)
 
 mappings_channel=official

diff --git a/src/main/resources/data/simplesponge/recipes/compressed_sponge_on_a_stick.json b/src/main/resources/data/simplesponge/recipes/compressed_sponge_on_a_stick.json
@@ -1,29 +1,30 @@
 {
   "type": "crafting_shaped",
-  "conditions": [
-    {
-      "type": "forge:or",
-      "values": [
-        {
-          "type": "simplesponge:openblocks_integration", "enabled": false
-        },
-        {
-          "type": "forge:and",
-          "values": [
-            {
-              "type": "simplesponge:openblocks_integration", "enabled": true
-            },
-            {
-              "type": "forge:not",
-              "value": {
-                "type": "forge:item_exists", "item": "openblocks:sponge_on_a_stick"
-              }
+  "forge:condition": {
+    "type": "forge:or",
+    "values": [
+      {
+        "type": "simplesponge:openblocks_integration",
+        "enabled": false
+      },
+      {
+        "type": "forge:and",
+        "values": [
+          {
+            "type": "simplesponge:openblocks_integration",
+            "enabled": true
+          },
+          {
+            "type": "forge:not",
+            "value": {
+              "type": "forge:item_exists",
+              "item": "openblocks:sponge_on_a_stick"
             }
-          ]
-        }
-      ]
-    }
-  ],
+          }
+        ]
+      }
+    ]
+  },
   "pattern": [
     "###",
     "###",

diff --git a/src/main/resources/data/simplesponge/recipes/energized_sponge_on_a_stick.json b/src/main/resources/data/simplesponge/recipes/energized_sponge_on_a_stick.json
@@ -1,10 +1,9 @@
 {
   "type": "crafting_shaped",
-  "conditions": [
-    {
-      "type": "simplesponge:energized_sponge_on_a_stick", "enabled": true
-    }
-  ],
+  "forge:condition": {
+    "type": "simplesponge:energized_sponge_on_a_stick",
+    "enabled": true
+  },
   "pattern": [
     "R#R",
     "GBG",

diff --git a/src/main/resources/data/simplesponge/recipes/magmatic_sponge.json b/src/main/resources/data/simplesponge/recipes/magmatic_sponge.json
@@ -1,29 +1,30 @@
 {
   "type": "crafting_shapeless",
-  "conditions": [
-    {
-      "type": "forge:or",
-      "values": [
-        {
-          "type": "simplesponge:openblocks_integration", "enabled": false
-        },
-        {
-          "type": "forge:and",
-          "values": [
-            {
-              "type": "simplesponge:openblocks_integration", "enabled": true
-            },
-            {
-              "type": "forge:not",
-              "value": {
-                "type": "forge:item_exists", "item": "openblocks:sponge"
-              }
+  "forge:condition": {
+    "type": "forge:or",
+    "values": [
+      {
+        "type": "simplesponge:openblocks_integration",
+        "enabled": false
+      },
+      {
+        "type": "forge:and",
+        "values": [
+          {
+            "type": "simplesponge:openblocks_integration",
+            "enabled": true
+          },
+          {
+            "type": "forge:not",
+            "value": {
+              "type": "forge:item_exists",
+              "item": "openblocks:sponge"
             }
-          ]
-        }
-      ]
-    }
-  ],
+          }
+        ]
+      }
+    ]
+  },
   "ingredients": [
     {
       "item": "simplesponge:sponge"

diff --git a/src/main/resources/data/simplesponge/recipes/magmatic_sponge_on_a_stick_upgrade.json b/src/main/resources/data/simplesponge/recipes/magmatic_sponge_on_a_stick_upgrade.json
@@ -1,29 +1,30 @@
 {
   "type": "crafting_shapeless",
-  "conditions": [
-    {
-      "type": "forge:or",
-      "values": [
-        {
-          "type": "simplesponge:openblocks_integration", "enabled": false
-        },
-        {
-          "type": "forge:and",
-          "values": [
-            {
-              "type": "simplesponge:openblocks_integration", "enabled": true
-            },
-            {
-              "type": "forge:not",
-              "value": {
-                "type": "forge:item_exists", "item": "openblocks:sponge_on_a_stick"
-              }
+  "forge:condition": {
+    "type": "forge:or",
+    "values": [
+      {
+        "type": "simplesponge:openblocks_integration",
+        "enabled": false
+      },
+      {
+        "type": "forge:and",
+        "values": [
+          {
+            "type": "simplesponge:openblocks_integration",
+            "enabled": true
+          },
+          {
+            "type": "forge:not",
+            "value": {
+              "type": "forge:item_exists",
+              "item": "openblocks:sponge_on_a_stick"
             }
-          ]
-        }
-      ]
-    }
-  ],
+          }
+        ]
+      }
+    ]
+  },
   "ingredients": [
     {
       "item": "simplesponge:sponge_on_a_stick"

diff --git a/src/main/resources/data/simplesponge/recipes/openblocks/compressed_sponge_on_a_stick.json b/src/main/resources/data/simplesponge/recipes/openblocks/compressed_sponge_on_a_stick.json
@@ -1,13 +1,18 @@
 {
   "type": "crafting_shaped",
-  "conditions": [
-    {
-      "type": "simplesponge:openblocks_integration", "enabled": true
-    },
-    {
-      "type": "forge:item_exists", "item": "openblocks:sponge_on_a_stick"
-    }
-  ],
+  "forge:condition": {
+    "type": "forge:and",
+    "values": [
+      {
+        "type": "simplesponge:openblocks_integration",
+        "enabled": true
+      },
+      {
+        "type": "forge:item_exists",
+        "item": "openblocks:sponge_on_a_stick"
+      }
+    ]
+  },
   "pattern": [
     "###",
     "###",

diff --git a/src/main/resources/data/simplesponge/recipes/openblocks/magmatic_sponge.json b/src/main/resources/data/simplesponge/recipes/openblocks/magmatic_sponge.json
@@ -1,13 +1,18 @@
 {
   "type": "crafting_shapeless",
-  "conditions": [
-    {
-      "type": "simplesponge:openblocks_integration", "enabled": true
-    },
-    {
-      "type": "forge:item_exists", "item": "openblocks:sponge"
-    }
-  ],
+  "forge:condition": {
+    "type": "forge:and",
+    "values": [
+      {
+        "type": "simplesponge:openblocks_integration",
+        "enabled": true
+      },
+      {
+        "type": "forge:item_exists",
+        "item": "openblocks:sponge"
+      }
+    ]
+  },
   "ingredients": [
     {
       "item": "openblocks:sponge"

diff --git a/...in/resources/data/simplesponge/recipes/openblocks/magmatic_sponge_on_a_stick_upgrade.json b/...in/resources/data/simplesponge/recipes/openblocks/magmatic_sponge_on_a_stick_upgrade.json
@@ -1,13 +1,18 @@
 {
   "type": "crafting_shapeless",
-  "conditions": [
-    {
-      "type": "simplesponge:openblocks_integration", "enabled": true
-    },
-    {
-      "type": "forge:item_exists", "item": "openblocks:sponge_on_a_stick"
-    }
-  ],
+  "forge:condition": {
+    "type": "forge:and",
+    "values": [
+      {
+        "type": "simplesponge:openblocks_integration",
+        "enabled": true
+      },
+      {
+        "type": "forge:item_exists",
+        "item": "openblocks:sponge_on_a_stick"
+      }
+    ]
+  },
   "ingredients": [
     {
       "item": "openblocks:sponge_on_a_stick"

diff --git a/src/main/resources/data/simplesponge/recipes/sponge.json b/src/main/resources/data/simplesponge/recipes/sponge.json
@@ -1,29 +1,30 @@
 {
   "type": "crafting_shapeless",
-  "conditions": [
-    {
-      "type": "forge:or",
-      "values": [
-        {
-          "type": "simplesponge:openblocks_integration", "enabled": false
-        },
-        {
-          "type": "forge:and",
-          "values": [
-            {
-              "type": "simplesponge:openblocks_integration", "enabled": true
-            },
-            {
-              "type": "forge:not",
-              "value": {
-                "type": "forge:item_exists", "item": "openblocks:sponge"
-              }
+  "forge:condition": {
+    "type": "forge:or",
+    "values": [
+      {
+        "type": "simplesponge:openblocks_integration",
+        "enabled": false
+      },
+      {
+        "type": "forge:and",
+        "values": [
+          {
+            "type": "simplesponge:openblocks_integration",
+            "enabled": true
+          },
+          {
+            "type": "forge:not",
+            "value": {
+              "type": "forge:item_exists",
+              "item": "openblocks:sponge"
             }
-          ]
-        }
-      ]
-    }
-  ],
+          }
+        ]
+      }
+    ]
+  },
   "ingredients": [
     {
       "tag": "minecraft:wool"

diff --git a/src/main/resources/data/simplesponge/recipes/sponge_on_a_stick.json b/src/main/resources/data/simplesponge/recipes/sponge_on_a_stick.json
@@ -1,29 +1,30 @@
 {
   "type": "crafting_shaped",
-  "conditions": [
-    {
-      "type": "forge:or",
-      "values": [
-        {
-          "type": "simplesponge:openblocks_integration", "enabled": false
-        },
-        {
-          "type": "forge:and",
-          "values": [
-            {
-              "type": "simplesponge:openblocks_integration", "enabled": true
-            },
-            {
-              "type": "forge:not",
-              "value": {
-                "type": "forge:item_exists", "item": "openblocks:sponge_on_a_stick"
-              }
+  "forge:condition": {
+    "type": "forge:or",
+    "values": [
+      {
+        "type": "simplesponge:openblocks_integration",
+        "enabled": false
+      },
+      {
+        "type": "forge:and",
+        "values": [
+          {
+            "type": "simplesponge:openblocks_integration",
+            "enabled": true
+          },
+          {
+            "type": "forge:not",
+            "value": {
+              "type": "forge:item_exists",
+              "item": "openblocks:sponge_on_a_stick"
             }
-          ]
-        }
-      ]
-    }
-  ],
+          }
+        ]
+      }
+    ]
+  },
   "pattern": [
     "#",
     "S",