diff --git a/gradle.properties b/gradle.properties index 2e6a8b4a..9a2b507f 100644 --- 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/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_compacting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_compacting_upgrade.json index e2cf29ce..fdce60d9 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_compacting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/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,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:advanced_compacting_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_compacting_upgrade", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:advanced_compacting_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_deposit_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_deposit_upgrade.json index 72f7632b..d82a770e 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_deposit_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/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,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:advanced_deposit_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_deposit_upgrade", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:advanced_deposit_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_feeding_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_feeding_upgrade.json index b597bd29..b0c2592c 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_feeding_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/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,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:advanced_feeding_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_feeding_upgrade", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:advanced_feeding_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_filter_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_filter_upgrade.json index 3d5c4200..a175f8ed 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_filter_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/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,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:advanced_filter_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_filter_upgrade", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:advanced_filter_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_magnet_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_magnet_upgrade.json index b77e9dbe..108c2829 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_magnet_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/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,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:advanced_magnet_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_advanced_pickup_upgrade", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:advanced_magnet_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_magnet_upgrade_from_basic.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_magnet_upgrade_from_basic.json index b58845dd..e847ea98 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_magnet_upgrade_from_basic.json +++ b/src/generated/resources/data/sophisticatedbackpacks/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,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:advanced_magnet_upgrade_from_basic" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_magnet_upgrade", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:advanced_magnet_upgrade_from_basic" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_pickup_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_pickup_upgrade.json index 8fb9a7b6..e8714d42 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_pickup_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/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,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:advanced_pickup_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_pickup_upgrade", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:advanced_pickup_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_pump_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_pump_upgrade.json index 500072c8..87bc2dca 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_pump_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/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,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:advanced_pump_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_pump_upgrade", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:advanced_pump_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_refill_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_refill_upgrade.json index a3c6e763..189b3e46 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_refill_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_refill_upgrade.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:advanced_refill_upgrade" - ] - }, "criteria": { "has_refill_upgrade": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:advanced_refill_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_refill_upgrade", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:advanced_refill_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_restock_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_restock_upgrade.json index 9ed580a4..b052a27f 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_restock_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_restock_upgrade.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:advanced_restock_upgrade" - ] - }, "criteria": { "has_restock_upgrade": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:advanced_restock_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_restock_upgrade", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:advanced_restock_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_tool_swapper_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_tool_swapper_upgrade.json index fb2c5907..2ee0fdbc 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_tool_swapper_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_tool_swapper_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:advanced_tool_swapper_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:advanced_tool_swapper_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_tool_swapper_upgrade": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:advanced_tool_swapper_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_tool_swapper_upgrade", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:advanced_tool_swapper_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_void_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_void_upgrade.json index 57f2f511..42fe2cc9 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_void_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/advanced_void_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:advanced_void_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:advanced_void_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_void_upgrade": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:advanced_void_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_void_upgrade", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:advanced_void_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/auto_blasting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/auto_blasting_upgrade.json index 1fccda97..4650c123 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/auto_blasting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/auto_blasting_upgrade.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:auto_blasting_upgrade" - ] - }, "criteria": { "has_blasting_upgrade": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:auto_blasting_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_blasting_upgrade", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:auto_blasting_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/auto_blasting_upgrade_from_auto_smelting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/auto_blasting_upgrade_from_auto_smelting_upgrade.json index e9a87b33..2274017e 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/auto_blasting_upgrade_from_auto_smelting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/auto_blasting_upgrade_from_auto_smelting_upgrade.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:auto_blasting_upgrade_from_auto_smelting_upgrade" - ] - }, "criteria": { "has_auto_smelting_upgrade": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:auto_blasting_upgrade_from_auto_smelting_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_auto_smelting_upgrade", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:auto_blasting_upgrade_from_auto_smelting_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/auto_smelting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/auto_smelting_upgrade.json index 9775e8db..d03dc622 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/auto_smelting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/auto_smelting_upgrade.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:auto_smelting_upgrade" - ] - }, "criteria": { "has_smelting_upgrade": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:auto_smelting_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_smelting_upgrade", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:auto_smelting_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/auto_smoking_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/auto_smoking_upgrade.json index 601225e3..2453ff1f 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/auto_smoking_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/auto_smoking_upgrade.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:auto_smoking_upgrade" - ] - }, "criteria": { "has_smoking_upgrade": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:auto_smoking_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_smoking_upgrade", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:auto_smoking_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/auto_smoking_upgrade_from_auto_smelting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/auto_smoking_upgrade_from_auto_smelting_upgrade.json index 700cf46a..d2f23e7d 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/auto_smoking_upgrade_from_auto_smelting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/auto_smoking_upgrade_from_auto_smelting_upgrade.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:auto_smoking_upgrade_from_auto_smelting_upgrade" - ] - }, "criteria": { "has_auto_smelting_upgrade": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:auto_smoking_upgrade_from_auto_smelting_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_auto_smelting_upgrade", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:auto_smoking_upgrade_from_auto_smelting_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/backpack.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/backpack.json index 8557b4d0..5045f24d 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/backpack.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/backpack.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:backpack" - ] - }, "criteria": { "has_leather": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "forge:leather" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:backpack" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_leather", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:backpack" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/battery_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/battery_upgrade.json index 76b83e81..e2d3b777 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/battery_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/battery_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:battery_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:battery_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:battery_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:battery_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/blasting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/blasting_upgrade.json index 39bd0d8b..65b279f1 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/blasting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/blasting_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:blasting_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:blasting_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:blasting_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:blasting_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/blasting_upgrade_from_smelting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/blasting_upgrade_from_smelting_upgrade.json index 3a3d7712..21e6373e 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/blasting_upgrade_from_smelting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/blasting_upgrade_from_smelting_upgrade.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:blasting_upgrade_from_smelting_upgrade" - ] - }, "criteria": { "has_smelting_upgrade": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:blasting_upgrade_from_smelting_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_smelting_upgrade", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:blasting_upgrade_from_smelting_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/botanist_workbench_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/botanist_workbench_upgrade.json index 3a1240f3..d54473a4 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/botanist_workbench_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/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,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:chipped/botanist_workbench_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:chipped/botanist_workbench_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/carpenter_workbench_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/carpenter_workbench_upgrade.json index bbf764e1..0f700192 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/carpenter_workbench_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/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,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:chipped/carpenter_workbench_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:chipped/carpenter_workbench_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/glassblower_workbench_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/glassblower_workbench_upgrade.json index c60504f4..8f462d54 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/glassblower_workbench_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/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,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:chipped/glassblower_workbench_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:chipped/glassblower_workbench_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/mason_workbench_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/mason_workbench_upgrade.json index 8e62f903..46b5adfa 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/mason_workbench_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/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,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:chipped/mason_workbench_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:chipped/mason_workbench_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/philosopher_workbench_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/philosopher_workbench_upgrade.json index 7afa7187..e2e97eec 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/philosopher_workbench_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/philosopher_workbench_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:chipped/philosopher_workbench_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:chipped/philosopher_workbench_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:chipped/philosopher_workbench_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:chipped/philosopher_workbench_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/shepherd_workbench_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/shepherd_workbench_upgrade.json index 32b04ce9..969ac403 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/shepherd_workbench_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/shepherd_workbench_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:chipped/shepherd_workbench_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:chipped/shepherd_workbench_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:chipped/shepherd_workbench_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:chipped/shepherd_workbench_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/tinkerer_workbench_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/tinkerer_workbench_upgrade.json index 2ac690c1..ea2af26c 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/tinkerer_workbench_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/tinkerer_workbench_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:chipped/tinkerer_workbench_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:chipped/tinkerer_workbench_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:chipped/tinkerer_workbench_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:chipped/tinkerer_workbench_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/compacting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/compacting_upgrade.json index 5a38667a..99c43297 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/compacting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/compacting_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:compacting_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:compacting_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:compacting_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:compacting_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/crafting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/crafting_upgrade.json index db8393e1..0b05a42d 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/crafting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/crafting_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:crafting_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:crafting_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:crafting_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:crafting_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/deposit_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/deposit_upgrade.json index eddebe4e..42f67354 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/deposit_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/deposit_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:deposit_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:deposit_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:deposit_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:deposit_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/diamond_backpack.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/diamond_backpack.json index c652ad6a..321de918 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/diamond_backpack.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/diamond_backpack.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:diamond_backpack" - ] - }, "criteria": { "has_gold_backpack": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:diamond_backpack" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_gold_backpack", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:diamond_backpack" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/everlasting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/everlasting_upgrade.json index 06bfc128..756a44a6 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/everlasting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/everlasting_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:everlasting_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:everlasting_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:everlasting_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:everlasting_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/feeding_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/feeding_upgrade.json index a260e7bb..0353c5d9 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/feeding_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/feeding_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:feeding_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:feeding_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:feeding_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:feeding_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/filter_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/filter_upgrade.json index b00f2748..57f65818 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/filter_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/filter_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:filter_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:filter_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:filter_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:filter_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/gold_backpack.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/gold_backpack.json index a79948b3..55cae5a6 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/gold_backpack.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/gold_backpack.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:gold_backpack" - ] - }, "criteria": { "has_iron_backpack": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:gold_backpack" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_iron_backpack", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:gold_backpack" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/inception_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/inception_upgrade.json index 701690fd..1873b981 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/inception_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/inception_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:inception_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:inception_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:inception_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:inception_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/iron_backpack.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/iron_backpack.json index bd800da1..ebf97c49 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/iron_backpack.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/iron_backpack.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:iron_backpack" - ] - }, "criteria": { "has_backpack": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:iron_backpack" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_backpack", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:iron_backpack" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/jukebox_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/jukebox_upgrade.json index 6fc76d9b..6e8ce7a7 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/jukebox_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/jukebox_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:jukebox_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:jukebox_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:jukebox_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:jukebox_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/magnet_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/magnet_upgrade.json index c7da1ca9..176db10b 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/magnet_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/magnet_upgrade.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:magnet_upgrade" - ] - }, "criteria": { "has_pickup_upgrade": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:magnet_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_pickup_upgrade", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:magnet_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/netherite_backpack.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/netherite_backpack.json index 23907485..f235ed44 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/netherite_backpack.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/netherite_backpack.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:netherite_backpack" - ] - }, "criteria": { "has_diamond_backpack": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:netherite_backpack" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_diamond_backpack", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:netherite_backpack" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/pickup_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/pickup_upgrade.json index 4512bf46..dfc56c1b 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/pickup_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/pickup_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:pickup_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:pickup_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:pickup_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:pickup_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/pump_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/pump_upgrade.json index 24bf34fa..5a762fbd 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/pump_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/pump_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:pump_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:pump_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:pump_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:pump_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/refill_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/refill_upgrade.json index c8f804cf..3b867e3b 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/refill_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/refill_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:refill_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:refill_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:refill_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:refill_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/restock_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/restock_upgrade.json index e0a96efb..387ef537 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/restock_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/restock_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:restock_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:restock_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:restock_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:restock_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/smelting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/smelting_upgrade.json index ad64b827..ef959807 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/smelting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/smelting_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:smelting_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:smelting_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:smelting_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:smelting_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/smoking_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/smoking_upgrade.json index 0a097dfb..005f9ce7 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/smoking_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/smoking_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:smoking_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:smoking_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:smoking_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:smoking_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/smoking_upgrade_from_smelting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/smoking_upgrade_from_smelting_upgrade.json index 749e420f..d56b2b0d 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/smoking_upgrade_from_smelting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/smoking_upgrade_from_smelting_upgrade.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:smoking_upgrade_from_smelting_upgrade" - ] - }, "criteria": { "has_smelting_upgrade": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:smoking_upgrade_from_smelting_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_smelting_upgrade", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:smoking_upgrade_from_smelting_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/stack_upgrade_tier_1.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/stack_upgrade_tier_1.json index f691c2b4..9cfaa010 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/stack_upgrade_tier_1.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/stack_upgrade_tier_1.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:stack_upgrade_tier_1" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:stack_upgrade_tier_1" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:stack_upgrade_tier_1" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:stack_upgrade_tier_1" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/stack_upgrade_tier_2.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/stack_upgrade_tier_2.json index 7e98df22..07ef6146 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/stack_upgrade_tier_2.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/stack_upgrade_tier_2.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:stack_upgrade_tier_2" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:stack_upgrade_tier_2" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:stack_upgrade_tier_2" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:stack_upgrade_tier_2" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/stack_upgrade_tier_3.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/stack_upgrade_tier_3.json index 4a05a15b..4bb983e6 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/stack_upgrade_tier_3.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/stack_upgrade_tier_3.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:stack_upgrade_tier_3" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:stack_upgrade_tier_3" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:stack_upgrade_tier_3" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:stack_upgrade_tier_3" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/stack_upgrade_tier_4.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/stack_upgrade_tier_4.json index 22fec868..676002d5 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/stack_upgrade_tier_4.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/stack_upgrade_tier_4.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:stack_upgrade_tier_4" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:stack_upgrade_tier_4" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:stack_upgrade_tier_4" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:stack_upgrade_tier_4" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/stonecutter_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/stonecutter_upgrade.json index 2d0e41a7..598707de 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/stonecutter_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/stonecutter_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:stonecutter_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:stonecutter_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:stonecutter_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:stonecutter_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/tank_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/tank_upgrade.json index 31ae6ddf..9119c923 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/tank_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/tank_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:tank_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:tank_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:tank_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:tank_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/tool_swapper_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/tool_swapper_upgrade.json index 2c863f40..47b753fe 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/tool_swapper_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/tool_swapper_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:tool_swapper_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:tool_swapper_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:tool_swapper_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:tool_swapper_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/upgrade_base.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/upgrade_base.json index 9ef601dc..3defe71e 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/upgrade_base.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/upgrade_base.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:upgrade_base" - ] - }, "criteria": { "has_leather": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "forge:leather" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:upgrade_base" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_leather", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:upgrade_base" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/void_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/void_upgrade.json index 79969ddc..4778ed51 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/void_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/void_upgrade.json @@ -1,13 +1,13 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:void_upgrade" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedbackpacks:void_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_upgrade_base": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +16,8 @@ ] } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "sophisticatedbackpacks:void_upgrade" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_upgrade_base", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:void_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/xp_pump_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/xp_pump_upgrade.json index fdf8332b..be982939 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/xp_pump_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/xp_pump_upgrade.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "sophisticatedbackpacks:xp_pump_upgrade" - ] - }, "criteria": { "has_advanced_pump_upgrade": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "sophisticatedbackpacks:xp_pump_upgrade" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_advanced_pump_upgrade", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "sophisticatedbackpacks:xp_pump_upgrade" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/blocks/backpack.json b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/blocks/backpack.json index d638ec05..505006f6 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/blocks/backpack.json +++ b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/blocks/backpack.json @@ -2,8 +2,6 @@ "type": "minecraft:block", "pools": [ { - "name": "main", - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -15,7 +13,9 @@ { "function": "sophisticatedbackpacks:copy_backpack_data" } - ] + ], + "name": "main", + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/blocks/diamond_backpack.json b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/blocks/diamond_backpack.json index d778176d..7cfb07b4 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/blocks/diamond_backpack.json +++ b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/blocks/diamond_backpack.json @@ -2,8 +2,6 @@ "type": "minecraft:block", "pools": [ { - "name": "main", - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -15,7 +13,9 @@ { "function": "sophisticatedbackpacks:copy_backpack_data" } - ] + ], + "name": "main", + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/blocks/gold_backpack.json b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/blocks/gold_backpack.json index aef65e66..8d3c0ada 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/blocks/gold_backpack.json +++ b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/blocks/gold_backpack.json @@ -2,8 +2,6 @@ "type": "minecraft:block", "pools": [ { - "name": "main", - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -15,7 +13,9 @@ { "function": "sophisticatedbackpacks:copy_backpack_data" } - ] + ], + "name": "main", + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/blocks/iron_backpack.json b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/blocks/iron_backpack.json index 84208d52..390a1c65 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/blocks/iron_backpack.json +++ b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/blocks/iron_backpack.json @@ -2,8 +2,6 @@ "type": "minecraft:block", "pools": [ { - "name": "main", - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -15,7 +13,9 @@ { "function": "sophisticatedbackpacks:copy_backpack_data" } - ] + ], + "name": "main", + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/blocks/netherite_backpack.json b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/blocks/netherite_backpack.json index b76c2102..d710c9c8 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/blocks/netherite_backpack.json +++ b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/blocks/netherite_backpack.json @@ -2,8 +2,6 @@ "type": "minecraft:block", "pools": [ { - "name": "main", - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -15,7 +13,9 @@ { "function": "sophisticatedbackpacks:copy_backpack_data" } - ] + ], + "name": "main", + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/abandoned_mineshaft.json b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/abandoned_mineshaft.json index 0e9d9f61..caec3251 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/abandoned_mineshaft.json +++ b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/abandoned_mineshaft.json @@ -2,19 +2,17 @@ "type": "minecraft:chest", "pools": [ { - "name": "main", - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "weight": 5, - "name": "sophisticatedbackpacks:backpack" + "name": "sophisticatedbackpacks:backpack", + "weight": 5 }, { "type": "minecraft:item", - "weight": 3, - "name": "sophisticatedbackpacks:iron_backpack" + "name": "sophisticatedbackpacks:iron_backpack", + "weight": 3 }, { "type": "minecraft:item", @@ -22,14 +20,16 @@ }, { "type": "minecraft:item", - "weight": 2, - "name": "sophisticatedbackpacks:magnet_upgrade" + "name": "sophisticatedbackpacks:magnet_upgrade", + "weight": 2 }, { "type": "minecraft:empty", "weight": 89 } - ] + ], + "name": "main", + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/bastion_treasure.json b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/bastion_treasure.json index 53eeee30..88c7033a 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/bastion_treasure.json +++ b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/bastion_treasure.json @@ -2,30 +2,30 @@ "type": "minecraft:chest", "pools": [ { - "name": "main", - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "weight": 3, - "name": "sophisticatedbackpacks:iron_backpack" + "name": "sophisticatedbackpacks:iron_backpack", + "weight": 3 }, { "type": "minecraft:item", - "weight": 5, - "name": "sophisticatedbackpacks:gold_backpack" + "name": "sophisticatedbackpacks:gold_backpack", + "weight": 5 }, { "type": "minecraft:item", - "weight": 2, - "name": "sophisticatedbackpacks:feeding_upgrade" + "name": "sophisticatedbackpacks:feeding_upgrade", + "weight": 2 }, { "type": "minecraft:empty", "weight": 90 } - ] + ], + "name": "main", + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/desert_pyramid.json b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/desert_pyramid.json index 0e9d9f61..caec3251 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/desert_pyramid.json +++ b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/desert_pyramid.json @@ -2,19 +2,17 @@ "type": "minecraft:chest", "pools": [ { - "name": "main", - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "weight": 5, - "name": "sophisticatedbackpacks:backpack" + "name": "sophisticatedbackpacks:backpack", + "weight": 5 }, { "type": "minecraft:item", - "weight": 3, - "name": "sophisticatedbackpacks:iron_backpack" + "name": "sophisticatedbackpacks:iron_backpack", + "weight": 3 }, { "type": "minecraft:item", @@ -22,14 +20,16 @@ }, { "type": "minecraft:item", - "weight": 2, - "name": "sophisticatedbackpacks:magnet_upgrade" + "name": "sophisticatedbackpacks:magnet_upgrade", + "weight": 2 }, { "type": "minecraft:empty", "weight": 89 } - ] + ], + "name": "main", + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/end_city_treasure.json b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/end_city_treasure.json index f4c9233d..1416b74f 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/end_city_treasure.json +++ b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/end_city_treasure.json @@ -2,30 +2,30 @@ "type": "minecraft:chest", "pools": [ { - "name": "main", - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "weight": 3, - "name": "sophisticatedbackpacks:diamond_backpack" + "name": "sophisticatedbackpacks:diamond_backpack", + "weight": 3 }, { "type": "minecraft:item", - "weight": 5, - "name": "sophisticatedbackpacks:gold_backpack" + "name": "sophisticatedbackpacks:gold_backpack", + "weight": 5 }, { "type": "minecraft:item", - "weight": 2, - "name": "sophisticatedbackpacks:advanced_magnet_upgrade" + "name": "sophisticatedbackpacks:advanced_magnet_upgrade", + "weight": 2 }, { "type": "minecraft:empty", "weight": 90 } - ] + ], + "name": "main", + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/nether_bridge.json b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/nether_bridge.json index 23f5be5a..ec630c4b 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/nether_bridge.json +++ b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/nether_bridge.json @@ -2,30 +2,30 @@ "type": "minecraft:chest", "pools": [ { - "name": "main", - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "weight": 5, - "name": "sophisticatedbackpacks:iron_backpack" + "name": "sophisticatedbackpacks:iron_backpack", + "weight": 5 }, { "type": "minecraft:item", - "weight": 3, - "name": "sophisticatedbackpacks:gold_backpack" + "name": "sophisticatedbackpacks:gold_backpack", + "weight": 3 }, { "type": "minecraft:item", - "weight": 2, - "name": "sophisticatedbackpacks:feeding_upgrade" + "name": "sophisticatedbackpacks:feeding_upgrade", + "weight": 2 }, { "type": "minecraft:empty", "weight": 90 } - ] + ], + "name": "main", + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/shipwreck_treasure.json b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/shipwreck_treasure.json index 100d3320..5f561627 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/shipwreck_treasure.json +++ b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/shipwreck_treasure.json @@ -2,30 +2,30 @@ "type": "minecraft:chest", "pools": [ { - "name": "main", - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "weight": 4, - "name": "sophisticatedbackpacks:iron_backpack" + "name": "sophisticatedbackpacks:iron_backpack", + "weight": 4 }, { "type": "minecraft:item", - "weight": 2, - "name": "sophisticatedbackpacks:gold_backpack" + "name": "sophisticatedbackpacks:gold_backpack", + "weight": 2 }, { "type": "minecraft:item", - "weight": 2, - "name": "sophisticatedbackpacks:advanced_magnet_upgrade" + "name": "sophisticatedbackpacks:advanced_magnet_upgrade", + "weight": 2 }, { "type": "minecraft:empty", "weight": 92 } - ] + ], + "name": "main", + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/simple_dungeon.json b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/simple_dungeon.json index deae6cbf..5cd18dba 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/simple_dungeon.json +++ b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/simple_dungeon.json @@ -2,30 +2,30 @@ "type": "minecraft:chest", "pools": [ { - "name": "main", - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "weight": 4, - "name": "sophisticatedbackpacks:backpack" + "name": "sophisticatedbackpacks:backpack", + "weight": 4 }, { "type": "minecraft:item", - "weight": 2, - "name": "sophisticatedbackpacks:iron_backpack" + "name": "sophisticatedbackpacks:iron_backpack", + "weight": 2 }, { "type": "minecraft:item", - "weight": 2, - "name": "sophisticatedbackpacks:pickup_upgrade" + "name": "sophisticatedbackpacks:pickup_upgrade", + "weight": 2 }, { "type": "minecraft:empty", "weight": 92 } - ] + ], + "name": "main", + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/woodland_mansion.json b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/woodland_mansion.json index 100d3320..5f561627 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/woodland_mansion.json +++ b/src/generated/resources/data/sophisticatedbackpacks/loot_tables/inject/chests/woodland_mansion.json @@ -2,30 +2,30 @@ "type": "minecraft:chest", "pools": [ { - "name": "main", - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "weight": 4, - "name": "sophisticatedbackpacks:iron_backpack" + "name": "sophisticatedbackpacks:iron_backpack", + "weight": 4 }, { "type": "minecraft:item", - "weight": 2, - "name": "sophisticatedbackpacks:gold_backpack" + "name": "sophisticatedbackpacks:gold_backpack", + "weight": 2 }, { "type": "minecraft:item", - "weight": 2, - "name": "sophisticatedbackpacks:advanced_magnet_upgrade" + "name": "sophisticatedbackpacks:advanced_magnet_upgrade", + "weight": 2 }, { "type": "minecraft:empty", "weight": 92 } - ] + ], + "name": "main", + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_compacting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_compacting_upgrade.json index c87465ca..19b0cffd 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_compacting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_compacting_upgrade.json @@ -2,16 +2,14 @@ "type": "sophisticatedcore:upgrade_next_tier", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:advanced_compacting_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:advanced_compacting_upgrade" } ], - "pattern": [ - " D ", - "GCG", - "RRR" - ], "key": { + "C": { + "item": "sophisticatedbackpacks:compacting_upgrade" + }, "D": { "tag": "forge:gems/diamond" }, @@ -20,11 +18,13 @@ }, "R": { "tag": "forge:dusts/redstone" - }, - "C": { - "item": "sophisticatedbackpacks:compacting_upgrade" } }, + "pattern": [ + " D ", + "GCG", + "RRR" + ], "result": { "item": "sophisticatedbackpacks:advanced_compacting_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_deposit_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_deposit_upgrade.json index ed9bd38d..d257d4ce 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_deposit_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_deposit_upgrade.json @@ -2,15 +2,10 @@ "type": "sophisticatedcore:upgrade_next_tier", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:advanced_deposit_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:advanced_deposit_upgrade" } ], - "pattern": [ - " D ", - "GVG", - "RRR" - ], "key": { "D": { "tag": "forge:gems/diamond" @@ -25,6 +20,11 @@ "item": "sophisticatedbackpacks:deposit_upgrade" } }, + "pattern": [ + " D ", + "GVG", + "RRR" + ], "result": { "item": "sophisticatedbackpacks:advanced_deposit_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_feeding_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_feeding_upgrade.json index 2e194983..97adf64a 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_feeding_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_feeding_upgrade.json @@ -2,15 +2,10 @@ "type": "sophisticatedcore:upgrade_next_tier", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:advanced_feeding_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:advanced_feeding_upgrade" } ], - "pattern": [ - " D ", - "GVG", - "RRR" - ], "key": { "D": { "tag": "forge:gems/diamond" @@ -25,6 +20,11 @@ "item": "sophisticatedbackpacks:feeding_upgrade" } }, + "pattern": [ + " D ", + "GVG", + "RRR" + ], "result": { "item": "sophisticatedbackpacks:advanced_feeding_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_filter_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_filter_upgrade.json index 0577e9c8..97567fc5 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_filter_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_filter_upgrade.json @@ -2,25 +2,25 @@ "type": "sophisticatedcore:upgrade_next_tier", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:advanced_filter_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:advanced_filter_upgrade" } ], - "pattern": [ - "GPG", - "RRR" - ], "key": { "G": { "tag": "forge:ingots/gold" }, - "R": { - "tag": "forge:dusts/redstone" - }, "P": { "item": "sophisticatedbackpacks:filter_upgrade" + }, + "R": { + "tag": "forge:dusts/redstone" } }, + "pattern": [ + "GPG", + "RRR" + ], "result": { "item": "sophisticatedbackpacks:advanced_filter_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_magnet_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_magnet_upgrade.json index cb52876b..de8e6bd7 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_magnet_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_magnet_upgrade.json @@ -2,15 +2,10 @@ "type": "sophisticatedcore:upgrade_next_tier", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:advanced_magnet_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:advanced_magnet_upgrade" } ], - "pattern": [ - "EIE", - "IPI", - "R L" - ], "key": { "E": { "tag": "forge:ender_pearls" @@ -18,16 +13,21 @@ "I": { "tag": "forge:ingots/iron" }, - "R": { - "tag": "forge:dusts/redstone" - }, "L": { "tag": "forge:gems/lapis" }, "P": { "item": "sophisticatedbackpacks:advanced_pickup_upgrade" + }, + "R": { + "tag": "forge:dusts/redstone" } }, + "pattern": [ + "EIE", + "IPI", + "R L" + ], "result": { "item": "sophisticatedbackpacks:advanced_magnet_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_magnet_upgrade_from_basic.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_magnet_upgrade_from_basic.json index 9f2c1de3..472fccdd 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_magnet_upgrade_from_basic.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_magnet_upgrade_from_basic.json @@ -2,15 +2,10 @@ "type": "sophisticatedcore:upgrade_next_tier", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:advanced_magnet_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:advanced_magnet_upgrade" } ], - "pattern": [ - " D ", - "GMG", - "RRR" - ], "key": { "D": { "tag": "forge:gems/diamond" @@ -18,13 +13,18 @@ "G": { "tag": "forge:ingots/gold" }, - "R": { - "tag": "forge:dusts/redstone" - }, "M": { "item": "sophisticatedbackpacks:magnet_upgrade" + }, + "R": { + "tag": "forge:dusts/redstone" } }, + "pattern": [ + " D ", + "GMG", + "RRR" + ], "result": { "item": "sophisticatedbackpacks:advanced_magnet_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_pickup_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_pickup_upgrade.json index 2b25a366..efecbe9c 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_pickup_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_pickup_upgrade.json @@ -2,15 +2,10 @@ "type": "sophisticatedcore:upgrade_next_tier", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:advanced_pickup_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:advanced_pickup_upgrade" } ], - "pattern": [ - " D ", - "GPG", - "RRR" - ], "key": { "D": { "tag": "forge:gems/diamond" @@ -18,13 +13,18 @@ "G": { "tag": "forge:ingots/gold" }, - "R": { - "tag": "forge:dusts/redstone" - }, "P": { "item": "sophisticatedbackpacks:pickup_upgrade" + }, + "R": { + "tag": "forge:dusts/redstone" } }, + "pattern": [ + " D ", + "GPG", + "RRR" + ], "result": { "item": "sophisticatedbackpacks:advanced_pickup_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_pump_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_pump_upgrade.json index 92d5be17..cfe8fcd1 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_pump_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_pump_upgrade.json @@ -2,32 +2,32 @@ "type": "sophisticatedcore:upgrade_next_tier", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:advanced_pump_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:advanced_pump_upgrade" } ], - "pattern": [ - "DID", - "GPG", - "RRR" - ], "key": { - "I": { - "item": "minecraft:dispenser" - }, "D": { "tag": "forge:gems/diamond" }, "G": { "tag": "forge:ingots/gold" }, - "R": { - "tag": "forge:dusts/redstone" + "I": { + "item": "minecraft:dispenser" }, "P": { "item": "sophisticatedbackpacks:pump_upgrade" + }, + "R": { + "tag": "forge:dusts/redstone" } }, + "pattern": [ + "DID", + "GPG", + "RRR" + ], "result": { "item": "sophisticatedbackpacks:advanced_pump_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_refill_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_refill_upgrade.json index a92dbd9c..094fd105 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_refill_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_refill_upgrade.json @@ -2,29 +2,29 @@ "type": "sophisticatedcore:upgrade_next_tier", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:advanced_refill_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:advanced_refill_upgrade" } ], - "pattern": [ - " D ", - "GFG", - "RRR" - ], "key": { "D": { "tag": "forge:gems/diamond" }, + "F": { + "item": "sophisticatedbackpacks:refill_upgrade" + }, "G": { "tag": "forge:ingots/gold" }, "R": { "tag": "forge:dusts/redstone" - }, - "F": { - "item": "sophisticatedbackpacks:refill_upgrade" } }, + "pattern": [ + " D ", + "GFG", + "RRR" + ], "result": { "item": "sophisticatedbackpacks:advanced_refill_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_restock_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_restock_upgrade.json index 53658b2b..eb82c386 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_restock_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_restock_upgrade.json @@ -2,15 +2,10 @@ "type": "sophisticatedcore:upgrade_next_tier", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:advanced_restock_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:advanced_restock_upgrade" } ], - "pattern": [ - " D ", - "GVG", - "RRR" - ], "key": { "D": { "tag": "forge:gems/diamond" @@ -25,6 +20,11 @@ "item": "sophisticatedbackpacks:restock_upgrade" } }, + "pattern": [ + " D ", + "GVG", + "RRR" + ], "result": { "item": "sophisticatedbackpacks:advanced_restock_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_tool_swapper_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_tool_swapper_upgrade.json index 172f4b39..cd6a7b3b 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_tool_swapper_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_tool_swapper_upgrade.json @@ -2,15 +2,10 @@ "type": "sophisticatedcore:upgrade_next_tier", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:advanced_tool_swapper_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:advanced_tool_swapper_upgrade" } ], - "pattern": [ - " D ", - "GVG", - "RRR" - ], "key": { "D": { "tag": "forge:gems/diamond" @@ -25,6 +20,11 @@ "item": "sophisticatedbackpacks:tool_swapper_upgrade" } }, + "pattern": [ + " D ", + "GVG", + "RRR" + ], "result": { "item": "sophisticatedbackpacks:advanced_tool_swapper_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_void_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_void_upgrade.json index 5065ae68..1e172d21 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_void_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/advanced_void_upgrade.json @@ -2,15 +2,10 @@ "type": "sophisticatedcore:upgrade_next_tier", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:advanced_void_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:advanced_void_upgrade" } ], - "pattern": [ - " D ", - "GVG", - "RRR" - ], "key": { "D": { "tag": "forge:gems/diamond" @@ -25,6 +20,11 @@ "item": "sophisticatedbackpacks:void_upgrade" } }, + "pattern": [ + " D ", + "GVG", + "RRR" + ], "result": { "item": "sophisticatedbackpacks:advanced_void_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/auto_blasting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/auto_blasting_upgrade.json index 2a46c827..3832c492 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/auto_blasting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/auto_blasting_upgrade.json @@ -2,15 +2,10 @@ "type": "sophisticatedcore:upgrade_next_tier", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:auto_blasting_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:auto_blasting_upgrade" } ], - "pattern": [ - "DHD", - "RSH", - "GHG" - ], "key": { "D": { "tag": "forge:gems/diamond" @@ -18,16 +13,21 @@ "G": { "tag": "forge:ingots/gold" }, - "R": { - "tag": "forge:dusts/redstone" - }, "H": { "item": "minecraft:hopper" }, + "R": { + "tag": "forge:dusts/redstone" + }, "S": { "item": "sophisticatedbackpacks:blasting_upgrade" } }, + "pattern": [ + "DHD", + "RSH", + "GHG" + ], "result": { "item": "sophisticatedbackpacks:auto_blasting_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/auto_blasting_upgrade_from_auto_smelting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/auto_blasting_upgrade_from_auto_smelting_upgrade.json index fc46d353..da14fc3c 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/auto_blasting_upgrade_from_auto_smelting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/auto_blasting_upgrade_from_auto_smelting_upgrade.json @@ -2,26 +2,26 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:auto_blasting_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:auto_blasting_upgrade" } ], - "pattern": [ - "III", - "ISI", - "TTT" - ], "key": { - "S": { - "item": "sophisticatedbackpacks:auto_smelting_upgrade" - }, "I": { "tag": "forge:ingots/iron" }, + "S": { + "item": "sophisticatedbackpacks:auto_smelting_upgrade" + }, "T": { "item": "minecraft:smooth_stone" } }, + "pattern": [ + "III", + "ISI", + "TTT" + ], "result": { "item": "sophisticatedbackpacks:auto_blasting_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/auto_smelting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/auto_smelting_upgrade.json index 9d6e6e91..d5f2d19b 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/auto_smelting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/auto_smelting_upgrade.json @@ -2,15 +2,10 @@ "type": "sophisticatedcore:upgrade_next_tier", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:auto_smelting_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:auto_smelting_upgrade" } ], - "pattern": [ - "DHD", - "RSH", - "GHG" - ], "key": { "D": { "tag": "forge:gems/diamond" @@ -18,16 +13,21 @@ "G": { "tag": "forge:ingots/gold" }, - "R": { - "tag": "forge:dusts/redstone" - }, "H": { "item": "minecraft:hopper" }, + "R": { + "tag": "forge:dusts/redstone" + }, "S": { "item": "sophisticatedbackpacks:smelting_upgrade" } }, + "pattern": [ + "DHD", + "RSH", + "GHG" + ], "result": { "item": "sophisticatedbackpacks:auto_smelting_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/auto_smoking_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/auto_smoking_upgrade.json index 4e8b583b..3e6a9630 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/auto_smoking_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/auto_smoking_upgrade.json @@ -2,15 +2,10 @@ "type": "sophisticatedcore:upgrade_next_tier", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:auto_smoking_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:auto_smoking_upgrade" } ], - "pattern": [ - "DHD", - "RSH", - "GHG" - ], "key": { "D": { "tag": "forge:gems/diamond" @@ -18,16 +13,21 @@ "G": { "tag": "forge:ingots/gold" }, - "R": { - "tag": "forge:dusts/redstone" - }, "H": { "item": "minecraft:hopper" }, + "R": { + "tag": "forge:dusts/redstone" + }, "S": { "item": "sophisticatedbackpacks:smoking_upgrade" } }, + "pattern": [ + "DHD", + "RSH", + "GHG" + ], "result": { "item": "sophisticatedbackpacks:auto_smoking_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/auto_smoking_upgrade_from_auto_smelting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/auto_smoking_upgrade_from_auto_smelting_upgrade.json index 3d5efbae..e7127362 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/auto_smoking_upgrade_from_auto_smelting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/auto_smoking_upgrade_from_auto_smelting_upgrade.json @@ -2,23 +2,23 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:auto_smoking_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:auto_smoking_upgrade" } ], - "pattern": [ - " L ", - "LSL", - " L " - ], "key": { - "S": { - "item": "sophisticatedbackpacks:auto_smelting_upgrade" - }, "L": { "tag": "minecraft:logs" + }, + "S": { + "item": "sophisticatedbackpacks:auto_smelting_upgrade" } }, + "pattern": [ + " L ", + "LSL", + " L " + ], "result": { "item": "sophisticatedbackpacks:auto_smoking_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/backpack.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/backpack.json index 2eb880d7..46f8d6dd 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/backpack.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/backpack.json @@ -2,26 +2,26 @@ "type": "sophisticatedbackpacks:basic_backpack", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:backpack", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:backpack" } ], - "pattern": [ - "SLS", - "SCS", - "LLL" - ], "key": { - "L": { - "tag": "forge:leather" - }, "C": { "tag": "forge:chests/wooden" }, + "L": { + "tag": "forge:leather" + }, "S": { "tag": "forge:string" } }, + "pattern": [ + "SLS", + "SCS", + "LLL" + ], "result": { "item": "sophisticatedbackpacks:backpack" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/battery_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/battery_upgrade.json index 7682f4e9..70def5af 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/battery_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/battery_upgrade.json @@ -2,26 +2,26 @@ "type": "sophisticatedcore:upgrade_next_tier", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:battery_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:battery_upgrade" } ], - "pattern": [ - "GRG", - "RBR", - "GRG" - ], "key": { - "R": { - "tag": "forge:storage_blocks/redstone" + "B": { + "item": "sophisticatedbackpacks:upgrade_base" }, "G": { "tag": "forge:ingots/gold" }, - "B": { - "item": "sophisticatedbackpacks:upgrade_base" + "R": { + "tag": "forge:storage_blocks/redstone" } }, + "pattern": [ + "GRG", + "RBR", + "GRG" + ], "result": { "item": "sophisticatedbackpacks:battery_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/blasting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/blasting_upgrade.json index d0d996f8..c634815e 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/blasting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/blasting_upgrade.json @@ -2,29 +2,29 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:blasting_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:blasting_upgrade" } ], - "pattern": [ - "RIR", - "IBI", - "RFR" - ], "key": { "B": { "item": "sophisticatedbackpacks:upgrade_base" }, - "R": { - "tag": "forge:dusts/redstone" + "F": { + "item": "minecraft:blast_furnace" }, "I": { "tag": "forge:ingots/iron" }, - "F": { - "item": "minecraft:blast_furnace" + "R": { + "tag": "forge:dusts/redstone" } }, + "pattern": [ + "RIR", + "IBI", + "RFR" + ], "result": { "item": "sophisticatedbackpacks:blasting_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/blasting_upgrade_from_smelting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/blasting_upgrade_from_smelting_upgrade.json index 6968a0dc..21f845d7 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/blasting_upgrade_from_smelting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/blasting_upgrade_from_smelting_upgrade.json @@ -2,26 +2,26 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:blasting_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:blasting_upgrade" } ], - "pattern": [ - "III", - "ISI", - "TTT" - ], "key": { - "S": { - "item": "sophisticatedbackpacks:smelting_upgrade" - }, "I": { "tag": "forge:ingots/iron" }, + "S": { + "item": "sophisticatedbackpacks:smelting_upgrade" + }, "T": { "item": "minecraft:smooth_stone" } }, + "pattern": [ + "III", + "ISI", + "TTT" + ], "result": { "item": "sophisticatedbackpacks:blasting_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/botanist_workbench_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/botanist_workbench_upgrade.json index f945412f..d3934d0e 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/botanist_workbench_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/botanist_workbench_upgrade.json @@ -2,33 +2,33 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "modid": "chipped", - "type": "forge:mod_loaded" + "type": "forge:mod_loaded", + "modid": "chipped" }, { - "itemRegistryName": "sophisticatedbackpacks:chipped/botanist_workbench_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:chipped/botanist_workbench_upgrade" } ], - "pattern": [ - " W ", - "IBI", - " R " - ], "key": { "B": { "item": "sophisticatedbackpacks:upgrade_base" }, - "R": { - "tag": "forge:dusts/redstone" - }, "I": { "tag": "forge:ingots/iron" }, + "R": { + "tag": "forge:dusts/redstone" + }, "W": { "item": "chipped:botanist_workbench" } }, + "pattern": [ + " W ", + "IBI", + " R " + ], "result": { "item": "sophisticatedbackpacks:chipped/botanist_workbench_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/carpenter_workbench_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/carpenter_workbench_upgrade.json index a7bbe187..d72fea21 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/carpenter_workbench_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/carpenter_workbench_upgrade.json @@ -2,33 +2,33 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "modid": "chipped", - "type": "forge:mod_loaded" + "type": "forge:mod_loaded", + "modid": "chipped" }, { - "itemRegistryName": "sophisticatedbackpacks:chipped/carpenter_workbench_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:chipped/carpenter_workbench_upgrade" } ], - "pattern": [ - " W ", - "IBI", - " R " - ], "key": { "B": { "item": "sophisticatedbackpacks:upgrade_base" }, - "R": { - "tag": "forge:dusts/redstone" - }, "I": { "tag": "forge:ingots/iron" }, + "R": { + "tag": "forge:dusts/redstone" + }, "W": { "item": "chipped:carpenters_table" } }, + "pattern": [ + " W ", + "IBI", + " R " + ], "result": { "item": "sophisticatedbackpacks:chipped/carpenter_workbench_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/glassblower_workbench_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/glassblower_workbench_upgrade.json index d0556abf..1ab2ea0d 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/glassblower_workbench_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/glassblower_workbench_upgrade.json @@ -2,33 +2,33 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "modid": "chipped", - "type": "forge:mod_loaded" + "type": "forge:mod_loaded", + "modid": "chipped" }, { - "itemRegistryName": "sophisticatedbackpacks:chipped/glassblower_workbench_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:chipped/glassblower_workbench_upgrade" } ], - "pattern": [ - " W ", - "IBI", - " R " - ], "key": { "B": { "item": "sophisticatedbackpacks:upgrade_base" }, - "R": { - "tag": "forge:dusts/redstone" - }, "I": { "tag": "forge:ingots/iron" }, + "R": { + "tag": "forge:dusts/redstone" + }, "W": { "item": "chipped:glassblower" } }, + "pattern": [ + " W ", + "IBI", + " R " + ], "result": { "item": "sophisticatedbackpacks:chipped/glassblower_workbench_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/mason_workbench_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/mason_workbench_upgrade.json index e43c5f90..38a9fab8 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/mason_workbench_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/mason_workbench_upgrade.json @@ -2,33 +2,33 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "modid": "chipped", - "type": "forge:mod_loaded" + "type": "forge:mod_loaded", + "modid": "chipped" }, { - "itemRegistryName": "sophisticatedbackpacks:chipped/mason_workbench_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:chipped/mason_workbench_upgrade" } ], - "pattern": [ - " W ", - "IBI", - " R " - ], "key": { "B": { "item": "sophisticatedbackpacks:upgrade_base" }, - "R": { - "tag": "forge:dusts/redstone" - }, "I": { "tag": "forge:ingots/iron" }, + "R": { + "tag": "forge:dusts/redstone" + }, "W": { "item": "chipped:mason_table" } }, + "pattern": [ + " W ", + "IBI", + " R " + ], "result": { "item": "sophisticatedbackpacks:chipped/mason_workbench_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/philosopher_workbench_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/philosopher_workbench_upgrade.json index cb157065..8a3c7d2e 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/philosopher_workbench_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/philosopher_workbench_upgrade.json @@ -2,33 +2,33 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "modid": "chipped", - "type": "forge:mod_loaded" + "type": "forge:mod_loaded", + "modid": "chipped" }, { - "itemRegistryName": "sophisticatedbackpacks:chipped/philosopher_workbench_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:chipped/philosopher_workbench_upgrade" } ], - "pattern": [ - " W ", - "IBI", - " R " - ], "key": { "B": { "item": "sophisticatedbackpacks:upgrade_base" }, - "R": { - "tag": "forge:dusts/redstone" - }, "I": { "tag": "forge:ingots/iron" }, + "R": { + "tag": "forge:dusts/redstone" + }, "W": { "item": "chipped:alchemy_bench" } }, + "pattern": [ + " W ", + "IBI", + " R " + ], "result": { "item": "sophisticatedbackpacks:chipped/philosopher_workbench_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/shepherd_workbench_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/shepherd_workbench_upgrade.json index dcc74141..21a23004 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/shepherd_workbench_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/shepherd_workbench_upgrade.json @@ -2,33 +2,33 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "modid": "chipped", - "type": "forge:mod_loaded" + "type": "forge:mod_loaded", + "modid": "chipped" }, { - "itemRegistryName": "sophisticatedbackpacks:chipped/shepherd_workbench_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:chipped/shepherd_workbench_upgrade" } ], - "pattern": [ - " W ", - "IBI", - " R " - ], "key": { "B": { "item": "sophisticatedbackpacks:upgrade_base" }, - "R": { - "tag": "forge:dusts/redstone" - }, "I": { "tag": "forge:ingots/iron" }, + "R": { + "tag": "forge:dusts/redstone" + }, "W": { "item": "chipped:loom_table" } }, + "pattern": [ + " W ", + "IBI", + " R " + ], "result": { "item": "sophisticatedbackpacks:chipped/shepherd_workbench_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/tinkerer_workbench_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/tinkerer_workbench_upgrade.json index 56642561..9072ec8c 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/tinkerer_workbench_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/tinkerer_workbench_upgrade.json @@ -2,33 +2,33 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "modid": "chipped", - "type": "forge:mod_loaded" + "type": "forge:mod_loaded", + "modid": "chipped" }, { - "itemRegistryName": "sophisticatedbackpacks:chipped/tinkerer_workbench_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:chipped/tinkerer_workbench_upgrade" } ], - "pattern": [ - " W ", - "IBI", - " R " - ], "key": { "B": { "item": "sophisticatedbackpacks:upgrade_base" }, - "R": { - "tag": "forge:dusts/redstone" - }, "I": { "tag": "forge:ingots/iron" }, + "R": { + "tag": "forge:dusts/redstone" + }, "W": { - "item": "chipped:mechanist_workbench" + "item": "chipped:tinkering_table" } }, + "pattern": [ + " W ", + "IBI", + " R " + ], "result": { "item": "sophisticatedbackpacks:chipped/tinkerer_workbench_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/compacting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/compacting_upgrade.json index 6aa0a2b4..f8b84914 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/compacting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/compacting_upgrade.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:compacting_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:compacting_upgrade" } ], - "pattern": [ - "IPI", - "PBP", - "RPR" - ], "key": { "B": { "item": "sophisticatedbackpacks:upgrade_base" @@ -25,6 +20,11 @@ "tag": "forge:dusts/redstone" } }, + "pattern": [ + "IPI", + "PBP", + "RPR" + ], "result": { "item": "sophisticatedbackpacks:compacting_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/crafting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/crafting_upgrade.json index 76ebe5a6..bd88a6f1 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/crafting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/crafting_upgrade.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:crafting_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:crafting_upgrade" } ], - "pattern": [ - " T ", - "IBI", - " C " - ], "key": { "B": { "item": "sophisticatedbackpacks:upgrade_base" @@ -25,6 +20,11 @@ "item": "minecraft:crafting_table" } }, + "pattern": [ + " T ", + "IBI", + " C " + ], "result": { "item": "sophisticatedbackpacks:crafting_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/deposit_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/deposit_upgrade.json index 507d6972..52e29464 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/deposit_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/deposit_upgrade.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:deposit_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:deposit_upgrade" } ], - "pattern": [ - " P ", - "IBI", - "RCR" - ], "key": { "B": { "item": "sophisticatedbackpacks:upgrade_base" @@ -21,13 +16,18 @@ "I": { "tag": "forge:ingots/iron" }, - "R": { - "tag": "forge:dusts/redstone" - }, "P": { "item": "minecraft:piston" + }, + "R": { + "tag": "forge:dusts/redstone" } }, + "pattern": [ + " P ", + "IBI", + "RCR" + ], "result": { "item": "sophisticatedbackpacks:deposit_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/diamond_backpack.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/diamond_backpack.json index 058b4833..59bb7703 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/diamond_backpack.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/diamond_backpack.json @@ -2,23 +2,23 @@ "type": "sophisticatedbackpacks:backpack_upgrade", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:diamond_backpack", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:diamond_backpack" } ], - "pattern": [ - "DDD", - "DBD", - "DDD" - ], "key": { - "D": { - "tag": "forge:gems/diamond" - }, "B": { "item": "sophisticatedbackpacks:gold_backpack" + }, + "D": { + "tag": "forge:gems/diamond" } }, + "pattern": [ + "DDD", + "DBD", + "DDD" + ], "result": { "item": "sophisticatedbackpacks:diamond_backpack" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/everlasting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/everlasting_upgrade.json index 9385e0a9..e0cb1eca 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/everlasting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/everlasting_upgrade.json @@ -2,26 +2,26 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:everlasting_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:everlasting_upgrade" } ], - "pattern": [ - "CSC", - "SBS", - "CSC" - ], "key": { "B": { "item": "sophisticatedbackpacks:upgrade_base" }, - "S": { - "tag": "forge:nether_stars" - }, "C": { "item": "minecraft:end_crystal" + }, + "S": { + "tag": "forge:nether_stars" } }, + "pattern": [ + "CSC", + "SBS", + "CSC" + ], "result": { "item": "sophisticatedbackpacks:everlasting_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/feeding_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/feeding_upgrade.json index 0005d131..17c7c50a 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/feeding_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/feeding_upgrade.json @@ -2,32 +2,32 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:feeding_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:feeding_upgrade" } ], - "pattern": [ - " C ", - "ABM", - " E " - ], "key": { + "A": { + "item": "minecraft:golden_apple" + }, "B": { "item": "sophisticatedbackpacks:upgrade_base" }, "C": { "item": "minecraft:golden_carrot" }, - "A": { - "item": "minecraft:golden_apple" + "E": { + "tag": "forge:ender_pearls" }, "M": { "item": "minecraft:glistering_melon_slice" - }, - "E": { - "tag": "forge:ender_pearls" } }, + "pattern": [ + " C ", + "ABM", + " E " + ], "result": { "item": "sophisticatedbackpacks:feeding_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/filter_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/filter_upgrade.json index 79ed18d3..e63f4341 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/filter_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/filter_upgrade.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:filter_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:filter_upgrade" } ], - "pattern": [ - "RSR", - "SBS", - "RSR" - ], "key": { "B": { "item": "sophisticatedbackpacks:upgrade_base" @@ -22,6 +17,11 @@ "tag": "forge:string" } }, + "pattern": [ + "RSR", + "SBS", + "RSR" + ], "result": { "item": "sophisticatedbackpacks:filter_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/gold_backpack.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/gold_backpack.json index cbe4a93c..04bc7b39 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/gold_backpack.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/gold_backpack.json @@ -2,23 +2,23 @@ "type": "sophisticatedbackpacks:backpack_upgrade", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:gold_backpack", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:gold_backpack" } ], - "pattern": [ - "GGG", - "GBG", - "GGG" - ], "key": { - "G": { - "tag": "forge:ingots/gold" - }, "B": { "item": "sophisticatedbackpacks:iron_backpack" + }, + "G": { + "tag": "forge:ingots/gold" } }, + "pattern": [ + "GGG", + "GBG", + "GGG" + ], "result": { "item": "sophisticatedbackpacks:gold_backpack" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/inception_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/inception_upgrade.json index b26a9fae..580e65bb 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/inception_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/inception_upgrade.json @@ -2,29 +2,29 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:inception_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:inception_upgrade" } ], - "pattern": [ - "ESE", - "DBD", - "EDE" - ], "key": { "B": { "item": "sophisticatedbackpacks:upgrade_base" }, - "S": { - "tag": "forge:nether_stars" - }, "D": { "tag": "forge:gems/diamond" }, "E": { "item": "minecraft:ender_eye" + }, + "S": { + "tag": "forge:nether_stars" } }, + "pattern": [ + "ESE", + "DBD", + "EDE" + ], "result": { "item": "sophisticatedbackpacks:inception_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/iron_backpack.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/iron_backpack.json index 435f54cb..061d66e5 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/iron_backpack.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/iron_backpack.json @@ -2,23 +2,23 @@ "type": "sophisticatedbackpacks:backpack_upgrade", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:iron_backpack", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:iron_backpack" } ], - "pattern": [ - "III", - "IBI", - "III" - ], "key": { - "I": { - "tag": "forge:ingots/iron" - }, "B": { "item": "sophisticatedbackpacks:backpack" + }, + "I": { + "tag": "forge:ingots/iron" } }, + "pattern": [ + "III", + "IBI", + "III" + ], "result": { "item": "sophisticatedbackpacks:iron_backpack" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/jukebox_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/jukebox_upgrade.json index 772bf558..5952b635 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/jukebox_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/jukebox_upgrade.json @@ -2,29 +2,29 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:jukebox_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:jukebox_upgrade" } ], - "pattern": [ - " J ", - "IBI", - " R " - ], "key": { "B": { "item": "sophisticatedbackpacks:upgrade_base" }, - "R": { - "tag": "forge:dusts/redstone" - }, "I": { "tag": "forge:ingots/iron" }, "J": { "item": "minecraft:jukebox" + }, + "R": { + "tag": "forge:dusts/redstone" } }, + "pattern": [ + " J ", + "IBI", + " R " + ], "result": { "item": "sophisticatedbackpacks:jukebox_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/magnet_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/magnet_upgrade.json index f7f6c6ab..17ec1d8e 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/magnet_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/magnet_upgrade.json @@ -2,15 +2,10 @@ "type": "sophisticatedcore:upgrade_next_tier", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:magnet_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:magnet_upgrade" } ], - "pattern": [ - "EIE", - "IPI", - "R L" - ], "key": { "E": { "tag": "forge:ender_pearls" @@ -18,16 +13,21 @@ "I": { "tag": "forge:ingots/iron" }, - "R": { - "tag": "forge:dusts/redstone" - }, "L": { "tag": "forge:gems/lapis" }, "P": { "item": "sophisticatedbackpacks:pickup_upgrade" + }, + "R": { + "tag": "forge:dusts/redstone" } }, + "pattern": [ + "EIE", + "IPI", + "R L" + ], "result": { "item": "sophisticatedbackpacks:magnet_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/netherite_backpack.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/netherite_backpack.json index 6a00927b..4468568d 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/netherite_backpack.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/netherite_backpack.json @@ -1,11 +1,11 @@ { "type": "sophisticatedbackpacks:smithing_backpack_upgrade", - "base": { - "item": "sophisticatedbackpacks:diamond_backpack" - }, "addition": { "item": "minecraft:netherite_ingot" }, + "base": { + "item": "sophisticatedbackpacks:diamond_backpack" + }, "result": { "item": "sophisticatedbackpacks:netherite_backpack" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/pickup_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/pickup_upgrade.json index 575d6101..45607c5e 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/pickup_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/pickup_upgrade.json @@ -2,29 +2,29 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:pickup_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:pickup_upgrade" } ], - "pattern": [ - " P ", - "SBS", - "RRR" - ], "key": { "B": { "item": "sophisticatedbackpacks:upgrade_base" }, + "P": { + "item": "minecraft:sticky_piston" + }, "R": { "tag": "forge:dusts/redstone" }, "S": { "tag": "forge:string" - }, - "P": { - "item": "minecraft:sticky_piston" } }, + "pattern": [ + " P ", + "SBS", + "RRR" + ], "result": { "item": "sophisticatedbackpacks:pickup_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/pump_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/pump_upgrade.json index 5fbca9bf..3fbc1377 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/pump_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/pump_upgrade.json @@ -2,18 +2,13 @@ "type": "sophisticatedcore:upgrade_next_tier", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:pump_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:pump_upgrade" } ], - "pattern": [ - "GUG", - "PBS", - "GUG" - ], "key": { - "U": { - "item": "minecraft:bucket" + "B": { + "item": "sophisticatedbackpacks:upgrade_base" }, "G": { "tag": "forge:glass" @@ -24,10 +19,15 @@ "S": { "item": "minecraft:sticky_piston" }, - "B": { - "item": "sophisticatedbackpacks:upgrade_base" + "U": { + "item": "minecraft:bucket" } }, + "pattern": [ + "GUG", + "PBS", + "GUG" + ], "result": { "item": "sophisticatedbackpacks:pump_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/refill_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/refill_upgrade.json index 36c2632c..34fe53d6 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/refill_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/refill_upgrade.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:refill_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:refill_upgrade" } ], - "pattern": [ - " E ", - "IBI", - "RCR" - ], "key": { "B": { "item": "sophisticatedbackpacks:upgrade_base" @@ -18,16 +13,21 @@ "C": { "tag": "forge:chests/wooden" }, + "E": { + "tag": "forge:ender_pearls" + }, "I": { "tag": "forge:ingots/iron" }, "R": { "tag": "forge:dusts/redstone" - }, - "E": { - "tag": "forge:ender_pearls" } }, + "pattern": [ + " E ", + "IBI", + "RCR" + ], "result": { "item": "sophisticatedbackpacks:refill_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/restock_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/restock_upgrade.json index 862d9aaa..6fd64063 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/restock_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/restock_upgrade.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:restock_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:restock_upgrade" } ], - "pattern": [ - " P ", - "IBI", - "RCR" - ], "key": { "B": { "item": "sophisticatedbackpacks:upgrade_base" @@ -21,13 +16,18 @@ "I": { "tag": "forge:ingots/iron" }, - "R": { - "tag": "forge:dusts/redstone" - }, "P": { "item": "minecraft:sticky_piston" + }, + "R": { + "tag": "forge:dusts/redstone" } }, + "pattern": [ + " P ", + "IBI", + "RCR" + ], "result": { "item": "sophisticatedbackpacks:restock_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/smelting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/smelting_upgrade.json index 2c0a1bf7..cab5b28f 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/smelting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/smelting_upgrade.json @@ -2,29 +2,29 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:smelting_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:smelting_upgrade" } ], - "pattern": [ - "RIR", - "IBI", - "RFR" - ], "key": { "B": { "item": "sophisticatedbackpacks:upgrade_base" }, - "R": { - "tag": "forge:dusts/redstone" + "F": { + "item": "minecraft:furnace" }, "I": { "tag": "forge:ingots/iron" }, - "F": { - "item": "minecraft:furnace" + "R": { + "tag": "forge:dusts/redstone" } }, + "pattern": [ + "RIR", + "IBI", + "RFR" + ], "result": { "item": "sophisticatedbackpacks:smelting_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/smoking_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/smoking_upgrade.json index 5a59cf68..f8234c4d 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/smoking_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/smoking_upgrade.json @@ -2,29 +2,29 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:smoking_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:smoking_upgrade" } ], - "pattern": [ - "RIR", - "IBI", - "RSR" - ], "key": { "B": { "item": "sophisticatedbackpacks:upgrade_base" }, - "R": { - "tag": "forge:dusts/redstone" - }, "I": { "tag": "forge:ingots/iron" }, + "R": { + "tag": "forge:dusts/redstone" + }, "S": { "item": "minecraft:smoker" } }, + "pattern": [ + "RIR", + "IBI", + "RSR" + ], "result": { "item": "sophisticatedbackpacks:smoking_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/smoking_upgrade_from_smelting_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/smoking_upgrade_from_smelting_upgrade.json index 554558bc..71f91f5c 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/smoking_upgrade_from_smelting_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/smoking_upgrade_from_smelting_upgrade.json @@ -2,23 +2,23 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:smoking_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:smoking_upgrade" } ], - "pattern": [ - " L ", - "LSL", - " L " - ], "key": { - "S": { - "item": "sophisticatedbackpacks:smelting_upgrade" - }, "L": { "tag": "minecraft:logs" + }, + "S": { + "item": "sophisticatedbackpacks:smelting_upgrade" } }, + "pattern": [ + " L ", + "LSL", + " L " + ], "result": { "item": "sophisticatedbackpacks:smoking_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_tier_1.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_tier_1.json index 6eed014b..acf8ea1f 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_tier_1.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_tier_1.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:stack_upgrade_tier_1", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:stack_upgrade_tier_1" } ], - "pattern": [ - "III", - "IBI", - "III" - ], "key": { "B": { "item": "sophisticatedbackpacks:upgrade_base" @@ -19,6 +14,11 @@ "tag": "forge:storage_blocks/iron" } }, + "pattern": [ + "III", + "IBI", + "III" + ], "result": { "item": "sophisticatedbackpacks:stack_upgrade_tier_1" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_tier_2.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_tier_2.json index 51b27010..de7b4d93 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_tier_2.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_tier_2.json @@ -2,23 +2,23 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:stack_upgrade_tier_2", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:stack_upgrade_tier_2" } ], - "pattern": [ - "GGG", - "GSG", - "GGG" - ], "key": { - "S": { - "item": "sophisticatedbackpacks:stack_upgrade_tier_1" - }, "G": { "tag": "forge:storage_blocks/gold" + }, + "S": { + "item": "sophisticatedbackpacks:stack_upgrade_tier_1" } }, + "pattern": [ + "GGG", + "GSG", + "GGG" + ], "result": { "item": "sophisticatedbackpacks:stack_upgrade_tier_2" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_tier_3.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_tier_3.json index f7c0924b..75b208c9 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_tier_3.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_tier_3.json @@ -2,23 +2,23 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:stack_upgrade_tier_3", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:stack_upgrade_tier_3" } ], - "pattern": [ - "DDD", - "DSD", - "DDD" - ], "key": { - "S": { - "item": "sophisticatedbackpacks:stack_upgrade_tier_2" - }, "D": { "tag": "forge:storage_blocks/diamond" + }, + "S": { + "item": "sophisticatedbackpacks:stack_upgrade_tier_2" } }, + "pattern": [ + "DDD", + "DSD", + "DDD" + ], "result": { "item": "sophisticatedbackpacks:stack_upgrade_tier_3" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_tier_4.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_tier_4.json index 9a3c5991..a136470f 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_tier_4.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_tier_4.json @@ -2,23 +2,23 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:stack_upgrade_tier_4", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:stack_upgrade_tier_4" } ], - "pattern": [ - "NNN", - "NSN", - "NNN" - ], "key": { - "S": { - "item": "sophisticatedbackpacks:stack_upgrade_tier_3" - }, "N": { "tag": "forge:storage_blocks/netherite" + }, + "S": { + "item": "sophisticatedbackpacks:stack_upgrade_tier_3" } }, + "pattern": [ + "NNN", + "NSN", + "NNN" + ], "result": { "item": "sophisticatedbackpacks:stack_upgrade_tier_4" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/stonecutter_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/stonecutter_upgrade.json index 55cff90d..e4c9001f 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/stonecutter_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/stonecutter_upgrade.json @@ -2,29 +2,29 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:stonecutter_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:stonecutter_upgrade" } ], - "pattern": [ - " S ", - "IBI", - " R " - ], "key": { "B": { "item": "sophisticatedbackpacks:upgrade_base" }, - "R": { - "tag": "forge:dusts/redstone" - }, "I": { "tag": "forge:ingots/iron" }, + "R": { + "tag": "forge:dusts/redstone" + }, "S": { "item": "minecraft:stonecutter" } }, + "pattern": [ + " S ", + "IBI", + " R " + ], "result": { "item": "sophisticatedbackpacks:stonecutter_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/tank_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/tank_upgrade.json index 08a640d2..3fc55940 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/tank_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/tank_upgrade.json @@ -2,23 +2,23 @@ "type": "sophisticatedcore:upgrade_next_tier", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:tank_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:tank_upgrade" } ], - "pattern": [ - "GGG", - "GBG", - "GGG" - ], "key": { - "G": { - "tag": "forge:glass" - }, "B": { "item": "sophisticatedbackpacks:upgrade_base" + }, + "G": { + "tag": "forge:glass" } }, + "pattern": [ + "GGG", + "GBG", + "GGG" + ], "result": { "item": "sophisticatedbackpacks:tank_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/tool_swapper_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/tool_swapper_upgrade.json index 9b781506..640e1963 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/tool_swapper_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/tool_swapper_upgrade.json @@ -2,38 +2,38 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:tool_swapper_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:tool_swapper_upgrade" } ], - "pattern": [ - "RWR", - "PBA", - "ISI" - ], "key": { + "A": { + "item": "minecraft:wooden_axe" + }, "B": { "item": "sophisticatedbackpacks:upgrade_base" }, - "S": { - "item": "minecraft:wooden_shovel" + "I": { + "tag": "forge:ingots/iron" }, "P": { "item": "minecraft:wooden_pickaxe" }, - "A": { - "item": "minecraft:wooden_axe" + "R": { + "tag": "forge:dusts/redstone" + }, + "S": { + "item": "minecraft:wooden_shovel" }, "W": { "item": "minecraft:wooden_sword" - }, - "I": { - "tag": "forge:ingots/iron" - }, - "R": { - "tag": "forge:dusts/redstone" } }, + "pattern": [ + "RWR", + "PBA", + "ISI" + ], "result": { "item": "sophisticatedbackpacks:tool_swapper_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/upgrade_base.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/upgrade_base.json index 9b7dfcde..0935ccca 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/upgrade_base.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/upgrade_base.json @@ -2,26 +2,26 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:upgrade_base", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:upgrade_base" } ], - "pattern": [ - "SIS", - "ILI", - "SIS" - ], "key": { - "L": { - "tag": "forge:leather" - }, "I": { "tag": "forge:ingots/iron" }, + "L": { + "tag": "forge:leather" + }, "S": { "tag": "forge:string" } }, + "pattern": [ + "SIS", + "ILI", + "SIS" + ], "result": { "item": "sophisticatedbackpacks:upgrade_base" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/void_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/void_upgrade.json index 2a4d1f5a..aff206f4 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/void_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/void_upgrade.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:void_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:void_upgrade" } ], - "pattern": [ - " E ", - "OBO", - "ROR" - ], "key": { "B": { "item": "sophisticatedbackpacks:upgrade_base" @@ -25,6 +20,11 @@ "tag": "forge:dusts/redstone" } }, + "pattern": [ + " E ", + "OBO", + "ROR" + ], "result": { "item": "sophisticatedbackpacks:void_upgrade" } diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/xp_pump_upgrade.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/xp_pump_upgrade.json index 06e22015..88217d31 100644 --- a/src/generated/resources/data/sophisticatedbackpacks/recipes/xp_pump_upgrade.json +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/xp_pump_upgrade.json @@ -2,29 +2,29 @@ "type": "minecraft:crafting_shaped", "conditions": [ { - "itemRegistryName": "sophisticatedbackpacks:xp_pump_upgrade", - "type": "sophisticatedcore:item_enabled" + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedbackpacks:xp_pump_upgrade" } ], - "pattern": [ - "RER", - "CPC", - "RER" - ], "key": { - "R": { - "tag": "forge:dusts/redstone" + "C": { + "item": "minecraft:experience_bottle" }, "E": { "item": "minecraft:ender_eye" }, - "C": { - "item": "minecraft:experience_bottle" - }, "P": { "item": "sophisticatedbackpacks:advanced_pump_upgrade" + }, + "R": { + "tag": "forge:dusts/redstone" } }, + "pattern": [ + "RER", + "CPC", + "RER" + ], "result": { "item": "sophisticatedbackpacks:xp_pump_upgrade" } diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/chipped/ChippedCompat.java b/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/chipped/ChippedCompat.java index 584a545c..26e5447e 100644 --- a/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/chipped/ChippedCompat.java +++ b/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/chipped/ChippedCompat.java @@ -1,6 +1,12 @@ package net.p3pp3rf1y.sophisticatedbackpacks.compat.chipped; +import earth.terrarium.chipped.Chipped; +import earth.terrarium.chipped.common.compat.jei.ChippedRecipeCategory; +import earth.terrarium.chipped.common.recipe.ChippedRecipe; import earth.terrarium.chipped.common.registry.ModRecipeTypes; +import mezz.jei.api.recipe.RecipeType; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.ItemStack; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.DistExecutor; @@ -10,6 +16,7 @@ import net.minecraftforge.registries.RegistryObject; import net.p3pp3rf1y.sophisticatedbackpacks.SophisticatedBackpacks; import net.p3pp3rf1y.sophisticatedbackpacks.client.gui.SBPButtonDefinitions; +import net.p3pp3rf1y.sophisticatedbackpacks.compat.jei.SBPPlugin; import net.p3pp3rf1y.sophisticatedbackpacks.init.ModItems; import net.p3pp3rf1y.sophisticatedcore.client.gui.StorageScreenBase; import net.p3pp3rf1y.sophisticatedcore.client.gui.UpgradeGuiManager; @@ -43,6 +50,15 @@ public class ChippedCompat implements ICompat { public void init() { IEventBus modBus = FMLJavaModLoadingContext.get().getModEventBus(); modBus.addListener(this::registerContainers); + + SBPPlugin.setAdditionalCatalystRegistrar(registration -> { + registration.addRecipeCatalyst(new ItemStack(BOTANIST_WORKBENCH_UPGRADE.get()), ChippedRecipeCategory.BOTANIST_WORKBENCH_RECIPE); + registration.addRecipeCatalyst(new ItemStack(GLASSBLOWER_WORKBENCH_UPGRADE.get()), ChippedRecipeCategory.GLASSBLOWER_RECIPE); + registration.addRecipeCatalyst(new ItemStack(CARPENTER_WORKBENCH_UPGRADE.get()), ChippedRecipeCategory.CARPENTERS_TABLE_RECIPE); + registration.addRecipeCatalyst(new ItemStack(SHEPHERD_WORKBENCH_UPGRADE.get()), ChippedRecipeCategory.LOOM_TABLE_RECIPE); + registration.addRecipeCatalyst(new ItemStack(MASON_WORKBENCH_UPGRADE.get()), ChippedRecipeCategory.MASON_TABLE_RECIPE); + registration.addRecipeCatalyst(new ItemStack(PHILOSOPHER_WORKBENCH_UPGRADE.get()), ChippedRecipeCategory.ALCHEMY_BENCH_RECIPE); + registration.addRecipeCatalyst(new ItemStack(TINKERER_WORKBENCH_UPGRADE.get()), ChippedRecipeCategory.TINKERING_TABLE_RECIPE); }); } public void registerContainers(RegisterEvent event) { diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/chipped/package-info.java b/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/chipped/package-info.java new file mode 100644 index 00000000..1b00f5ea --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/chipped/package-info.java @@ -0,0 +1,8 @@ +// Auto generated package-info by MCP + +@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault +package net.p3pp3rf1y.sophisticatedbackpacks.compat.chipped; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/jei/SBPPlugin.java b/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/jei/SBPPlugin.java index 4876aa38..b9e47010 100644 --- a/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/jei/SBPPlugin.java +++ b/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/jei/SBPPlugin.java @@ -34,10 +34,16 @@ import java.util.ArrayList; import java.util.List; +import java.util.function.Consumer; @SuppressWarnings("unused") @JeiPlugin public class SBPPlugin implements IModPlugin { + private static Consumer additionalCatalystRegistrar = registration -> {}; + public static void setAdditionalCatalystRegistrar(Consumer additionalCatalystRegistrar) { + SBPPlugin.additionalCatalystRegistrar = additionalCatalystRegistrar; + } + @Override public ResourceLocation getPluginUid() { return new ResourceLocation(SophisticatedBackpacks.MOD_ID, "default"); @@ -93,6 +99,8 @@ private UpgradeRecipe copyUpgradeRecipe(UpgradeRecipe recipe) { @Override public void registerRecipeCatalysts(IRecipeCatalystRegistration registration) { registration.addRecipeCatalyst(new ItemStack(ModItems.CRAFTING_UPGRADE.get()), RecipeTypes.CRAFTING); + registration.addRecipeCatalyst(new ItemStack(ModItems.STONECUTTER_UPGRADE.get()), RecipeTypes.STONECUTTING); + additionalCatalystRegistrar.accept(registration); } @Override