From fa2585c2e69514ccf4ec9fb24d5cac34b924c126 Mon Sep 17 00:00:00 2001 From: P3pp3rF1y Date: Fri, 17 Nov 2023 15:22:44 +0100 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E2=9C=A8=20Add=207=20new=20upgrade?= =?UTF-8?q?s=20for=20Chipped=20workbenches=20that=20can=20be=20used=20in?= =?UTF-8?q?=20upgrade=20tabs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 9 ++- gradle.properties | 7 +- .../chipped/botanist_workbench_upgrade.json | 34 ++++++++ .../chipped/carpenter_workbench_upgrade.json | 34 ++++++++ .../glassblower_workbench_upgrade.json | 34 ++++++++ .../chipped/mason_workbench_upgrade.json | 34 ++++++++ .../philosopher_workbench_upgrade.json | 34 ++++++++ .../chipped/shepherd_workbench_upgrade.json | 34 ++++++++ .../chipped/tinkerer_workbench_upgrade.json | 34 ++++++++ .../chipped/botanist_workbench_upgrade.json | 35 +++++++++ .../chipped/carpenter_workbench_upgrade.json | 35 +++++++++ .../glassblower_workbench_upgrade.json | 35 +++++++++ .../chipped/mason_workbench_upgrade.json | 35 +++++++++ .../philosopher_workbench_upgrade.json | 35 +++++++++ .../chipped/shepherd_workbench_upgrade.json | 35 +++++++++ .../chipped/tinkerer_workbench_upgrade.json | 35 +++++++++ .../SophisticatedBackpacks.java | 3 +- .../compat/CompatModIds.java | 1 + .../compat/chipped/ChippedCompat.java | 74 ++++++++++++++++++ .../compat/curios/CuriosCompat.java | 25 +++--- .../data/SBPRecipeProvider.java | 31 ++++++++ .../init/ModCompat.java | 13 ++- .../sophisticatedbackpacks/init/ModItems.java | 2 +- src/main/resources/META-INF/mods.toml | 2 +- .../sophisticatedbackpacks/lang/en_us.json | 14 ++++ .../chipped/botanist_workbench_upgrade.json | 6 ++ .../chipped/carpenter_workbench_upgrade.json | 6 ++ .../glassblower_workbench_upgrade.json | 6 ++ .../item/chipped/mason_workbench_upgrade.json | 6 ++ .../philosopher_workbench_upgrade.json | 6 ++ .../chipped/shepherd_workbench_upgrade.json | 6 ++ .../chipped/tinkerer_workbench_upgrade.json | 6 ++ .../chipped/botanist_workbench_upgrade.png | Bin 0 -> 259 bytes .../chipped/carpenter_workbench_upgrade.png | Bin 0 -> 239 bytes .../chipped/glassblower_workbench_upgrade.png | Bin 0 -> 249 bytes .../item/chipped/mason_workbench_upgrade.png | Bin 0 -> 259 bytes .../chipped/philosopher_workbench_upgrade.png | Bin 0 -> 260 bytes .../chipped/shepherd_workbench_upgrade.png | Bin 0 -> 257 bytes .../chipped/tinkerer_workbench_upgrade.png | Bin 0 -> 250 bytes 39 files changed, 684 insertions(+), 22 deletions(-) create mode 100644 src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/botanist_workbench_upgrade.json create mode 100644 src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/carpenter_workbench_upgrade.json create mode 100644 src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/glassblower_workbench_upgrade.json create mode 100644 src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/mason_workbench_upgrade.json create mode 100644 src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/philosopher_workbench_upgrade.json create mode 100644 src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/shepherd_workbench_upgrade.json create mode 100644 src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/tinkerer_workbench_upgrade.json create mode 100644 src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/botanist_workbench_upgrade.json create mode 100644 src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/carpenter_workbench_upgrade.json create mode 100644 src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/glassblower_workbench_upgrade.json create mode 100644 src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/mason_workbench_upgrade.json create mode 100644 src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/philosopher_workbench_upgrade.json create mode 100644 src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/shepherd_workbench_upgrade.json create mode 100644 src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/tinkerer_workbench_upgrade.json create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/chipped/ChippedCompat.java create mode 100644 src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/botanist_workbench_upgrade.json create mode 100644 src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/carpenter_workbench_upgrade.json create mode 100644 src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/glassblower_workbench_upgrade.json create mode 100644 src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/mason_workbench_upgrade.json create mode 100644 src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/philosopher_workbench_upgrade.json create mode 100644 src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/shepherd_workbench_upgrade.json create mode 100644 src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/tinkerer_workbench_upgrade.json create mode 100644 src/main/resources/assets/sophisticatedbackpacks/textures/item/chipped/botanist_workbench_upgrade.png create mode 100644 src/main/resources/assets/sophisticatedbackpacks/textures/item/chipped/carpenter_workbench_upgrade.png create mode 100644 src/main/resources/assets/sophisticatedbackpacks/textures/item/chipped/glassblower_workbench_upgrade.png create mode 100644 src/main/resources/assets/sophisticatedbackpacks/textures/item/chipped/mason_workbench_upgrade.png create mode 100644 src/main/resources/assets/sophisticatedbackpacks/textures/item/chipped/philosopher_workbench_upgrade.png create mode 100644 src/main/resources/assets/sophisticatedbackpacks/textures/item/chipped/shepherd_workbench_upgrade.png create mode 100644 src/main/resources/assets/sophisticatedbackpacks/textures/item/chipped/tinkerer_workbench_upgrade.png diff --git a/build.gradle b/build.gradle index 73ee2db2..a3bdcbbc 100644 --- a/build.gradle +++ b/build.gradle @@ -138,8 +138,13 @@ dependencies { runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}") compileOnly fg.deobf("curse.maven:balm-531761:${balm_cf_file_id}") compileOnly fg.deobf("curse.maven:craftingtweaks-233071:${crafting_tweaks_cf_file_id}") - runtimeOnly fg.deobf("curse.maven:craftingtweaks-233071:${crafting_tweaks_cf_file_id}") - runtimeOnly fg.deobf("curse.maven:balm-531761:${balm_cf_file_id}") + compileOnly fg.deobf("curse.maven:balm-531761:${balm_cf_file_id}") + compileOnly fg.deobf("curse.maven:chipped-456956:${chipped_cf_file_id}") + runtimeOnly fg.deobf("curse.maven:chipped-456956:${chipped_cf_file_id}") + compileOnly fg.deobf("curse.maven:ctm-267602:${ctm_cf_file_id}") + runtimeOnly fg.deobf("curse.maven:ctm-267602:${ctm_cf_file_id}") + compileOnly fg.deobf("curse.maven:resourcefullib-570073:${resourcefullib_cf_file_id}") + runtimeOnly fg.deobf("curse.maven:resourcefullib-570073:${resourcefullib_cf_file_id}") } test { diff --git a/gradle.properties b/gradle.properties index 758e5ed8..2e6a8b4a 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.64 +mod_version=3.18.65 jei_mc_version=1.19.2-forge jei_version=11.6.0.+ curios_version=1.19.2-5.1.1.+ @@ -9,5 +9,8 @@ botania_version=1.19.2-439-FORGE-SNAPSHOT patchouli_version=1.19.2-78-SNAPSHOT balm_cf_file_id=3914527 crafting_tweaks_cf_file_id=3914007 -sc_version=1.19.2-0.5.97.+ +chipped_cf_file_id=4558849 +ctm_cf_file_id=4393695 +resourcefullib_cf_file_id=4477753 +sc_version=1.19.2-0.5.104.+ parchment_version=1.18.2-2022.06.05-1.19 \ 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 new file mode 100644 index 00000000..3a1240f3 --- /dev/null +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/botanist_workbench_upgrade.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "sophisticatedbackpacks:chipped/botanist_workbench_upgrade" + ] + }, + "criteria": { + "has_upgrade_base": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "sophisticatedbackpacks:upgrade_base" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "sophisticatedbackpacks:chipped/botanist_workbench_upgrade" + } + } + }, + "requirements": [ + [ + "has_upgrade_base", + "has_the_recipe" + ] + ] +} \ 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 new file mode 100644 index 00000000..bbf764e1 --- /dev/null +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/carpenter_workbench_upgrade.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "sophisticatedbackpacks:chipped/carpenter_workbench_upgrade" + ] + }, + "criteria": { + "has_upgrade_base": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "sophisticatedbackpacks:upgrade_base" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "sophisticatedbackpacks:chipped/carpenter_workbench_upgrade" + } + } + }, + "requirements": [ + [ + "has_upgrade_base", + "has_the_recipe" + ] + ] +} \ 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 new file mode 100644 index 00000000..c60504f4 --- /dev/null +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/glassblower_workbench_upgrade.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "sophisticatedbackpacks:chipped/glassblower_workbench_upgrade" + ] + }, + "criteria": { + "has_upgrade_base": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "sophisticatedbackpacks:upgrade_base" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "sophisticatedbackpacks:chipped/glassblower_workbench_upgrade" + } + } + }, + "requirements": [ + [ + "has_upgrade_base", + "has_the_recipe" + ] + ] +} \ 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 new file mode 100644 index 00000000..8e62f903 --- /dev/null +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/mason_workbench_upgrade.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "sophisticatedbackpacks:chipped/mason_workbench_upgrade" + ] + }, + "criteria": { + "has_upgrade_base": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "sophisticatedbackpacks:upgrade_base" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "sophisticatedbackpacks:chipped/mason_workbench_upgrade" + } + } + }, + "requirements": [ + [ + "has_upgrade_base", + "has_the_recipe" + ] + ] +} \ 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 new file mode 100644 index 00000000..7afa7187 --- /dev/null +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/philosopher_workbench_upgrade.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "sophisticatedbackpacks:chipped/philosopher_workbench_upgrade" + ] + }, + "criteria": { + "has_upgrade_base": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "sophisticatedbackpacks:upgrade_base" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "sophisticatedbackpacks:chipped/philosopher_workbench_upgrade" + } + } + }, + "requirements": [ + [ + "has_upgrade_base", + "has_the_recipe" + ] + ] +} \ 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 new file mode 100644 index 00000000..32b04ce9 --- /dev/null +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/shepherd_workbench_upgrade.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "sophisticatedbackpacks:chipped/shepherd_workbench_upgrade" + ] + }, + "criteria": { + "has_upgrade_base": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "sophisticatedbackpacks:upgrade_base" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "sophisticatedbackpacks:chipped/shepherd_workbench_upgrade" + } + } + }, + "requirements": [ + [ + "has_upgrade_base", + "has_the_recipe" + ] + ] +} \ 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 new file mode 100644 index 00000000..2ac690c1 --- /dev/null +++ b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/sophisticatedbackpacks/chipped/tinkerer_workbench_upgrade.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "sophisticatedbackpacks:chipped/tinkerer_workbench_upgrade" + ] + }, + "criteria": { + "has_upgrade_base": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "sophisticatedbackpacks:upgrade_base" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "sophisticatedbackpacks:chipped/tinkerer_workbench_upgrade" + } + } + }, + "requirements": [ + [ + "has_upgrade_base", + "has_the_recipe" + ] + ] +} \ No newline at end of file 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 new file mode 100644 index 00000000..f945412f --- /dev/null +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/botanist_workbench_upgrade.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:crafting_shaped", + "conditions": [ + { + "modid": "chipped", + "type": "forge:mod_loaded" + }, + { + "itemRegistryName": "sophisticatedbackpacks:chipped/botanist_workbench_upgrade", + "type": "sophisticatedcore:item_enabled" + } + ], + "pattern": [ + " W ", + "IBI", + " R " + ], + "key": { + "B": { + "item": "sophisticatedbackpacks:upgrade_base" + }, + "R": { + "tag": "forge:dusts/redstone" + }, + "I": { + "tag": "forge:ingots/iron" + }, + "W": { + "item": "chipped:botanist_workbench" + } + }, + "result": { + "item": "sophisticatedbackpacks:chipped/botanist_workbench_upgrade" + } +} \ No newline at end of file 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 new file mode 100644 index 00000000..a7bbe187 --- /dev/null +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/carpenter_workbench_upgrade.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:crafting_shaped", + "conditions": [ + { + "modid": "chipped", + "type": "forge:mod_loaded" + }, + { + "itemRegistryName": "sophisticatedbackpacks:chipped/carpenter_workbench_upgrade", + "type": "sophisticatedcore:item_enabled" + } + ], + "pattern": [ + " W ", + "IBI", + " R " + ], + "key": { + "B": { + "item": "sophisticatedbackpacks:upgrade_base" + }, + "R": { + "tag": "forge:dusts/redstone" + }, + "I": { + "tag": "forge:ingots/iron" + }, + "W": { + "item": "chipped:carpenters_table" + } + }, + "result": { + "item": "sophisticatedbackpacks:chipped/carpenter_workbench_upgrade" + } +} \ No newline at end of file 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 new file mode 100644 index 00000000..d0556abf --- /dev/null +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/glassblower_workbench_upgrade.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:crafting_shaped", + "conditions": [ + { + "modid": "chipped", + "type": "forge:mod_loaded" + }, + { + "itemRegistryName": "sophisticatedbackpacks:chipped/glassblower_workbench_upgrade", + "type": "sophisticatedcore:item_enabled" + } + ], + "pattern": [ + " W ", + "IBI", + " R " + ], + "key": { + "B": { + "item": "sophisticatedbackpacks:upgrade_base" + }, + "R": { + "tag": "forge:dusts/redstone" + }, + "I": { + "tag": "forge:ingots/iron" + }, + "W": { + "item": "chipped:glassblower" + } + }, + "result": { + "item": "sophisticatedbackpacks:chipped/glassblower_workbench_upgrade" + } +} \ No newline at end of file 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 new file mode 100644 index 00000000..e43c5f90 --- /dev/null +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/mason_workbench_upgrade.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:crafting_shaped", + "conditions": [ + { + "modid": "chipped", + "type": "forge:mod_loaded" + }, + { + "itemRegistryName": "sophisticatedbackpacks:chipped/mason_workbench_upgrade", + "type": "sophisticatedcore:item_enabled" + } + ], + "pattern": [ + " W ", + "IBI", + " R " + ], + "key": { + "B": { + "item": "sophisticatedbackpacks:upgrade_base" + }, + "R": { + "tag": "forge:dusts/redstone" + }, + "I": { + "tag": "forge:ingots/iron" + }, + "W": { + "item": "chipped:mason_table" + } + }, + "result": { + "item": "sophisticatedbackpacks:chipped/mason_workbench_upgrade" + } +} \ No newline at end of file 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 new file mode 100644 index 00000000..cb157065 --- /dev/null +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/philosopher_workbench_upgrade.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:crafting_shaped", + "conditions": [ + { + "modid": "chipped", + "type": "forge:mod_loaded" + }, + { + "itemRegistryName": "sophisticatedbackpacks:chipped/philosopher_workbench_upgrade", + "type": "sophisticatedcore:item_enabled" + } + ], + "pattern": [ + " W ", + "IBI", + " R " + ], + "key": { + "B": { + "item": "sophisticatedbackpacks:upgrade_base" + }, + "R": { + "tag": "forge:dusts/redstone" + }, + "I": { + "tag": "forge:ingots/iron" + }, + "W": { + "item": "chipped:alchemy_bench" + } + }, + "result": { + "item": "sophisticatedbackpacks:chipped/philosopher_workbench_upgrade" + } +} \ No newline at end of file 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 new file mode 100644 index 00000000..dcc74141 --- /dev/null +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/shepherd_workbench_upgrade.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:crafting_shaped", + "conditions": [ + { + "modid": "chipped", + "type": "forge:mod_loaded" + }, + { + "itemRegistryName": "sophisticatedbackpacks:chipped/shepherd_workbench_upgrade", + "type": "sophisticatedcore:item_enabled" + } + ], + "pattern": [ + " W ", + "IBI", + " R " + ], + "key": { + "B": { + "item": "sophisticatedbackpacks:upgrade_base" + }, + "R": { + "tag": "forge:dusts/redstone" + }, + "I": { + "tag": "forge:ingots/iron" + }, + "W": { + "item": "chipped:loom_table" + } + }, + "result": { + "item": "sophisticatedbackpacks:chipped/shepherd_workbench_upgrade" + } +} \ No newline at end of file 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 new file mode 100644 index 00000000..56642561 --- /dev/null +++ b/src/generated/resources/data/sophisticatedbackpacks/recipes/chipped/tinkerer_workbench_upgrade.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:crafting_shaped", + "conditions": [ + { + "modid": "chipped", + "type": "forge:mod_loaded" + }, + { + "itemRegistryName": "sophisticatedbackpacks:chipped/tinkerer_workbench_upgrade", + "type": "sophisticatedcore:item_enabled" + } + ], + "pattern": [ + " W ", + "IBI", + " R " + ], + "key": { + "B": { + "item": "sophisticatedbackpacks:upgrade_base" + }, + "R": { + "tag": "forge:dusts/redstone" + }, + "I": { + "tag": "forge:ingots/iron" + }, + "W": { + "item": "chipped:mechanist_workbench" + } + }, + "result": { + "item": "sophisticatedbackpacks:chipped/tinkerer_workbench_upgrade" + } +} \ No newline at end of file diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/SophisticatedBackpacks.java b/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/SophisticatedBackpacks.java index ec888cea..23206313 100644 --- a/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/SophisticatedBackpacks.java +++ b/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/SophisticatedBackpacks.java @@ -45,6 +45,7 @@ public SophisticatedBackpacks() { ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, Config.SERVER_SPEC); ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, Config.COMMON_SPEC); commonEventHandler.registerHandlers(); + ModCompat.initCompats(); IEventBus modBus = FMLJavaModLoadingContext.get().getModEventBus(); if (FMLEnvironment.dist == Dist.CLIENT) { ClientEventHandler.registerHandlers(); @@ -66,7 +67,7 @@ public SophisticatedBackpacks() { private static void setup(FMLCommonSetupEvent event) { SBPPacketHandler.INSTANCE.init(); - ModCompat.initCompats(); + ModCompat.compatsSetup(); event.enqueueWork(ModItems::registerDispenseBehavior); ModItems.registerCauldronInteractions(); } diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/CompatModIds.java b/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/CompatModIds.java index c7272284..9680eb86 100644 --- a/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/CompatModIds.java +++ b/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/CompatModIds.java @@ -6,4 +6,5 @@ private CompatModIds() {} public static final String BOTANIA = "botania"; public static final String CURIOS = "curios"; public static final String QUARK = "quark"; + public static final String CHIPPED = "chipped"; } diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/chipped/ChippedCompat.java b/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/chipped/ChippedCompat.java new file mode 100644 index 00000000..584a545c --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/chipped/ChippedCompat.java @@ -0,0 +1,74 @@ +package net.p3pp3rf1y.sophisticatedbackpacks.compat.chipped; + +import earth.terrarium.chipped.common.registry.ModRecipeTypes; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.fml.DistExecutor; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegisterEvent; +import net.minecraftforge.registries.RegistryObject; +import net.p3pp3rf1y.sophisticatedbackpacks.SophisticatedBackpacks; +import net.p3pp3rf1y.sophisticatedbackpacks.client.gui.SBPButtonDefinitions; +import net.p3pp3rf1y.sophisticatedbackpacks.init.ModItems; +import net.p3pp3rf1y.sophisticatedcore.client.gui.StorageScreenBase; +import net.p3pp3rf1y.sophisticatedcore.client.gui.UpgradeGuiManager; +import net.p3pp3rf1y.sophisticatedcore.client.gui.utils.Position; +import net.p3pp3rf1y.sophisticatedcore.common.gui.UpgradeContainerRegistry; +import net.p3pp3rf1y.sophisticatedcore.common.gui.UpgradeContainerType; +import net.p3pp3rf1y.sophisticatedcore.compat.ICompat; +import net.p3pp3rf1y.sophisticatedcore.compat.chipped.BlockTransformationUpgradeContainer; +import net.p3pp3rf1y.sophisticatedcore.compat.chipped.BlockTransformationUpgradeItem; +import net.p3pp3rf1y.sophisticatedcore.compat.chipped.BlockTransformationUpgradeTab; +import net.p3pp3rf1y.sophisticatedcore.compat.chipped.BlockTransformationUpgradeWrapper; + +public class ChippedCompat implements ICompat { + + public static final RegistryObject BOTANIST_WORKBENCH_UPGRADE = ModItems.ITEMS.register("chipped/botanist_workbench_upgrade", + () -> new BlockTransformationUpgradeItem(SophisticatedBackpacks.ITEM_GROUP, ModRecipeTypes.BOTANIST_WORKBENCH_TYPE)); + public static final RegistryObject GLASSBLOWER_WORKBENCH_UPGRADE = ModItems.ITEMS.register("chipped/glassblower_workbench_upgrade", + () -> new BlockTransformationUpgradeItem(SophisticatedBackpacks.ITEM_GROUP, ModRecipeTypes.GLASSBLOWER_TYPE)); + public static final RegistryObject CARPENTER_WORKBENCH_UPGRADE = ModItems.ITEMS.register("chipped/carpenter_workbench_upgrade", + () -> new BlockTransformationUpgradeItem(SophisticatedBackpacks.ITEM_GROUP, ModRecipeTypes.CARPENTERS_TABLE_TYPE)); + public static final RegistryObject SHEPHERD_WORKBENCH_UPGRADE = ModItems.ITEMS.register("chipped/shepherd_workbench_upgrade", + () -> new BlockTransformationUpgradeItem(SophisticatedBackpacks.ITEM_GROUP, ModRecipeTypes.LOOM_TABLE_TYPE)); + public static final RegistryObject MASON_WORKBENCH_UPGRADE = ModItems.ITEMS.register("chipped/mason_workbench_upgrade", + () -> new BlockTransformationUpgradeItem(SophisticatedBackpacks.ITEM_GROUP, ModRecipeTypes.MASON_TABLE_TYPE)); + public static final RegistryObject PHILOSOPHER_WORKBENCH_UPGRADE = ModItems.ITEMS.register("chipped/philosopher_workbench_upgrade", + () -> new BlockTransformationUpgradeItem(SophisticatedBackpacks.ITEM_GROUP, ModRecipeTypes.ALCHEMY_BENCH_TYPE)); + public static final RegistryObject TINKERER_WORKBENCH_UPGRADE = ModItems.ITEMS.register("chipped/tinkerer_workbench_upgrade", + () -> new BlockTransformationUpgradeItem(SophisticatedBackpacks.ITEM_GROUP, ModRecipeTypes.TINKERING_TABLE_TYPE)); + + @Override + public void init() { + IEventBus modBus = FMLJavaModLoadingContext.get().getModEventBus(); + modBus.addListener(this::registerContainers); + } + + public void registerContainers(RegisterEvent event) { + if (!event.getRegistryKey().equals(ForgeRegistries.Keys.MENU_TYPES)) { + return; + } + registerUpgradeContainer(BOTANIST_WORKBENCH_UPGRADE); + registerUpgradeContainer(GLASSBLOWER_WORKBENCH_UPGRADE); + registerUpgradeContainer(CARPENTER_WORKBENCH_UPGRADE); + registerUpgradeContainer(SHEPHERD_WORKBENCH_UPGRADE); + registerUpgradeContainer(MASON_WORKBENCH_UPGRADE); + registerUpgradeContainer(PHILOSOPHER_WORKBENCH_UPGRADE); + registerUpgradeContainer(TINKERER_WORKBENCH_UPGRADE); + } + + private void registerUpgradeContainer(RegistryObject item) { + UpgradeContainerType containerType = new UpgradeContainerType<>(BlockTransformationUpgradeContainer::new); + UpgradeContainerRegistry.register(item.getId(), containerType); + DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> UpgradeGuiManager.registerTab(containerType, (BlockTransformationUpgradeContainer upgradeContainer, Position position, StorageScreenBase screen) -> { + String itemName = item.getId().getPath(); + return new BlockTransformationUpgradeTab(upgradeContainer, position, screen, SBPButtonDefinitions.SHIFT_CLICK_TARGET, itemName.replace('/', '_').substring(0, itemName.length() - "_upgrade".length())); + })); + } + + @Override + public void setup() { + //noop + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/curios/CuriosCompat.java b/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/curios/CuriosCompat.java index 26528dac..b3c447d1 100644 --- a/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/curios/CuriosCompat.java +++ b/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/curios/CuriosCompat.java @@ -40,18 +40,6 @@ public class CuriosCompat implements ICompat { public CuriosCompat() { IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); modEventBus.addListener(this::sendImc); - DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> { - CuriosRendererRegistry.register(ModItems.BACKPACK.get(), BackpackCurioRenderer::new); - CuriosRendererRegistry.register(ModItems.IRON_BACKPACK.get(), BackpackCurioRenderer::new); - CuriosRendererRegistry.register(ModItems.GOLD_BACKPACK.get(), BackpackCurioRenderer::new); - CuriosRendererRegistry.register(ModItems.DIAMOND_BACKPACK.get(), BackpackCurioRenderer::new); - CuriosRendererRegistry.register(ModItems.NETHERITE_BACKPACK.get(), BackpackCurioRenderer::new); - }); - - IEventBus eventBus = MinecraftForge.EVENT_BUS; - eventBus.addGenericListener(ItemStack.class, this::onAttachCapabilities); - - addPlayerInventoryHandlers(); } private void addPlayerInventoryHandlers() { @@ -100,6 +88,17 @@ public LazyOptional getCapability(Capability cap, @Nullable Direction @Override public void setup() { - //noop + DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> { + CuriosRendererRegistry.register(ModItems.BACKPACK.get(), BackpackCurioRenderer::new); + CuriosRendererRegistry.register(ModItems.IRON_BACKPACK.get(), BackpackCurioRenderer::new); + CuriosRendererRegistry.register(ModItems.GOLD_BACKPACK.get(), BackpackCurioRenderer::new); + CuriosRendererRegistry.register(ModItems.DIAMOND_BACKPACK.get(), BackpackCurioRenderer::new); + CuriosRendererRegistry.register(ModItems.NETHERITE_BACKPACK.get(), BackpackCurioRenderer::new); + }); + + IEventBus eventBus = MinecraftForge.EVENT_BUS; + eventBus.addGenericListener(ItemStack.class, this::onAttachCapabilities); + + addPlayerInventoryHandlers(); } } diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/data/SBPRecipeProvider.java b/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/data/SBPRecipeProvider.java index b62ec537..adae83c2 100644 --- a/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/data/SBPRecipeProvider.java +++ b/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/data/SBPRecipeProvider.java @@ -11,10 +11,15 @@ import net.minecraft.tags.ItemTags; import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraftforge.common.Tags; +import net.minecraftforge.common.crafting.conditions.ModLoadedCondition; import net.p3pp3rf1y.sophisticatedbackpacks.SophisticatedBackpacks; +import net.p3pp3rf1y.sophisticatedbackpacks.compat.chipped.ChippedCompat; import net.p3pp3rf1y.sophisticatedbackpacks.init.ModItems; +import net.p3pp3rf1y.sophisticatedcore.compat.CompatModIds; +import net.p3pp3rf1y.sophisticatedcore.compat.chipped.BlockTransformationUpgradeItem; import net.p3pp3rf1y.sophisticatedcore.crafting.ShapeBasedRecipeBuilder; import net.p3pp3rf1y.sophisticatedcore.init.ModRecipes; import net.p3pp3rf1y.sophisticatedcore.util.RegistryHelper; @@ -572,6 +577,32 @@ protected void buildCraftingRecipes(Consumer consumer) { Ingredient.of(Items.NETHERITE_INGOT), ModItems.NETHERITE_BACKPACK.get()) .unlocks("has_diamond_backpack", has(ModItems.DIAMOND_BACKPACK.get())) .save(consumer, RegistryHelper.getItemKey(ModItems.NETHERITE_BACKPACK.get())); + + addChippedUpgradeRecipes(consumer); + } + + private static void addChippedUpgradeRecipes(Consumer consumer) { + addChippedUpgradeRecipe(consumer, ChippedCompat.BOTANIST_WORKBENCH_UPGRADE.get(), earth.terrarium.chipped.common.registry.ModBlocks.BOTANIST_WORKBENCH.get()); + addChippedUpgradeRecipe(consumer, ChippedCompat.GLASSBLOWER_WORKBENCH_UPGRADE.get(), earth.terrarium.chipped.common.registry.ModBlocks.GLASSBLOWER.get()); + addChippedUpgradeRecipe(consumer, ChippedCompat.CARPENTER_WORKBENCH_UPGRADE.get(), earth.terrarium.chipped.common.registry.ModBlocks.CARPENTERS_TABLE.get()); + addChippedUpgradeRecipe(consumer, ChippedCompat.SHEPHERD_WORKBENCH_UPGRADE.get(), earth.terrarium.chipped.common.registry.ModBlocks.LOOM_TABLE.get()); + addChippedUpgradeRecipe(consumer, ChippedCompat.MASON_WORKBENCH_UPGRADE.get(), earth.terrarium.chipped.common.registry.ModBlocks.MASON_TABLE.get()); + addChippedUpgradeRecipe(consumer, ChippedCompat.PHILOSOPHER_WORKBENCH_UPGRADE.get(), earth.terrarium.chipped.common.registry.ModBlocks.ALCHEMY_BENCH.get()); + addChippedUpgradeRecipe(consumer, ChippedCompat.TINKERER_WORKBENCH_UPGRADE.get(), earth.terrarium.chipped.common.registry.ModBlocks.TINKERING_TABLE.get()); + } + + private static void addChippedUpgradeRecipe(Consumer consumer, BlockTransformationUpgradeItem upgrade, Block workbench) { + ShapeBasedRecipeBuilder.shaped(upgrade) + .pattern(" W ") + .pattern("IBI") + .pattern(" R ") + .define('B', ModItems.UPGRADE_BASE.get()) + .define('R', Tags.Items.DUSTS_REDSTONE) + .define('I', Tags.Items.INGOTS_IRON) + .define('W', workbench) + .unlockedBy(HAS_UPGRADE_BASE, has(ModItems.UPGRADE_BASE.get())) + .condition(new ModLoadedCondition(CompatModIds.CHIPPED)) + .save(consumer); } private static InventoryChangeTrigger.TriggerInstance hasLeather() { diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/init/ModCompat.java b/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/init/ModCompat.java index 9f4afe3c..4746b1b1 100644 --- a/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/init/ModCompat.java +++ b/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/init/ModCompat.java @@ -3,6 +3,7 @@ import net.minecraftforge.fml.ModList; import net.p3pp3rf1y.sophisticatedbackpacks.SophisticatedBackpacks; import net.p3pp3rf1y.sophisticatedbackpacks.compat.CompatModIds; +import net.p3pp3rf1y.sophisticatedbackpacks.compat.chipped.ChippedCompat; import net.p3pp3rf1y.sophisticatedbackpacks.compat.curios.CuriosCompat; import net.p3pp3rf1y.sophisticatedcore.compat.ICompat; @@ -15,22 +16,30 @@ public class ModCompat { private ModCompat() {} private static final Map>> compatFactories = new HashMap<>(); + private static final Map loadedCompats = new HashMap<>(); static { compatFactories.put(CompatModIds.CURIOS, () -> CuriosCompat::new); - //compatFactories.put(CompatModIds.BOTANIA, () -> BotaniaCompat::new); //TODO readd Botania compat + //compatFactories.put(CompatModIds.BOTANIA, () -> BotaniaCompat::new); + compatFactories.put(CompatModIds.CHIPPED, () -> ChippedCompat::new); + } + + public static void compatsSetup() { + loadedCompats.values().forEach(ICompat::setup); } public static void initCompats() { for (Map.Entry>> entry : compatFactories.entrySet()) { if (ModList.get().isLoaded(entry.getKey())) { try { - entry.getValue().get().call().setup(); + loadedCompats.put(entry.getKey(), entry.getValue().get().call()); } catch (Exception e) { SophisticatedBackpacks.LOGGER.error("Error instantiating compatibility ", e); } } } + + loadedCompats.values().forEach(ICompat::init); } } diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/init/ModItems.java b/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/init/ModItems.java index 28ea97c6..b5c9a84e 100644 --- a/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/init/ModItems.java +++ b/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/init/ModItems.java @@ -149,7 +149,7 @@ public class ModItems { private ModItems() {} - private static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, SophisticatedBackpacks.MOD_ID); + public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, SophisticatedBackpacks.MOD_ID); private static final DeferredRegister> MENU_TYPES = DeferredRegister.create(ForgeRegistries.MENU_TYPES, SophisticatedBackpacks.MOD_ID); private static final DeferredRegister> ENTITY_TYPES = DeferredRegister.create(ForgeRegistries.ENTITY_TYPES, SophisticatedBackpacks.MOD_ID); diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 3d6b5bd7..8ba3b100 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -60,7 +60,7 @@ side="BOTH" [[dependencies.sophisticatedbackpacks]] modId="sophisticatedcore" #mandatory mandatory=true #mandatory -versionRange="[1.19.2-0.5.97,)" #mandatory +versionRange="[1.19.2-0.5.104,)" #mandatory # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory ordering="NONE" # Side this dependency is applied on - BOTH, CLIENT or SERVER diff --git a/src/main/resources/assets/sophisticatedbackpacks/lang/en_us.json b/src/main/resources/assets/sophisticatedbackpacks/lang/en_us.json index 4823829c..53131035 100644 --- a/src/main/resources/assets/sophisticatedbackpacks/lang/en_us.json +++ b/src/main/resources/assets/sophisticatedbackpacks/lang/en_us.json @@ -91,6 +91,20 @@ "item.sophisticatedbackpacks.tool_swapper_upgrade.tooltip": "Automatically swaps item in player's hand for the one effective on the block/entity when these are left clicked.", "item.sophisticatedbackpacks.advanced_tool_swapper_upgrade": "Advanced Tool Swapper Upgrade", "item.sophisticatedbackpacks.advanced_tool_swapper_upgrade.tooltip": "Automatically swaps item in player's hand for the one effective on the block/entity when these are left clicked.\nHas filter options and enables swapping wrench like tools for block/entity player is looking at with %s", + "item.sophisticatedbackpacks.chipped.botanist_workbench_upgrade": "Chipped: Botanist's Workbench Upgrade", + "item.sophisticatedbackpacks.chipped.botanist_workbench_upgrade.tooltip": "Chipped Botanist's Workbench in an upgrade tab", + "item.sophisticatedbackpacks.chipped.glassblower_workbench_upgrade": "Chipped: Glassblower's Workbench Upgrade", + "item.sophisticatedbackpacks.chipped.glassblower_workbench_upgrade.tooltip": "Chipped Glassblower's Workbench in an upgrade tab", + "item.sophisticatedbackpacks.chipped.carpenter_workbench_upgrade": "Chipped: Carpenter's Workbench Upgrade", + "item.sophisticatedbackpacks.chipped.carpenter_workbench_upgrade.tooltip": "Chipped Carpenter's Workbench in an upgrade tab", + "item.sophisticatedbackpacks.chipped.mason_workbench_upgrade": "Chipped: Mason's Workbench Upgrade", + "item.sophisticatedbackpacks.chipped.mason_workbench_upgrade.tooltip": "Chipped Mason's Workbench in an upgrade tab", + "item.sophisticatedbackpacks.chipped.shepherd_workbench_upgrade": "Chipped: Shepherd's Workbench Upgrade", + "item.sophisticatedbackpacks.chipped.shepherd_workbench_upgrade.tooltip": "Chipped Shepherd's Workbench in an upgrade tab", + "item.sophisticatedbackpacks.chipped.philosopher_workbench_upgrade": "Chipped: Philosopher's Workbench Upgrade", + "item.sophisticatedbackpacks.chipped.philosopher_workbench_upgrade.tooltip": "Chipped Philosopher's Workbench in an upgrade tab", + "item.sophisticatedbackpacks.chipped.tinkerer_workbench_upgrade": "Chipped: Tinkerer's Workbench Upgrade", + "item.sophisticatedbackpacks.chipped.tinkerer_workbench_upgrade.tooltip": "Chipped Tinkerer's Workbench in an upgrade tab", "keybind.sophisticatedbackpacks.category": "Sophisticated Backpacks", "keybind.sophisticatedbackpacks.open_backpack": "Open Backpack", "keybind.sophisticatedbackpacks.inventory_interaction": "Run Inventory Interaction Upgrades", diff --git a/src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/botanist_workbench_upgrade.json b/src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/botanist_workbench_upgrade.json new file mode 100644 index 00000000..52f3b3a0 --- /dev/null +++ b/src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/botanist_workbench_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "sophisticatedbackpacks:item/chipped/botanist_workbench_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/carpenter_workbench_upgrade.json b/src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/carpenter_workbench_upgrade.json new file mode 100644 index 00000000..61f96b95 --- /dev/null +++ b/src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/carpenter_workbench_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "sophisticatedbackpacks:item/chipped/carpenter_workbench_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/glassblower_workbench_upgrade.json b/src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/glassblower_workbench_upgrade.json new file mode 100644 index 00000000..a47f219b --- /dev/null +++ b/src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/glassblower_workbench_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "sophisticatedbackpacks:item/chipped/glassblower_workbench_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/mason_workbench_upgrade.json b/src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/mason_workbench_upgrade.json new file mode 100644 index 00000000..954c481e --- /dev/null +++ b/src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/mason_workbench_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "sophisticatedbackpacks:item/chipped/mason_workbench_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/philosopher_workbench_upgrade.json b/src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/philosopher_workbench_upgrade.json new file mode 100644 index 00000000..ec99417d --- /dev/null +++ b/src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/philosopher_workbench_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "sophisticatedbackpacks:item/chipped/philosopher_workbench_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/shepherd_workbench_upgrade.json b/src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/shepherd_workbench_upgrade.json new file mode 100644 index 00000000..976230bd --- /dev/null +++ b/src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/shepherd_workbench_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "sophisticatedbackpacks:item/chipped/shepherd_workbench_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/tinkerer_workbench_upgrade.json b/src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/tinkerer_workbench_upgrade.json new file mode 100644 index 00000000..b9e898f2 --- /dev/null +++ b/src/main/resources/assets/sophisticatedbackpacks/models/item/chipped/tinkerer_workbench_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "sophisticatedbackpacks:item/chipped/tinkerer_workbench_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sophisticatedbackpacks/textures/item/chipped/botanist_workbench_upgrade.png b/src/main/resources/assets/sophisticatedbackpacks/textures/item/chipped/botanist_workbench_upgrade.png new file mode 100644 index 0000000000000000000000000000000000000000..5111b33abfc74378a1a218f1135151e217bff6ae GIT binary patch literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`r#xL8Lo7}wCoEv&2o(PQN2;f|bzTTX-}{$3;lcAmFJ()b4fi}yKGU=4!MDZY8Z#D%pW?rhW>ND~ z&iQBK?I*{XG#ehZxD*DZIf(_Vn{jT#+k4WBZiFy1v?X=CFShr(3G@|%r>mdKI;Vst E0I!N|wEzGB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/sophisticatedbackpacks/textures/item/chipped/carpenter_workbench_upgrade.png b/src/main/resources/assets/sophisticatedbackpacks/textures/item/chipped/carpenter_workbench_upgrade.png new file mode 100644 index 0000000000000000000000000000000000000000..41c5473650b50d7b9fd58a9c697b3f0a6a7eb468 GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`+dN$yLo7}wCoEv&2o(PxlU%=u^IZHY$)wmLUV&hGp^Gh@AhA<)bx=c0O*W-L0w zeS8Ol55JefBq6p94k-th3*3D_mv7aP%0>x>%gzR31&lM~)VzWXk8*ZCT5_gEXF-hN j+{D{^&0RLGWMc@sQ*lN7N5NH~4;VaM{an^LB{Ts5mgi!$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/sophisticatedbackpacks/textures/item/chipped/glassblower_workbench_upgrade.png b/src/main/resources/assets/sophisticatedbackpacks/textures/item/chipped/glassblower_workbench_upgrade.png new file mode 100644 index 0000000000000000000000000000000000000000..b1bcf9477aecf86754aee622051dde1a27f16bf3 GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`2RvOILo7}wCoEv&2o(P_O7Y4{d(Y_Jzopr0JJ)0YybcN literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/sophisticatedbackpacks/textures/item/chipped/mason_workbench_upgrade.png b/src/main/resources/assets/sophisticatedbackpacks/textures/item/chipped/mason_workbench_upgrade.png new file mode 100644 index 0000000000000000000000000000000000000000..fb188dcd71a036afbf791a440b02c893659cbf97 GIT binary patch literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`r#xL8Lo7}wCoEv&2o(P=*f8fAdcm0mfhaR5(F2NVSkNx>{`5k8i>K>TQ@x8#kZI>4h5VOR( zY!dJ2V+~?F%Gvp7$(a_N1u=$m6L0S|ciFg-jp3eD)AIQZd(Q#A#o+1c=d#Wzp$Pz_ CR&qE1 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/sophisticatedbackpacks/textures/item/chipped/shepherd_workbench_upgrade.png b/src/main/resources/assets/sophisticatedbackpacks/textures/item/chipped/shepherd_workbench_upgrade.png new file mode 100644 index 0000000000000000000000000000000000000000..37c79a6eab6dde19f5fe78940a762a9d599e7b2e GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Cp=voLo7}wCoEv&2o(P^K(wu)b-gfCU1Q`t? zo}7#7Rl4zVLDxcoSe|9<%f&fb8P9O*>=0RKEjfF2K~bBQj@vT3Beq!)+^>bP0l+XkKbPH=L literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/sophisticatedbackpacks/textures/item/chipped/tinkerer_workbench_upgrade.png b/src/main/resources/assets/sophisticatedbackpacks/textures/item/chipped/tinkerer_workbench_upgrade.png new file mode 100644 index 0000000000000000000000000000000000000000..6578a82eabb4b86d529eb7b53b699a81c34d8218 GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`2R&UJLo7}wCoEv&2o(PArm-oI3!ri2fIX~#O;ejRD*H!yB{`(mR* rVNjZrSirg&=Qg~(C%x!K2s6We)%v-I6&=n3J;UJX>gTe~DWM4fvi@fe literal 0 HcmV?d00001 From b3c13edaaca92c8badfd77b101cdb0bb9eef10de Mon Sep 17 00:00:00 2001 From: P3pp3rF1y Date: Sun, 19 Nov 2023 02:01:45 +0100 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E2=9C=A8=20Add=20stonecutter=20and?= =?UTF-8?q?=20chipped=20upgrades=20as=20recipe=20catalysts=20so=20that=20t?= =?UTF-8?q?hey=20show=20up=20in=20JEI=20as=20ways=20to=20craft=20the=20giv?= =?UTF-8?q?en=20blocks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- .../advanced_compacting_upgrade.json | 20 +++++------ .../advanced_deposit_upgrade.json | 20 +++++------ .../advanced_feeding_upgrade.json | 20 +++++------ .../advanced_filter_upgrade.json | 20 +++++------ .../advanced_magnet_upgrade.json | 20 +++++------ .../advanced_magnet_upgrade_from_basic.json | 20 +++++------ .../advanced_pickup_upgrade.json | 20 +++++------ .../advanced_pump_upgrade.json | 20 +++++------ .../advanced_refill_upgrade.json | 20 +++++------ .../advanced_restock_upgrade.json | 20 +++++------ .../advanced_tool_swapper_upgrade.json | 28 +++++++-------- .../advanced_void_upgrade.json | 28 +++++++-------- .../auto_blasting_upgrade.json | 20 +++++------ ...ng_upgrade_from_auto_smelting_upgrade.json | 20 +++++------ .../auto_smelting_upgrade.json | 20 +++++------ .../auto_smoking_upgrade.json | 20 +++++------ ...ng_upgrade_from_auto_smelting_upgrade.json | 20 +++++------ .../sophisticatedbackpacks/backpack.json | 20 +++++------ .../battery_upgrade.json | 28 +++++++-------- .../blasting_upgrade.json | 28 +++++++-------- ...lasting_upgrade_from_smelting_upgrade.json | 20 +++++------ .../chipped/botanist_workbench_upgrade.json | 28 +++++++-------- .../chipped/carpenter_workbench_upgrade.json | 28 +++++++-------- .../glassblower_workbench_upgrade.json | 28 +++++++-------- .../chipped/mason_workbench_upgrade.json | 28 +++++++-------- .../philosopher_workbench_upgrade.json | 28 +++++++-------- .../chipped/shepherd_workbench_upgrade.json | 28 +++++++-------- .../chipped/tinkerer_workbench_upgrade.json | 28 +++++++-------- .../compacting_upgrade.json | 28 +++++++-------- .../crafting_upgrade.json | 28 +++++++-------- .../deposit_upgrade.json | 28 +++++++-------- .../diamond_backpack.json | 20 +++++------ .../everlasting_upgrade.json | 28 +++++++-------- .../feeding_upgrade.json | 28 +++++++-------- .../filter_upgrade.json | 28 +++++++-------- .../sophisticatedbackpacks/gold_backpack.json | 20 +++++------ .../inception_upgrade.json | 28 +++++++-------- .../sophisticatedbackpacks/iron_backpack.json | 20 +++++------ .../jukebox_upgrade.json | 28 +++++++-------- .../magnet_upgrade.json | 20 +++++------ .../netherite_backpack.json | 20 +++++------ .../pickup_upgrade.json | 28 +++++++-------- .../sophisticatedbackpacks/pump_upgrade.json | 28 +++++++-------- .../refill_upgrade.json | 28 +++++++-------- .../restock_upgrade.json | 28 +++++++-------- .../smelting_upgrade.json | 28 +++++++-------- .../smoking_upgrade.json | 28 +++++++-------- ...smoking_upgrade_from_smelting_upgrade.json | 20 +++++------ .../stack_upgrade_tier_1.json | 28 +++++++-------- .../stack_upgrade_tier_2.json | 28 +++++++-------- .../stack_upgrade_tier_3.json | 28 +++++++-------- .../stack_upgrade_tier_4.json | 28 +++++++-------- .../stonecutter_upgrade.json | 28 +++++++-------- .../sophisticatedbackpacks/tank_upgrade.json | 28 +++++++-------- .../tool_swapper_upgrade.json | 28 +++++++-------- .../sophisticatedbackpacks/upgrade_base.json | 20 +++++------ .../sophisticatedbackpacks/void_upgrade.json | 28 +++++++-------- .../xp_pump_upgrade.json | 20 +++++------ .../loot_tables/blocks/backpack.json | 6 ++-- .../loot_tables/blocks/diamond_backpack.json | 6 ++-- .../loot_tables/blocks/gold_backpack.json | 6 ++-- .../loot_tables/blocks/iron_backpack.json | 6 ++-- .../blocks/netherite_backpack.json | 6 ++-- .../inject/chests/abandoned_mineshaft.json | 18 +++++----- .../inject/chests/bastion_treasure.json | 18 +++++----- .../inject/chests/desert_pyramid.json | 18 +++++----- .../inject/chests/end_city_treasure.json | 18 +++++----- .../inject/chests/nether_bridge.json | 18 +++++----- .../inject/chests/shipwreck_treasure.json | 18 +++++----- .../inject/chests/simple_dungeon.json | 18 +++++----- .../inject/chests/woodland_mansion.json | 18 +++++----- .../recipes/advanced_compacting_upgrade.json | 20 +++++------ .../recipes/advanced_deposit_upgrade.json | 14 ++++---- .../recipes/advanced_feeding_upgrade.json | 14 ++++---- .../recipes/advanced_filter_upgrade.json | 18 +++++----- .../recipes/advanced_magnet_upgrade.json | 20 +++++------ .../advanced_magnet_upgrade_from_basic.json | 20 +++++------ .../recipes/advanced_pickup_upgrade.json | 20 +++++------ .../recipes/advanced_pump_upgrade.json | 24 ++++++------- .../recipes/advanced_refill_upgrade.json | 20 +++++------ .../recipes/advanced_restock_upgrade.json | 14 ++++---- .../advanced_tool_swapper_upgrade.json | 14 ++++---- .../recipes/advanced_void_upgrade.json | 14 ++++---- .../recipes/auto_blasting_upgrade.json | 20 +++++------ ...ng_upgrade_from_auto_smelting_upgrade.json | 20 +++++------ .../recipes/auto_smelting_upgrade.json | 20 +++++------ .../recipes/auto_smoking_upgrade.json | 20 +++++------ ...ng_upgrade_from_auto_smelting_upgrade.json | 20 +++++------ .../recipes/backpack.json | 20 +++++------ .../recipes/battery_upgrade.json | 22 ++++++------ .../recipes/blasting_upgrade.json | 22 ++++++------ ...lasting_upgrade_from_smelting_upgrade.json | 20 +++++------ .../chipped/botanist_workbench_upgrade.json | 24 ++++++------- .../chipped/carpenter_workbench_upgrade.json | 24 ++++++------- .../glassblower_workbench_upgrade.json | 24 ++++++------- .../chipped/mason_workbench_upgrade.json | 24 ++++++------- .../philosopher_workbench_upgrade.json | 24 ++++++------- .../chipped/shepherd_workbench_upgrade.json | 24 ++++++------- .../chipped/tinkerer_workbench_upgrade.json | 26 +++++++------- .../recipes/compacting_upgrade.json | 14 ++++---- .../recipes/crafting_upgrade.json | 14 ++++---- .../recipes/deposit_upgrade.json | 20 +++++------ .../recipes/diamond_backpack.json | 20 +++++------ .../recipes/everlasting_upgrade.json | 20 +++++------ .../recipes/feeding_upgrade.json | 24 ++++++------- .../recipes/filter_upgrade.json | 14 ++++---- .../recipes/gold_backpack.json | 20 +++++------ .../recipes/inception_upgrade.json | 20 +++++------ .../recipes/iron_backpack.json | 20 +++++------ .../recipes/jukebox_upgrade.json | 20 +++++------ .../recipes/magnet_upgrade.json | 20 +++++------ .../recipes/netherite_backpack.json | 6 ++-- .../recipes/pickup_upgrade.json | 20 +++++------ .../recipes/pump_upgrade.json | 22 ++++++------ .../recipes/refill_upgrade.json | 20 +++++------ .../recipes/restock_upgrade.json | 20 +++++------ .../recipes/smelting_upgrade.json | 22 ++++++------ .../recipes/smoking_upgrade.json | 20 +++++------ ...smoking_upgrade_from_smelting_upgrade.json | 20 +++++------ .../recipes/stack_upgrade_tier_1.json | 14 ++++---- .../recipes/stack_upgrade_tier_2.json | 20 +++++------ .../recipes/stack_upgrade_tier_3.json | 20 +++++------ .../recipes/stack_upgrade_tier_4.json | 20 +++++------ .../recipes/stonecutter_upgrade.json | 20 +++++------ .../recipes/tank_upgrade.json | 20 +++++------ .../recipes/tool_swapper_upgrade.json | 34 +++++++++---------- .../recipes/upgrade_base.json | 20 +++++------ .../recipes/void_upgrade.json | 14 ++++---- .../recipes/xp_pump_upgrade.json | 24 ++++++------- .../compat/chipped/ChippedCompat.java | 16 +++++++++ .../compat/chipped/package-info.java | 8 +++++ .../compat/jei/SBPPlugin.java | 8 +++++ 133 files changed, 1406 insertions(+), 1374 deletions(-) create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/compat/chipped/package-info.java 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