diff --git a/build.gradle b/build.gradle index d6e3ea7..8a0f810 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'eclipse' id 'idea' - id 'net.minecraftforge.gradle' version '[6.0,6.2)' + id 'net.minecraftforge.gradle' version '[6.0.14,6.2)' } import net.minecraftforge.gradle.common.tasks.SignJar diff --git a/gradle.properties b/gradle.properties index d283177..b419f6a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,8 +7,8 @@ mod_name=Simple Sponge mc_version=1.20.2 mc_version_range=[1.20.2,1.21) -forge_version=48.0.13 -forge_version_range=[48,) +forge_version=48.0.20 +forge_version_range=[48.0.17,) loader_version_range=[48,) mappings_channel=official diff --git a/src/main/resources/data/simplesponge/recipes/compressed_sponge_on_a_stick.json b/src/main/resources/data/simplesponge/recipes/compressed_sponge_on_a_stick.json index bb63cee..742ace0 100644 --- a/src/main/resources/data/simplesponge/recipes/compressed_sponge_on_a_stick.json +++ b/src/main/resources/data/simplesponge/recipes/compressed_sponge_on_a_stick.json @@ -1,29 +1,30 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "forge:or", - "values": [ - { - "type": "simplesponge:openblocks_integration", "enabled": false - }, - { - "type": "forge:and", - "values": [ - { - "type": "simplesponge:openblocks_integration", "enabled": true - }, - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", "item": "openblocks:sponge_on_a_stick" - } + "forge:condition": { + "type": "forge:or", + "values": [ + { + "type": "simplesponge:openblocks_integration", + "enabled": false + }, + { + "type": "forge:and", + "values": [ + { + "type": "simplesponge:openblocks_integration", + "enabled": true + }, + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "openblocks:sponge_on_a_stick" } - ] - } - ] - } - ], + } + ] + } + ] + }, "pattern": [ "###", "###", diff --git a/src/main/resources/data/simplesponge/recipes/energized_sponge_on_a_stick.json b/src/main/resources/data/simplesponge/recipes/energized_sponge_on_a_stick.json index 7b4d232..bc092d4 100644 --- a/src/main/resources/data/simplesponge/recipes/energized_sponge_on_a_stick.json +++ b/src/main/resources/data/simplesponge/recipes/energized_sponge_on_a_stick.json @@ -1,10 +1,9 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "simplesponge:energized_sponge_on_a_stick", "enabled": true - } - ], + "forge:condition": { + "type": "simplesponge:energized_sponge_on_a_stick", + "enabled": true + }, "pattern": [ "R#R", "GBG", diff --git a/src/main/resources/data/simplesponge/recipes/magmatic_sponge.json b/src/main/resources/data/simplesponge/recipes/magmatic_sponge.json index 1f44b08..d4a06dd 100644 --- a/src/main/resources/data/simplesponge/recipes/magmatic_sponge.json +++ b/src/main/resources/data/simplesponge/recipes/magmatic_sponge.json @@ -1,29 +1,30 @@ { "type": "crafting_shapeless", - "conditions": [ - { - "type": "forge:or", - "values": [ - { - "type": "simplesponge:openblocks_integration", "enabled": false - }, - { - "type": "forge:and", - "values": [ - { - "type": "simplesponge:openblocks_integration", "enabled": true - }, - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", "item": "openblocks:sponge" - } + "forge:condition": { + "type": "forge:or", + "values": [ + { + "type": "simplesponge:openblocks_integration", + "enabled": false + }, + { + "type": "forge:and", + "values": [ + { + "type": "simplesponge:openblocks_integration", + "enabled": true + }, + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "openblocks:sponge" } - ] - } - ] - } - ], + } + ] + } + ] + }, "ingredients": [ { "item": "simplesponge:sponge" diff --git a/src/main/resources/data/simplesponge/recipes/magmatic_sponge_on_a_stick_upgrade.json b/src/main/resources/data/simplesponge/recipes/magmatic_sponge_on_a_stick_upgrade.json index e2ee758..7e29b99 100644 --- a/src/main/resources/data/simplesponge/recipes/magmatic_sponge_on_a_stick_upgrade.json +++ b/src/main/resources/data/simplesponge/recipes/magmatic_sponge_on_a_stick_upgrade.json @@ -1,29 +1,30 @@ { "type": "crafting_shapeless", - "conditions": [ - { - "type": "forge:or", - "values": [ - { - "type": "simplesponge:openblocks_integration", "enabled": false - }, - { - "type": "forge:and", - "values": [ - { - "type": "simplesponge:openblocks_integration", "enabled": true - }, - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", "item": "openblocks:sponge_on_a_stick" - } + "forge:condition": { + "type": "forge:or", + "values": [ + { + "type": "simplesponge:openblocks_integration", + "enabled": false + }, + { + "type": "forge:and", + "values": [ + { + "type": "simplesponge:openblocks_integration", + "enabled": true + }, + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "openblocks:sponge_on_a_stick" } - ] - } - ] - } - ], + } + ] + } + ] + }, "ingredients": [ { "item": "simplesponge:sponge_on_a_stick" diff --git a/src/main/resources/data/simplesponge/recipes/openblocks/compressed_sponge_on_a_stick.json b/src/main/resources/data/simplesponge/recipes/openblocks/compressed_sponge_on_a_stick.json index 1a2f0ec..afb1d2b 100644 --- a/src/main/resources/data/simplesponge/recipes/openblocks/compressed_sponge_on_a_stick.json +++ b/src/main/resources/data/simplesponge/recipes/openblocks/compressed_sponge_on_a_stick.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "simplesponge:openblocks_integration", "enabled": true - }, - { - "type": "forge:item_exists", "item": "openblocks:sponge_on_a_stick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "simplesponge:openblocks_integration", + "enabled": true + }, + { + "type": "forge:item_exists", + "item": "openblocks:sponge_on_a_stick" + } + ] + }, "pattern": [ "###", "###", diff --git a/src/main/resources/data/simplesponge/recipes/openblocks/magmatic_sponge.json b/src/main/resources/data/simplesponge/recipes/openblocks/magmatic_sponge.json index 1546f53..afc31a1 100644 --- a/src/main/resources/data/simplesponge/recipes/openblocks/magmatic_sponge.json +++ b/src/main/resources/data/simplesponge/recipes/openblocks/magmatic_sponge.json @@ -1,13 +1,18 @@ { "type": "crafting_shapeless", - "conditions": [ - { - "type": "simplesponge:openblocks_integration", "enabled": true - }, - { - "type": "forge:item_exists", "item": "openblocks:sponge" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "simplesponge:openblocks_integration", + "enabled": true + }, + { + "type": "forge:item_exists", + "item": "openblocks:sponge" + } + ] + }, "ingredients": [ { "item": "openblocks:sponge" diff --git a/src/main/resources/data/simplesponge/recipes/openblocks/magmatic_sponge_on_a_stick_upgrade.json b/src/main/resources/data/simplesponge/recipes/openblocks/magmatic_sponge_on_a_stick_upgrade.json index bea2c04..1dc0409 100644 --- a/src/main/resources/data/simplesponge/recipes/openblocks/magmatic_sponge_on_a_stick_upgrade.json +++ b/src/main/resources/data/simplesponge/recipes/openblocks/magmatic_sponge_on_a_stick_upgrade.json @@ -1,13 +1,18 @@ { "type": "crafting_shapeless", - "conditions": [ - { - "type": "simplesponge:openblocks_integration", "enabled": true - }, - { - "type": "forge:item_exists", "item": "openblocks:sponge_on_a_stick" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "simplesponge:openblocks_integration", + "enabled": true + }, + { + "type": "forge:item_exists", + "item": "openblocks:sponge_on_a_stick" + } + ] + }, "ingredients": [ { "item": "openblocks:sponge_on_a_stick" diff --git a/src/main/resources/data/simplesponge/recipes/sponge.json b/src/main/resources/data/simplesponge/recipes/sponge.json index b588f68..caf8df3 100644 --- a/src/main/resources/data/simplesponge/recipes/sponge.json +++ b/src/main/resources/data/simplesponge/recipes/sponge.json @@ -1,29 +1,30 @@ { "type": "crafting_shapeless", - "conditions": [ - { - "type": "forge:or", - "values": [ - { - "type": "simplesponge:openblocks_integration", "enabled": false - }, - { - "type": "forge:and", - "values": [ - { - "type": "simplesponge:openblocks_integration", "enabled": true - }, - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", "item": "openblocks:sponge" - } + "forge:condition": { + "type": "forge:or", + "values": [ + { + "type": "simplesponge:openblocks_integration", + "enabled": false + }, + { + "type": "forge:and", + "values": [ + { + "type": "simplesponge:openblocks_integration", + "enabled": true + }, + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "openblocks:sponge" } - ] - } - ] - } - ], + } + ] + } + ] + }, "ingredients": [ { "tag": "minecraft:wool" diff --git a/src/main/resources/data/simplesponge/recipes/sponge_on_a_stick.json b/src/main/resources/data/simplesponge/recipes/sponge_on_a_stick.json index 3c357b8..4c83812 100644 --- a/src/main/resources/data/simplesponge/recipes/sponge_on_a_stick.json +++ b/src/main/resources/data/simplesponge/recipes/sponge_on_a_stick.json @@ -1,29 +1,30 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "forge:or", - "values": [ - { - "type": "simplesponge:openblocks_integration", "enabled": false - }, - { - "type": "forge:and", - "values": [ - { - "type": "simplesponge:openblocks_integration", "enabled": true - }, - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", "item": "openblocks:sponge_on_a_stick" - } + "forge:condition": { + "type": "forge:or", + "values": [ + { + "type": "simplesponge:openblocks_integration", + "enabled": false + }, + { + "type": "forge:and", + "values": [ + { + "type": "simplesponge:openblocks_integration", + "enabled": true + }, + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "openblocks:sponge_on_a_stick" } - ] - } - ] - } - ], + } + ] + } + ] + }, "pattern": [ "#", "S",