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 · b3c13ed · b3c13ed
1 parent fa2585c
commit b3c13ed
Show file tree

Hide file tree

Showing 133 changed files with 1,406 additions and 1,374 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 org.gradle.daemon=false
 minecraft_version=1.19.2
 forge_version=43.2.13
-mod_version=3.18.65
+mod_version=3.18.66
 jei_mc_version=1.19.2-forge
 jei_version=11.6.0.+
 curios_version=1.19.2-5.1.1.+

diff --git a/...tedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_compacting_upgrade.json b/...tedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_compacting_upgrade.json
@@ -1,13 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "sophisticatedbackpacks:advanced_compacting_upgrade"
-    ]
-  },
   "criteria": {
     "has_compacting_upgrade": {
-      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
@@ -16,19 +10,25 @@
             ]
           }
         ]
-      }
+      },
+      "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
       "conditions": {
         "recipe": "sophisticatedbackpacks:advanced_compacting_upgrade"
-      }
+      },
+      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
       "has_compacting_upgrade",
       "has_the_recipe"
     ]
-  ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sophisticatedbackpacks:advanced_compacting_upgrade"
+    ]
+  }
 }
diff --git a/...icatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_deposit_upgrade.json b/...icatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_deposit_upgrade.json
@@ -1,13 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "sophisticatedbackpacks:advanced_deposit_upgrade"
-    ]
-  },
   "criteria": {
     "has_deposit_upgrade": {
-      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
@@ -16,19 +10,25 @@
             ]
           }
         ]
-      }
+      },
+      "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
       "conditions": {
         "recipe": "sophisticatedbackpacks:advanced_deposit_upgrade"
-      }
+      },
+      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
       "has_deposit_upgrade",
       "has_the_recipe"
     ]
-  ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sophisticatedbackpacks:advanced_deposit_upgrade"
+    ]
+  }
 }
diff --git a/...icatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_feeding_upgrade.json b/...icatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_feeding_upgrade.json
@@ -1,13 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "sophisticatedbackpacks:advanced_feeding_upgrade"
-    ]
-  },
   "criteria": {
     "has_feeding_upgrade": {
-      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
@@ -16,19 +10,25 @@
             ]
           }
         ]
-      }
+      },
+      "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
       "conditions": {
         "recipe": "sophisticatedbackpacks:advanced_feeding_upgrade"
-      }
+      },
+      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
       "has_feeding_upgrade",
       "has_the_recipe"
     ]
-  ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sophisticatedbackpacks:advanced_feeding_upgrade"
+    ]
+  }
 }
diff --git a/...ticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_filter_upgrade.json b/...ticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_filter_upgrade.json
@@ -1,13 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "sophisticatedbackpacks:advanced_filter_upgrade"
-    ]
-  },
   "criteria": {
     "has_filter_upgrade": {
-      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
@@ -16,19 +10,25 @@
             ]
           }
         ]
-      }
+      },
+      "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
       "conditions": {
         "recipe": "sophisticatedbackpacks:advanced_filter_upgrade"
-      }
+      },
+      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
       "has_filter_upgrade",
       "has_the_recipe"
     ]
-  ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sophisticatedbackpacks:advanced_filter_upgrade"
+    ]
+  }
 }
diff --git a/...ticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_magnet_upgrade.json b/...ticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_magnet_upgrade.json
@@ -1,13 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "sophisticatedbackpacks:advanced_magnet_upgrade"
-    ]
-  },
   "criteria": {
     "has_advanced_pickup_upgrade": {
-      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
@@ -16,19 +10,25 @@
             ]
           }
         ]
-      }
+      },
+      "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
       "conditions": {
         "recipe": "sophisticatedbackpacks:advanced_magnet_upgrade"
-      }
+      },
+      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
       "has_advanced_pickup_upgrade",
       "has_the_recipe"
     ]
-  ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sophisticatedbackpacks:advanced_magnet_upgrade"
+    ]
+  }
 }
diff --git a/...packs/advancements/recipes/sophisticatedbackpacks/advanced_magnet_upgrade_from_basic.json b/...packs/advancements/recipes/sophisticatedbackpacks/advanced_magnet_upgrade_from_basic.json
@@ -1,13 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "sophisticatedbackpacks:advanced_magnet_upgrade_from_basic"
-    ]
-  },
   "criteria": {
     "has_magnet_upgrade": {
-      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
@@ -16,19 +10,25 @@
             ]
           }
         ]
-      }
+      },
+      "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
       "conditions": {
         "recipe": "sophisticatedbackpacks:advanced_magnet_upgrade_from_basic"
-      }
+      },
+      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
       "has_magnet_upgrade",
       "has_the_recipe"
     ]
-  ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sophisticatedbackpacks:advanced_magnet_upgrade_from_basic"
+    ]
+  }
 }
diff --git a/...ticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_pickup_upgrade.json b/...ticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_pickup_upgrade.json
@@ -1,13 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "sophisticatedbackpacks:advanced_pickup_upgrade"
-    ]
-  },
   "criteria": {
     "has_pickup_upgrade": {
-      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
@@ -16,19 +10,25 @@
             ]
           }
         ]
-      }
+      },
+      "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
       "conditions": {
         "recipe": "sophisticatedbackpacks:advanced_pickup_upgrade"
-      }
+      },
+      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
       "has_pickup_upgrade",
       "has_the_recipe"
     ]
-  ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sophisticatedbackpacks:advanced_pickup_upgrade"
+    ]
+  }
 }
diff --git a/...isticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_pump_upgrade.json b/...isticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_pump_upgrade.json
@@ -1,13 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "sophisticatedbackpacks:advanced_pump_upgrade"
-    ]
-  },
   "criteria": {
     "has_pump_upgrade": {
-      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
@@ -16,19 +10,25 @@
             ]
           }
         ]
-      }
+      },
+      "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
       "conditions": {
         "recipe": "sophisticatedbackpacks:advanced_pump_upgrade"
-      }
+      },
+      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
       "has_pump_upgrade",
       "has_the_recipe"
     ]
-  ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sophisticatedbackpacks:advanced_pump_upgrade"
+    ]
+  }
 }