Merge pull request #909 from P3pp3rF1y/1.20.x-dev

Release merge

build.gradle

@@ -105,6 +105,12 @@ dependencies {
     runtimeOnly fg.deobf("curse.maven:balm-531761:${balm_cf_file_id}")
     compileOnly fg.deobf("curse.maven:craftingtweaks-233071:${crafting_tweaks_cf_file_id}")
     runtimeOnly fg.deobf("curse.maven:craftingtweaks-233071:${crafting_tweaks_cf_file_id}")
+    compileOnly fg.deobf("curse.maven:chipped-456956:${chipped_cf_file_id}")
+    runtimeOnly fg.deobf("curse.maven:chipped-456956:${chipped_cf_file_id}")
+    compileOnly fg.deobf("curse.maven:athena-841890:${athena_cf_file_id}")
+    runtimeOnly fg.deobf("curse.maven:athena-841890:${athena_cf_file_id}")
+    compileOnly fg.deobf("curse.maven:resourcefullib-570073:${resourcefullib_cf_file_id}")
+    runtimeOnly fg.deobf("curse.maven:resourcefullib-570073:${resourcefullib_cf_file_id}")
 /*
     compileOnly fg.deobf("vazkii.botania:Botania:${botania_version}:api")
     runtimeOnly fg.deobf("vazkii.botania:Botania:${botania_version}")

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.daemon=false
 
 mod_id=sophisticatedbackpacks
 mod_group_id=sophisticatedbackpacks
-mod_version=3.18.66
+mod_version=3.18.68
 sonar_project_key=sophisticatedbackpacks:SophisticatedBackpacks
 github_package_url=https://maven.pkg.github.com/P3pp3rF1y/SophisticatedBackpacks
 
@@ -22,5 +22,8 @@ botania_version=1.19.2-439-FORGE-SNAPSHOT
 patchouli_version=1.19.2-78-SNAPSHOT
 balm_cf_file_id=4597440
 crafting_tweaks_cf_file_id=4596466
-sc_version=[1.20.1-0.5.99,1.21)
+chipped_cf_file_id=4634856
+resourcefullib_cf_file_id=4851864
+athena_cf_file_id=4764357
+sc_version=[1.20.1-0.5.106,1.21)
 parchment_version=1.19.3-2023.03.12-1.20

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_compacting_upgrade.json

@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:advanced_compacting_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_deposit_upgrade.json

@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:advanced_deposit_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_feeding_upgrade.json

@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:advanced_feeding_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_filter_upgrade.json

@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:advanced_filter_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_magnet_upgrade.json

@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:advanced_magnet_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }

src/generated/resources/data/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
+  }
 }

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_pickup_upgrade.json

@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:advanced_pickup_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_pump_upgrade.json

@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:advanced_pump_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_refill_upgrade.json

@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:advanced_refill_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_restock_upgrade.json

@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:advanced_restock_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_tool_swapper_upgrade.json

@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:advanced_tool_swapper_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/advanced_void_upgrade.json

@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:advanced_void_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/auto_blasting_upgrade.json

@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:auto_blasting_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }

src/generated/resources/data/sophisticatedbackpacks/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
+  }
 }

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/auto_smelting_upgrade.json

@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:auto_smelting_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/auto_smoking_upgrade.json

@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:auto_smoking_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }

src/generated/resources/data/sophisticatedbackpacks/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
+  }
 }

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/backpack.json

@@ -28,6 +28,5 @@
     "recipes": [
       "sophisticatedbackpacks:backpack"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/battery_upgrade.json

@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:battery_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/blasting_upgrade.json

@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:blasting_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/blasting_upgrade_from_smelting_upgrade.json

@@ -30,6 +30,5 @@
     "recipes": [
       "sophisticatedbackpacks:blasting_upgrade_from_smelting_upgrade"
     ]
-  },
-  "sends_telemetry_event": true
+  }
 }

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/chipped/alchemy_bench_upgrade.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "sophisticatedbackpacks:chipped/alchemy_bench_upgrade"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_upgrade_base": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "sophisticatedbackpacks:upgrade_base"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "requirements": [
+    [
+      "has_upgrade_base",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sophisticatedbackpacks:chipped/alchemy_bench_upgrade"
+    ]
+  },
+  "sends_telemetry_event": true
+}

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/chipped/botanist_workbench_upgrade.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "sophisticatedbackpacks:chipped/botanist_workbench_upgrade"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_upgrade_base": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "sophisticatedbackpacks:upgrade_base"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "requirements": [
+    [
+      "has_upgrade_base",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sophisticatedbackpacks:chipped/botanist_workbench_upgrade"
+    ]
+  },
+  "sends_telemetry_event": true
+}

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/chipped/carpenters_table_upgrade.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "sophisticatedbackpacks:chipped/carpenters_table_upgrade"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_upgrade_base": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "sophisticatedbackpacks:upgrade_base"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "requirements": [
+    [
+      "has_upgrade_base",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sophisticatedbackpacks:chipped/carpenters_table_upgrade"
+    ]
+  },
+  "sends_telemetry_event": true
+}

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/chipped/glassblower_upgrade.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "sophisticatedbackpacks:chipped/glassblower_upgrade"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_upgrade_base": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "sophisticatedbackpacks:upgrade_base"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "requirements": [
+    [
+      "has_upgrade_base",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sophisticatedbackpacks:chipped/glassblower_upgrade"
+    ]
+  },
+  "sends_telemetry_event": true
+}