feat: ✨ Add stonecutter and chipped upgrades as recipe catalysts so t…

…hat they show up in JEI as ways to craft the given blocks
P3pp3rF1y · Nov 19, 2023 · 7bbaae8 · 7bbaae8
1 parent e0c55c6
commit 7bbaae8
Show file tree

Hide file tree

Showing 69 changed files with 270 additions and 287 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.daemon=false
 
 mod_id=sophisticatedbackpacks
 mod_group_id=sophisticatedbackpacks
-mod_version=3.18.67
+mod_version=3.18.68
 sonar_project_key=sophisticatedbackpacks:SophisticatedBackpacks
 github_package_url=https://maven.pkg.github.com/P3pp3rF1y/SophisticatedBackpacks
 

diff --git a/...es/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_compacting_upgrade.json b/...es/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_compacting_upgrade.json
@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:advanced_compacting_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }
diff --git a/...urces/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_deposit_upgrade.json b/...urces/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_deposit_upgrade.json
@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:advanced_deposit_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }
diff --git a/...urces/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_feeding_upgrade.json b/...urces/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_feeding_upgrade.json
@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:advanced_feeding_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }
diff --git a/...ources/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_filter_upgrade.json b/...ources/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_filter_upgrade.json
@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:advanced_filter_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }
diff --git a/...ources/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_magnet_upgrade.json b/...ources/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_magnet_upgrade.json
@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:advanced_magnet_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }
diff --git a/.../sophisticatedbackpacks/advancements/recipes/misc/advanced_magnet_upgrade_from_basic.json b/.../sophisticatedbackpacks/advancements/recipes/misc/advanced_magnet_upgrade_from_basic.json
@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:advanced_magnet_upgrade_from_basic"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }
diff --git a/...ources/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_pickup_upgrade.json b/...ources/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_pickup_upgrade.json
@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:advanced_pickup_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }
diff --git a/...esources/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_pump_upgrade.json b/...esources/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_pump_upgrade.json
@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:advanced_pump_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }
diff --git a/...ources/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_refill_upgrade.json b/...ources/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_refill_upgrade.json
@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:advanced_refill_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }
diff --git a/...urces/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_restock_upgrade.json b/...urces/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_restock_upgrade.json
@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:advanced_restock_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }
diff --git a/.../data/sophisticatedbackpacks/advancements/recipes/misc/advanced_tool_swapper_upgrade.json b/.../data/sophisticatedbackpacks/advancements/recipes/misc/advanced_tool_swapper_upgrade.json
@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:advanced_tool_swapper_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }
diff --git a/...esources/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_void_upgrade.json b/...esources/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_void_upgrade.json
@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:advanced_void_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }
diff --git a/...esources/data/sophisticatedbackpacks/advancements/recipes/misc/auto_blasting_upgrade.json b/...esources/data/sophisticatedbackpacks/advancements/recipes/misc/auto_blasting_upgrade.json
@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:auto_blasting_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }
diff --git a/...backpacks/advancements/recipes/misc/auto_blasting_upgrade_from_auto_smelting_upgrade.json b/...backpacks/advancements/recipes/misc/auto_blasting_upgrade_from_auto_smelting_upgrade.json
@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:auto_blasting_upgrade_from_auto_smelting_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }
diff --git a/...esources/data/sophisticatedbackpacks/advancements/recipes/misc/auto_smelting_upgrade.json b/...esources/data/sophisticatedbackpacks/advancements/recipes/misc/auto_smelting_upgrade.json
@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:auto_smelting_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }
diff --git a/...resources/data/sophisticatedbackpacks/advancements/recipes/misc/auto_smoking_upgrade.json b/...resources/data/sophisticatedbackpacks/advancements/recipes/misc/auto_smoking_upgrade.json
@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:auto_smoking_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }
diff --git a/...dbackpacks/advancements/recipes/misc/auto_smoking_upgrade_from_auto_smelting_upgrade.json b/...dbackpacks/advancements/recipes/misc/auto_smoking_upgrade_from_auto_smelting_upgrade.json
@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:auto_smoking_upgrade_from_auto_smelting_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }
diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/backpack.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/backpack.json
@@ -28,6 +28,5 @@
     "recipes": [
       "sophisticatedbackpacks:backpack"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }
diff --git a/...ated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/battery_upgrade.json b/...ated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/battery_upgrade.json
@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:battery_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }
diff --git a/...ted/resources/data/sophisticatedbackpacks/advancements/recipes/misc/blasting_upgrade.json b/...ted/resources/data/sophisticatedbackpacks/advancements/recipes/misc/blasting_upgrade.json
@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:blasting_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }
diff --git a/...histicatedbackpacks/advancements/recipes/misc/blasting_upgrade_from_smelting_upgrade.json b/...histicatedbackpacks/advancements/recipes/misc/blasting_upgrade_from_smelting_upgrade.json
@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:blasting_upgrade_from_smelting_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }
diff --git a/...s/chipped/botanist_workbench_upgrade.json → ...c/chipped/botanist_workbench_upgrade.json b/...s/chipped/botanist_workbench_upgrade.json → ...c/chipped/botanist_workbench_upgrade.json
@@ -1,13 +1,13 @@
 {
   "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "sophisticatedbackpacks:chipped/botanist_workbench_upgrade"
-    ]
-  },
   "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "sophisticatedbackpacks:chipped/botanist_workbench_upgrade"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
     "has_upgrade_base": {
-      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
@@ -16,19 +16,20 @@
             ]
           }
         ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "sophisticatedbackpacks:chipped/botanist_workbench_upgrade"
-      }
+      },
+      "trigger": "minecraft:inventory_changed"
     }
   },
   "requirements": [
     [
       "has_upgrade_base",
       "has_the_recipe"
     ]
-  ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sophisticatedbackpacks:chipped/botanist_workbench_upgrade"
+    ]
+  },
+  "sends_telemetry_event": true
 }
diff --git a/.../chipped/carpenter_workbench_upgrade.json → .../chipped/carpenter_workbench_upgrade.json b/.../chipped/carpenter_workbench_upgrade.json → .../chipped/carpenter_workbench_upgrade.json
@@ -1,13 +1,13 @@
 {
   "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "sophisticatedbackpacks:chipped/carpenter_workbench_upgrade"
-    ]
-  },
   "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "sophisticatedbackpacks:chipped/carpenter_workbench_upgrade"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
     "has_upgrade_base": {
-      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
@@ -16,19 +16,20 @@
             ]
           }
         ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "sophisticatedbackpacks:chipped/carpenter_workbench_upgrade"
-      }
+      },
+      "trigger": "minecraft:inventory_changed"
     }
   },
   "requirements": [
     [
       "has_upgrade_base",
       "has_the_recipe"
     ]
-  ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sophisticatedbackpacks:chipped/carpenter_workbench_upgrade"
+    ]
+  },
+  "sends_telemetry_event": true
 }
diff --git a/...hipped/glassblower_workbench_upgrade.json → ...hipped/glassblower_workbench_upgrade.json b/...hipped/glassblower_workbench_upgrade.json → ...hipped/glassblower_workbench_upgrade.json
@@ -1,13 +1,13 @@
 {
   "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "sophisticatedbackpacks:chipped/glassblower_workbench_upgrade"
-    ]
-  },
   "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "sophisticatedbackpacks:chipped/glassblower_workbench_upgrade"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
     "has_upgrade_base": {
-      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
@@ -16,19 +16,20 @@
             ]
           }
         ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "sophisticatedbackpacks:chipped/glassblower_workbench_upgrade"
-      }
+      },
+      "trigger": "minecraft:inventory_changed"
     }
   },
   "requirements": [
     [
       "has_upgrade_base",
       "has_the_recipe"
     ]
-  ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sophisticatedbackpacks:chipped/glassblower_workbench_upgrade"
+    ]
+  },
+  "sends_telemetry_event": true
 }
diff --git a/...acks/chipped/mason_workbench_upgrade.json → ...misc/chipped/mason_workbench_upgrade.json b/...acks/chipped/mason_workbench_upgrade.json → ...misc/chipped/mason_workbench_upgrade.json
@@ -1,13 +1,13 @@
 {
   "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "sophisticatedbackpacks:chipped/mason_workbench_upgrade"
-    ]
-  },
   "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "sophisticatedbackpacks:chipped/mason_workbench_upgrade"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
     "has_upgrade_base": {
-      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
@@ -16,19 +16,20 @@
             ]
           }
         ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "sophisticatedbackpacks:chipped/mason_workbench_upgrade"
-      }
+      },
+      "trigger": "minecraft:inventory_changed"
     }
   },
   "requirements": [
     [
       "has_upgrade_base",
       "has_the_recipe"
     ]
-  ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sophisticatedbackpacks:chipped/mason_workbench_upgrade"
+    ]
+  },
+  "sends_telemetry_event": true
 }