diff --git a/build.gradle b/build.gradle index 8640f1e..b80b73f 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 0e4ce6f..1d78bb7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,8 +7,8 @@ mod_name=Exchangers 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/java/jackyy/exchangers/Exchangers.java b/src/main/java/jackyy/exchangers/Exchangers.java index f924c6c..95a979a 100644 --- a/src/main/java/jackyy/exchangers/Exchangers.java +++ b/src/main/java/jackyy/exchangers/Exchangers.java @@ -2,6 +2,7 @@ import jackyy.exchangers.handler.ClientEventsHandler; import jackyy.exchangers.handler.CommonEventsHandler; +import jackyy.exchangers.handler.network.NetworkHandler; import jackyy.exchangers.registry.ModConfigs; import jackyy.exchangers.registry.ModItems; import jackyy.exchangers.registry.crafting.ModCrafting; @@ -27,6 +28,7 @@ public Exchangers() { private void commonSetup(final FMLCommonSetupEvent event) { MinecraftForge.EVENT_BUS.register(new CommonEventsHandler()); + NetworkHandler.registerMessages(); } private void clientSetup(final FMLClientSetupEvent event) { diff --git a/src/main/java/jackyy/exchangers/handler/network/NetworkHandler.java b/src/main/java/jackyy/exchangers/handler/network/NetworkHandler.java index 0310a2f..d2cf170 100644 --- a/src/main/java/jackyy/exchangers/handler/network/NetworkHandler.java +++ b/src/main/java/jackyy/exchangers/handler/network/NetworkHandler.java @@ -5,76 +5,82 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.network.ChannelBuilder; +import net.minecraftforge.network.NetworkDirection; import net.minecraftforge.network.PacketDistributor; import net.minecraftforge.network.SimpleChannel; public class NetworkHandler { - public static SimpleChannel CHANNEL = ChannelBuilder - .named(new ResourceLocation(Reference.MODID, "main_channel")) - .networkProtocolVersion(1) - .simpleChannel() + public static SimpleChannel channel; - .messageBuilder(PacketSwitchRange.class) - .encoder(PacketSwitchRange::encode) - .decoder(PacketSwitchRange::decode) - .consumerNetworkThread(PacketSwitchRange::handle) - .add() + public static void registerMessages() { + channel = ChannelBuilder + .named(new ResourceLocation(Reference.MODID, "main_channel")) + .networkProtocolVersion(1) + .acceptedVersions((s, v) -> v == 1) + .simpleChannel(); - .messageBuilder(PacketIncreaseRange.class) - .encoder(PacketIncreaseRange::encode) - .decoder(PacketIncreaseRange::decode) - .consumerNetworkThread(PacketIncreaseRange::handle) - .add() + channel.messageBuilder(PacketSwitchRange.class, NetworkDirection.PLAY_TO_SERVER) + .encoder(PacketSwitchRange::encode) + .decoder(PacketSwitchRange::decode) + .consumerNetworkThread(PacketSwitchRange::handle) + .add(); - .messageBuilder(PacketDecreaseRange.class) - .encoder(PacketDecreaseRange::encode) - .decoder(PacketDecreaseRange::decode) - .consumerNetworkThread(PacketDecreaseRange::handle) - .add() + channel.messageBuilder(PacketIncreaseRange.class, NetworkDirection.PLAY_TO_SERVER) + .encoder(PacketIncreaseRange::encode) + .decoder(PacketIncreaseRange::decode) + .consumerNetworkThread(PacketIncreaseRange::handle) + .add(); - .messageBuilder(PacketSwitchMode.class) - .encoder(PacketSwitchMode::encode) - .decoder(PacketSwitchMode::decode) - .consumerNetworkThread(PacketSwitchMode::handle) - .add() + channel.messageBuilder(PacketDecreaseRange.class, NetworkDirection.PLAY_TO_SERVER) + .encoder(PacketDecreaseRange::encode) + .decoder(PacketDecreaseRange::decode) + .consumerNetworkThread(PacketDecreaseRange::handle) + .add(); - .messageBuilder(PacketToggleForceDropItems.class) - .encoder(PacketToggleForceDropItems::encode) - .decoder(PacketToggleForceDropItems::decode) - .consumerNetworkThread(PacketToggleForceDropItems::handle) - .add() + channel.messageBuilder(PacketSwitchMode.class, NetworkDirection.PLAY_TO_SERVER) + .encoder(PacketSwitchMode::encode) + .decoder(PacketSwitchMode::decode) + .consumerNetworkThread(PacketSwitchMode::handle) + .add(); - .messageBuilder(PacketToggleDirectionalPlacement.class) - .encoder(PacketToggleDirectionalPlacement::encode) - .decoder(PacketToggleDirectionalPlacement::decode) - .consumerNetworkThread(PacketToggleDirectionalPlacement::handle) - .add() + channel.messageBuilder(PacketToggleForceDropItems.class, NetworkDirection.PLAY_TO_SERVER) + .encoder(PacketToggleForceDropItems::encode) + .decoder(PacketToggleForceDropItems::decode) + .consumerNetworkThread(PacketToggleForceDropItems::handle) + .add(); - .messageBuilder(PacketToggleFuzzyPlacement.class) - .encoder(PacketToggleFuzzyPlacement::encode) - .decoder(PacketToggleFuzzyPlacement::decode) - .consumerNetworkThread(PacketToggleFuzzyPlacement::handle) - .add() + channel.messageBuilder(PacketToggleDirectionalPlacement.class, NetworkDirection.PLAY_TO_SERVER) + .encoder(PacketToggleDirectionalPlacement::encode) + .decoder(PacketToggleDirectionalPlacement::decode) + .consumerNetworkThread(PacketToggleDirectionalPlacement::handle) + .add(); - .messageBuilder(PacketSetFuzzyPlacementChance.class) - .encoder(PacketSetFuzzyPlacementChance::encode) - .decoder(PacketSetFuzzyPlacementChance::decode) - .consumerNetworkThread(PacketSetFuzzyPlacementChance::handle) - .add() + channel.messageBuilder(PacketToggleFuzzyPlacement.class, NetworkDirection.PLAY_TO_SERVER) + .encoder(PacketToggleFuzzyPlacement::encode) + .decoder(PacketToggleFuzzyPlacement::decode) + .consumerNetworkThread(PacketToggleFuzzyPlacement::handle) + .add(); - .messageBuilder(PacketToggleVoidItems.class) - .encoder(PacketToggleVoidItems::encode) - .decoder(PacketToggleVoidItems::decode) - .consumerNetworkThread(PacketToggleVoidItems::handle) - .add(); + channel.messageBuilder(PacketSetFuzzyPlacementChance.class, NetworkDirection.PLAY_TO_SERVER) + .encoder(PacketSetFuzzyPlacementChance::encode) + .decoder(PacketSetFuzzyPlacementChance::decode) + .consumerNetworkThread(PacketSetFuzzyPlacementChance::handle) + .add(); + + channel.messageBuilder(PacketToggleVoidItems.class, NetworkDirection.PLAY_TO_SERVER) + .encoder(PacketToggleVoidItems::encode) + .decoder(PacketToggleVoidItems::decode) + .consumerNetworkThread(PacketToggleVoidItems::handle) + .add(); + } public static void sendToClient(Object packet, ServerPlayer player) { - if (CHANNEL.isRemotePresent(player.connection.getConnection()) && !player.connection.getConnection().isMemoryConnection()) - CHANNEL.send(packet, PacketDistributor.PLAYER.with(player)); + if (channel.isRemotePresent(player.connection.getConnection()) && !player.connection.getConnection().isMemoryConnection()) + channel.send(packet, PacketDistributor.PLAYER.with(player)); } public static void sendToServer(Object packet) { - CHANNEL.send(packet, PacketDistributor.SERVER.noArg()); + channel.send(packet, PacketDistributor.SERVER.noArg()); } } diff --git a/src/main/java/jackyy/exchangers/handler/network/packet/PacketSetFuzzyPlacementChance.java b/src/main/java/jackyy/exchangers/handler/network/packet/PacketSetFuzzyPlacementChance.java index 7dcca70..234a647 100644 --- a/src/main/java/jackyy/exchangers/handler/network/packet/PacketSetFuzzyPlacementChance.java +++ b/src/main/java/jackyy/exchangers/handler/network/packet/PacketSetFuzzyPlacementChance.java @@ -9,10 +9,6 @@ public record PacketSetFuzzyPlacementChance(int chance) { - public PacketSetFuzzyPlacementChance(int chance) { - this.chance = chance; - } - public void encode(FriendlyByteBuf buffer) { buffer.writeInt(chance); } diff --git a/src/main/resources/data/exchangers/recipes/enderio/copper_alloy_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/copper_alloy_exchanger.json index 027aa5a..1030ab4 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/copper_alloy_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderio/copper_alloy_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + } + ] + }, "pattern": [ "IBI", "ICI", diff --git a/src/main/resources/data/exchangers/recipes/enderio/easy/conductive_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/easy/conductive_exchanger.json index 7f5703c..d72346c 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/easy/conductive_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderio/easy/conductive_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "IGI", "ICI", diff --git a/src/main/resources/data/exchangers/recipes/enderio/easy/dark_steel_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/easy/dark_steel_exchanger.json index 9881f2e..7c71b7b 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/easy/dark_steel_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderio/easy/dark_steel_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "DVD", "DCD", diff --git a/src/main/resources/data/exchangers/recipes/enderio/easy/eio_exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/enderio/easy/eio_exchanger_core_tier2.json index 135dd03..f7be71b 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/easy/eio_exchanger_core_tier2.json +++ b/src/main/resources/data/exchangers/recipes/enderio/easy/eio_exchanger_core_tier2.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "PEP", "EDE", diff --git a/src/main/resources/data/exchangers/recipes/enderio/easy/eio_exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/enderio/easy/eio_exchanger_core_tier3.json index 55e79e6..3c288a5 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/easy/eio_exchanger_core_tier3.json +++ b/src/main/resources/data/exchangers/recipes/enderio/easy/eio_exchanger_core_tier3.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "PSP", "SVS", diff --git a/src/main/resources/data/exchangers/recipes/enderio/easy/end_steel_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/easy/end_steel_exchanger.json index 5ccb835..8d2bb62 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/easy/end_steel_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderio/easy/end_steel_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "EPE", "ECE", diff --git a/src/main/resources/data/exchangers/recipes/enderio/easy/energetic_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/easy/energetic_exchanger.json index 46e2853..d595d25 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/easy/energetic_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderio/easy/energetic_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "EZE", "ECE", diff --git a/src/main/resources/data/exchangers/recipes/enderio/easy/pulsating_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/easy/pulsating_exchanger.json index d4fbe65..7f5c7cf 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/easy/pulsating_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderio/easy/pulsating_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "PBP", "PCP", diff --git a/src/main/resources/data/exchangers/recipes/enderio/easy/vibrant_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/easy/vibrant_exchanger.json index 1020564..f8b0d4e 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/easy/vibrant_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderio/easy/vibrant_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "VEV", "VCV", diff --git a/src/main/resources/data/exchangers/recipes/enderio/eio_exchanger_core_tier1.json b/src/main/resources/data/exchangers/recipes/enderio/eio_exchanger_core_tier1.json index e2c7377..751472e 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/eio_exchanger_core_tier1.json +++ b/src/main/resources/data/exchangers/recipes/enderio/eio_exchanger_core_tier1.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + } + ] + }, "pattern": [ "RCR", "CNC", diff --git a/src/main/resources/data/exchangers/recipes/enderio/hard/conductive_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/hard/conductive_exchanger.json index 46d59bf..dfb04d4 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/hard/conductive_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderio/hard/conductive_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "IGI", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/enderio/hard/dark_steel_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/hard/dark_steel_exchanger.json index a3def77..2f2c182 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/hard/dark_steel_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderio/hard/dark_steel_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "DVD", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/enderio/hard/eio_exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/enderio/hard/eio_exchanger_core_tier2.json index 6f60540..9470e07 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/hard/eio_exchanger_core_tier2.json +++ b/src/main/resources/data/exchangers/recipes/enderio/hard/eio_exchanger_core_tier2.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "PEP", "CDC", diff --git a/src/main/resources/data/exchangers/recipes/enderio/hard/eio_exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/enderio/hard/eio_exchanger_core_tier3.json index 01c21e2..dd36c2f 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/hard/eio_exchanger_core_tier3.json +++ b/src/main/resources/data/exchangers/recipes/enderio/hard/eio_exchanger_core_tier3.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "SCS", "CVC", diff --git a/src/main/resources/data/exchangers/recipes/enderio/hard/end_steel_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/hard/end_steel_exchanger.json index 89fb46c..8032026 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/hard/end_steel_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderio/hard/end_steel_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "EPE", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/enderio/hard/energetic_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/hard/energetic_exchanger.json index f03dd2c..fb3f284 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/hard/energetic_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderio/hard/energetic_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "EZE", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/enderio/hard/pulsating_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/hard/pulsating_exchanger.json index c9d1a83..041873b 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/hard/pulsating_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderio/hard/pulsating_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "PBP", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/enderio/hard/vibrant_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/hard/vibrant_exchanger.json index 363701e..f99185a 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/hard/vibrant_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderio/hard/vibrant_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "VEV", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/enderio/normal/conductive_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/normal/conductive_exchanger.json index 4baac57..d806f9c 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/normal/conductive_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderio/normal/conductive_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "ICI", "GXG", diff --git a/src/main/resources/data/exchangers/recipes/enderio/normal/dark_steel_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/normal/dark_steel_exchanger.json index f31b786..c84a2dc 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/normal/dark_steel_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderio/normal/dark_steel_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "DCD", "VXV", diff --git a/src/main/resources/data/exchangers/recipes/enderio/normal/eio_exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/enderio/normal/eio_exchanger_core_tier2.json index 1918e21..6c65321 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/normal/eio_exchanger_core_tier2.json +++ b/src/main/resources/data/exchangers/recipes/enderio/normal/eio_exchanger_core_tier2.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "PEP", "DCD", diff --git a/src/main/resources/data/exchangers/recipes/enderio/normal/eio_exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/enderio/normal/eio_exchanger_core_tier3.json index cd08a4e..b403ecc 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/normal/eio_exchanger_core_tier3.json +++ b/src/main/resources/data/exchangers/recipes/enderio/normal/eio_exchanger_core_tier3.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "SPS", "VCV", diff --git a/src/main/resources/data/exchangers/recipes/enderio/normal/end_steel_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/normal/end_steel_exchanger.json index d9bff6c..4e40f3b 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/normal/end_steel_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderio/normal/end_steel_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "ECE", "PXP", diff --git a/src/main/resources/data/exchangers/recipes/enderio/normal/energetic_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/normal/energetic_exchanger.json index 5b5e3f2..27b3881 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/normal/energetic_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderio/normal/energetic_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "ACA", "ZXZ", diff --git a/src/main/resources/data/exchangers/recipes/enderio/normal/pulsating_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/normal/pulsating_exchanger.json index 7bd2fba..ec00987 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/normal/pulsating_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderio/normal/pulsating_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "PCP", "BXB", diff --git a/src/main/resources/data/exchangers/recipes/enderio/normal/vibrant_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/normal/vibrant_exchanger.json index bfcbbaf..ec8146d 100644 --- a/src/main/resources/data/exchangers/recipes/enderio/normal/vibrant_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderio/normal/vibrant_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderio" + }, + { + "type": "exchangers:ender_io_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "VCV", "EXE", diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/crude_steel_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/crude_steel_exchanger.json index 7f012a3..bd9eb74 100644 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/crude_steel_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderioendergy/crude_steel_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_endergy_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderioendergy" + } + ] + }, "pattern": [ "S#S", "SCS", diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/crystalline_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/easy/crystalline_exchanger.json index 3573be5..05fa381 100644 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/crystalline_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderioendergy/easy/crystalline_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_endergy_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderioendergy" + }, + { + "type": "exchangers:ender_io_endergy_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "A#A", "ACA", diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/eio_endergy_exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/enderioendergy/easy/eio_endergy_exchanger_core_tier2.json index 15d5b23..4e11af5 100644 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/eio_endergy_exchanger_core_tier2.json +++ b/src/main/resources/data/exchangers/recipes/enderioendergy/easy/eio_endergy_exchanger_core_tier2.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_endergy_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderioendergy" + }, + { + "type": "exchangers:ender_io_endergy_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "PVP", "VLV", diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/eio_endergy_exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/enderioendergy/easy/eio_endergy_exchanger_core_tier3.json index fb9047b..91758c9 100644 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/eio_endergy_exchanger_core_tier3.json +++ b/src/main/resources/data/exchangers/recipes/enderioendergy/easy/eio_endergy_exchanger_core_tier3.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_endergy_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderioendergy" + }, + { + "type": "exchangers:ender_io_endergy_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "MIM", "ISI", diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/energetic_silver_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/easy/energetic_silver_exchanger.json index 44b2a8d..7e4a50d 100644 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/energetic_silver_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderioendergy/easy/energetic_silver_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_endergy_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderioendergy" + }, + { + "type": "exchangers:ender_io_endergy_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "SXS", "SCS", diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/melodic_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/easy/melodic_exchanger.json index bd76530..0f902e9 100644 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/melodic_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderioendergy/easy/melodic_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_endergy_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderioendergy" + }, + { + "type": "exchangers:ender_io_endergy_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "MLM", "MCM", diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/stellar_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/easy/stellar_exchanger.json index 4359a3b..350c519 100644 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/stellar_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderioendergy/easy/stellar_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_endergy_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderioendergy" + }, + { + "type": "exchangers:ender_io_endergy_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "S#S", "SCS", diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/vivid_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/easy/vivid_exchanger.json index 356f6a3..9bea1b2 100644 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/vivid_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderioendergy/easy/vivid_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_endergy_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderioendergy" + }, + { + "type": "exchangers:ender_io_endergy_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "VSV", "VCV", diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/eio_endergy_exchanger_core_tier1.json b/src/main/resources/data/exchangers/recipes/enderioendergy/eio_endergy_exchanger_core_tier1.json index d24593e..0d0bb3b 100644 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/eio_endergy_exchanger_core_tier1.json +++ b/src/main/resources/data/exchangers/recipes/enderioendergy/eio_endergy_exchanger_core_tier1.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_endergy_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderioendergy" + } + ] + }, "pattern": [ "GSG", "SIS", diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/crystalline_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/hard/crystalline_exchanger.json index b12c3bf..69bd52b 100644 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/crystalline_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderioendergy/hard/crystalline_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_endergy_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderioendergy" + }, + { + "type": "exchangers:ender_io_endergy_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "A#A", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/eio_endergy_exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/enderioendergy/hard/eio_endergy_exchanger_core_tier2.json index 8cc0c1c..c3cb958 100644 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/eio_endergy_exchanger_core_tier2.json +++ b/src/main/resources/data/exchangers/recipes/enderioendergy/hard/eio_endergy_exchanger_core_tier2.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_endergy_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderioendergy" + }, + { + "type": "exchangers:ender_io_endergy_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "PVP", "CLC", diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/eio_endergy_exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/enderioendergy/hard/eio_endergy_exchanger_core_tier3.json index 1cd72ad..0dc6c0c 100644 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/eio_endergy_exchanger_core_tier3.json +++ b/src/main/resources/data/exchangers/recipes/enderioendergy/hard/eio_endergy_exchanger_core_tier3.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_endergy_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderioendergy" + }, + { + "type": "exchangers:ender_io_endergy_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "MCM", "CSC", diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/energetic_silver_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/hard/energetic_silver_exchanger.json index 4147970..8984194 100644 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/energetic_silver_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderioendergy/hard/energetic_silver_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_endergy_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderioendergy" + }, + { + "type": "exchangers:ender_io_endergy_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "S#S", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/melodic_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/hard/melodic_exchanger.json index 928b8af..5526f21 100644 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/melodic_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderioendergy/hard/melodic_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_endergy_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderioendergy" + }, + { + "type": "exchangers:ender_io_endergy_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "MLM", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/stellar_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/hard/stellar_exchanger.json index 54a5fca..5fecab0 100644 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/stellar_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderioendergy/hard/stellar_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_endergy_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderioendergy" + }, + { + "type": "exchangers:ender_io_endergy_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "S#S", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/vivid_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/hard/vivid_exchanger.json index a54c6f0..78208f7 100644 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/vivid_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderioendergy/hard/vivid_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_endergy_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderioendergy" + }, + { + "type": "exchangers:ender_io_endergy_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "VSV", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/crystalline_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/normal/crystalline_exchanger.json index be0334f..8506ee8 100644 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/crystalline_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderioendergy/normal/crystalline_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_endergy_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderioendergy" + }, + { + "type": "exchangers:ender_io_endergy_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "ACA", "#X#", diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/eio_endergy_exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/enderioendergy/normal/eio_endergy_exchanger_core_tier2.json index 4ae80a5..fa3dd09 100644 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/eio_endergy_exchanger_core_tier2.json +++ b/src/main/resources/data/exchangers/recipes/enderioendergy/normal/eio_endergy_exchanger_core_tier2.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_endergy_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderioendergy" + }, + { + "type": "exchangers:ender_io_endergy_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "PVP", "LCL", diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/eio_endergy_exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/enderioendergy/normal/eio_endergy_exchanger_core_tier3.json index 5b95038..3367276 100644 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/eio_endergy_exchanger_core_tier3.json +++ b/src/main/resources/data/exchangers/recipes/enderioendergy/normal/eio_endergy_exchanger_core_tier3.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_endergy_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderioendergy" + }, + { + "type": "exchangers:ender_io_endergy_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "MIM", "SCS", diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/energetic_silver_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/normal/energetic_silver_exchanger.json index 532d883..948e475 100644 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/energetic_silver_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderioendergy/normal/energetic_silver_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_endergy_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderioendergy" + }, + { + "type": "exchangers:ender_io_endergy_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "SCS", "#X#", diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/melodic_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/normal/melodic_exchanger.json index b2515ec..0521aa9 100644 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/melodic_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderioendergy/normal/melodic_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_endergy_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderioendergy" + }, + { + "type": "exchangers:ender_io_endergy_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "MCM", "LXL", diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/stellar_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/normal/stellar_exchanger.json index 27d70ed..44beb6e 100644 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/stellar_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderioendergy/normal/stellar_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_endergy_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderioendergy" + }, + { + "type": "exchangers:ender_io_endergy_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "SCS", "#X#", diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/vivid_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/normal/vivid_exchanger.json index 1a02c18..557a83f 100644 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/vivid_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/enderioendergy/normal/vivid_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:ender_io_endergy_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "enderioendergy" + }, + { + "type": "exchangers:ender_io_endergy_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "VCV", "SXS", diff --git a/src/main/resources/data/exchangers/recipes/immersiveengineering/easy/hv_exchanger.json b/src/main/resources/data/exchangers/recipes/immersiveengineering/easy/hv_exchanger.json index 8d11fbd..f6db5fe 100644 --- a/src/main/resources/data/exchangers/recipes/immersiveengineering/easy/hv_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/immersiveengineering/easy/hv_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:immersive_engineering_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "immersiveengineering" - }, - { - "type": "exchangers:immersive_engineering_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:immersive_engineering_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + }, + { + "type": "exchangers:immersive_engineering_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "SHS", "SCS", diff --git a/src/main/resources/data/exchangers/recipes/immersiveengineering/easy/ie_exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/immersiveengineering/easy/ie_exchanger_core_tier2.json index 7d366e7..952e96a 100644 --- a/src/main/resources/data/exchangers/recipes/immersiveengineering/easy/ie_exchanger_core_tier2.json +++ b/src/main/resources/data/exchangers/recipes/immersiveengineering/easy/ie_exchanger_core_tier2.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:immersive_engineering_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "immersiveengineering" - }, - { - "type": "exchangers:immersive_engineering_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:immersive_engineering_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + }, + { + "type": "exchangers:immersive_engineering_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "ESE", "SBS", diff --git a/src/main/resources/data/exchangers/recipes/immersiveengineering/easy/ie_exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/immersiveengineering/easy/ie_exchanger_core_tier3.json index c7f214b..31faa68 100644 --- a/src/main/resources/data/exchangers/recipes/immersiveengineering/easy/ie_exchanger_core_tier3.json +++ b/src/main/resources/data/exchangers/recipes/immersiveengineering/easy/ie_exchanger_core_tier3.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:immersive_engineering_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "immersiveengineering" - }, - { - "type": "exchangers:immersive_engineering_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:immersive_engineering_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + }, + { + "type": "exchangers:immersive_engineering_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "SHS", "HBH", diff --git a/src/main/resources/data/exchangers/recipes/immersiveengineering/easy/mv_exchanger.json b/src/main/resources/data/exchangers/recipes/immersiveengineering/easy/mv_exchanger.json index a251383..bcb615f 100644 --- a/src/main/resources/data/exchangers/recipes/immersiveengineering/easy/mv_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/immersiveengineering/easy/mv_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:immersive_engineering_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "immersiveengineering" - }, - { - "type": "exchangers:immersive_engineering_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:immersive_engineering_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + }, + { + "type": "exchangers:immersive_engineering_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "SMS", "SCS", diff --git a/src/main/resources/data/exchangers/recipes/immersiveengineering/hard/hv_exchanger.json b/src/main/resources/data/exchangers/recipes/immersiveengineering/hard/hv_exchanger.json index d0a8ef4..bcd5577 100644 --- a/src/main/resources/data/exchangers/recipes/immersiveengineering/hard/hv_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/immersiveengineering/hard/hv_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:immersive_engineering_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "immersiveengineering" - }, - { - "type": "exchangers:immersive_engineering_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:immersive_engineering_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + }, + { + "type": "exchangers:immersive_engineering_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "SHS", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/immersiveengineering/hard/ie_exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/immersiveengineering/hard/ie_exchanger_core_tier2.json index 8ddf1f5..1253676 100644 --- a/src/main/resources/data/exchangers/recipes/immersiveengineering/hard/ie_exchanger_core_tier2.json +++ b/src/main/resources/data/exchangers/recipes/immersiveengineering/hard/ie_exchanger_core_tier2.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:immersive_engineering_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "immersiveengineering" - }, - { - "type": "exchangers:immersive_engineering_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:immersive_engineering_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + }, + { + "type": "exchangers:immersive_engineering_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "ESE", "CBC", diff --git a/src/main/resources/data/exchangers/recipes/immersiveengineering/hard/ie_exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/immersiveengineering/hard/ie_exchanger_core_tier3.json index 88a8c83..b4e2d74 100644 --- a/src/main/resources/data/exchangers/recipes/immersiveengineering/hard/ie_exchanger_core_tier3.json +++ b/src/main/resources/data/exchangers/recipes/immersiveengineering/hard/ie_exchanger_core_tier3.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:immersive_engineering_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "immersiveengineering" - }, - { - "type": "exchangers:immersive_engineering_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:immersive_engineering_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + }, + { + "type": "exchangers:immersive_engineering_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "HCS", "CBC", diff --git a/src/main/resources/data/exchangers/recipes/immersiveengineering/hard/mv_exchanger.json b/src/main/resources/data/exchangers/recipes/immersiveengineering/hard/mv_exchanger.json index 6f05e39..5120ef6 100644 --- a/src/main/resources/data/exchangers/recipes/immersiveengineering/hard/mv_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/immersiveengineering/hard/mv_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:immersive_engineering_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "immersiveengineering" - }, - { - "type": "exchangers:immersive_engineering_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:immersive_engineering_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + }, + { + "type": "exchangers:immersive_engineering_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "SMS", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/immersiveengineering/ie_exchanger_core_tier1.json b/src/main/resources/data/exchangers/recipes/immersiveengineering/ie_exchanger_core_tier1.json index 3cb206f..4c09004 100644 --- a/src/main/resources/data/exchangers/recipes/immersiveengineering/ie_exchanger_core_tier1.json +++ b/src/main/resources/data/exchangers/recipes/immersiveengineering/ie_exchanger_core_tier1.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:immersive_engineering_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "immersiveengineering" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:immersive_engineering_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + } + ] + }, "pattern": [ "CIC", "IBI", diff --git a/src/main/resources/data/exchangers/recipes/immersiveengineering/lv_exchanger.json b/src/main/resources/data/exchangers/recipes/immersiveengineering/lv_exchanger.json index 4511775..53dc264 100644 --- a/src/main/resources/data/exchangers/recipes/immersiveengineering/lv_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/immersiveengineering/lv_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:immersive_engineering_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "immersiveengineering" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:immersive_engineering_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + } + ] + }, "pattern": [ "SLS", "SCS", diff --git a/src/main/resources/data/exchangers/recipes/immersiveengineering/normal/hv_exchanger.json b/src/main/resources/data/exchangers/recipes/immersiveengineering/normal/hv_exchanger.json index 8c0a37e..b5ef9fd 100644 --- a/src/main/resources/data/exchangers/recipes/immersiveengineering/normal/hv_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/immersiveengineering/normal/hv_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:immersive_engineering_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "immersiveengineering" - }, - { - "type": "exchangers:immersive_engineering_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:immersive_engineering_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + }, + { + "type": "exchangers:immersive_engineering_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "SCS", "HXH", diff --git a/src/main/resources/data/exchangers/recipes/immersiveengineering/normal/ie_exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/immersiveengineering/normal/ie_exchanger_core_tier2.json index 13a8599..10c5d31 100644 --- a/src/main/resources/data/exchangers/recipes/immersiveengineering/normal/ie_exchanger_core_tier2.json +++ b/src/main/resources/data/exchangers/recipes/immersiveengineering/normal/ie_exchanger_core_tier2.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:immersive_engineering_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "immersiveengineering" - }, - { - "type": "exchangers:immersive_engineering_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:immersive_engineering_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + }, + { + "type": "exchangers:immersive_engineering_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "ESE", "BCB", diff --git a/src/main/resources/data/exchangers/recipes/immersiveengineering/normal/ie_exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/immersiveengineering/normal/ie_exchanger_core_tier3.json index bcda91f..ed593b3 100644 --- a/src/main/resources/data/exchangers/recipes/immersiveengineering/normal/ie_exchanger_core_tier3.json +++ b/src/main/resources/data/exchangers/recipes/immersiveengineering/normal/ie_exchanger_core_tier3.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:immersive_engineering_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "immersiveengineering" - }, - { - "type": "exchangers:immersive_engineering_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:immersive_engineering_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + }, + { + "type": "exchangers:immersive_engineering_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "SHS", "BCB", diff --git a/src/main/resources/data/exchangers/recipes/immersiveengineering/normal/mv_exchanger.json b/src/main/resources/data/exchangers/recipes/immersiveengineering/normal/mv_exchanger.json index b8b3b17..3f98b16 100644 --- a/src/main/resources/data/exchangers/recipes/immersiveengineering/normal/mv_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/immersiveengineering/normal/mv_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:immersive_engineering_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "immersiveengineering" - }, - { - "type": "exchangers:immersive_engineering_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:immersive_engineering_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + }, + { + "type": "exchangers:immersive_engineering_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "SCS", "MXM", diff --git a/src/main/resources/data/exchangers/recipes/mekanism/basic_exchanger.json b/src/main/resources/data/exchangers/recipes/mekanism/basic_exchanger.json index c3256a6..2feb7c6 100644 --- a/src/main/resources/data/exchangers/recipes/mekanism/basic_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/mekanism/basic_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:mekanism_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "mekanism" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:mekanism_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "mekanism" + } + ] + }, "pattern": [ "BTB", "BCB", diff --git a/src/main/resources/data/exchangers/recipes/mekanism/easy/advanced_exchanger.json b/src/main/resources/data/exchangers/recipes/mekanism/easy/advanced_exchanger.json index 86df3d6..dd71115 100644 --- a/src/main/resources/data/exchangers/recipes/mekanism/easy/advanced_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/mekanism/easy/advanced_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:mekanism_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "mekanism" - }, - { - "type": "exchangers:mekanism_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:mekanism_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "exchangers:mekanism_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "ATA", "ACA", diff --git a/src/main/resources/data/exchangers/recipes/mekanism/easy/elite_exchanger.json b/src/main/resources/data/exchangers/recipes/mekanism/easy/elite_exchanger.json index 9ed504a..859bbaa 100644 --- a/src/main/resources/data/exchangers/recipes/mekanism/easy/elite_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/mekanism/easy/elite_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:mekanism_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "mekanism" - }, - { - "type": "exchangers:mekanism_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:mekanism_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "exchangers:mekanism_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "EPE", "ECE", diff --git a/src/main/resources/data/exchangers/recipes/mekanism/easy/mekanism_exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/mekanism/easy/mekanism_exchanger_core_tier2.json index 169a751..7f4a357 100644 --- a/src/main/resources/data/exchangers/recipes/mekanism/easy/mekanism_exchanger_core_tier2.json +++ b/src/main/resources/data/exchangers/recipes/mekanism/easy/mekanism_exchanger_core_tier2.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:mekanism_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "mekanism" - }, - { - "type": "exchangers:mekanism_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:mekanism_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "exchangers:mekanism_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "DGD", "GAG", diff --git a/src/main/resources/data/exchangers/recipes/mekanism/easy/mekanism_exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/mekanism/easy/mekanism_exchanger_core_tier3.json index 16c9aa8..1ea1e8d 100644 --- a/src/main/resources/data/exchangers/recipes/mekanism/easy/mekanism_exchanger_core_tier3.json +++ b/src/main/resources/data/exchangers/recipes/mekanism/easy/mekanism_exchanger_core_tier3.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:mekanism_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "mekanism" - }, - { - "type": "exchangers:mekanism_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:mekanism_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "exchangers:mekanism_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "OIO", "IAI", diff --git a/src/main/resources/data/exchangers/recipes/mekanism/easy/ultimate_exchanger.json b/src/main/resources/data/exchangers/recipes/mekanism/easy/ultimate_exchanger.json index 7a84b27..809f8e8 100644 --- a/src/main/resources/data/exchangers/recipes/mekanism/easy/ultimate_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/mekanism/easy/ultimate_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:mekanism_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "mekanism" - }, - { - "type": "exchangers:mekanism_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:mekanism_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "exchangers:mekanism_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "UTU", "UCU", diff --git a/src/main/resources/data/exchangers/recipes/mekanism/hard/advanced_exchanger.json b/src/main/resources/data/exchangers/recipes/mekanism/hard/advanced_exchanger.json index 9cc2f5c..502a584 100644 --- a/src/main/resources/data/exchangers/recipes/mekanism/hard/advanced_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/mekanism/hard/advanced_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:mekanism_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "mekanism" - }, - { - "type": "exchangers:mekanism_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:mekanism_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "exchangers:mekanism_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "ATA", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/mekanism/hard/elite_exchanger.json b/src/main/resources/data/exchangers/recipes/mekanism/hard/elite_exchanger.json index a759371..066437f 100644 --- a/src/main/resources/data/exchangers/recipes/mekanism/hard/elite_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/mekanism/hard/elite_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:mekanism_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "mekanism" - }, - { - "type": "exchangers:mekanism_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:mekanism_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "exchangers:mekanism_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "EPE", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/mekanism/hard/mekanism_exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/mekanism/hard/mekanism_exchanger_core_tier2.json index 9dbff29..e8d1b75 100644 --- a/src/main/resources/data/exchangers/recipes/mekanism/hard/mekanism_exchanger_core_tier2.json +++ b/src/main/resources/data/exchangers/recipes/mekanism/hard/mekanism_exchanger_core_tier2.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:mekanism_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "mekanism" - }, - { - "type": "exchangers:mekanism_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:mekanism_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "exchangers:mekanism_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "DGD", "CAC", diff --git a/src/main/resources/data/exchangers/recipes/mekanism/hard/mekanism_exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/mekanism/hard/mekanism_exchanger_core_tier3.json index b4fb0ae..9bee918 100644 --- a/src/main/resources/data/exchangers/recipes/mekanism/hard/mekanism_exchanger_core_tier3.json +++ b/src/main/resources/data/exchangers/recipes/mekanism/hard/mekanism_exchanger_core_tier3.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:mekanism_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "mekanism" - }, - { - "type": "exchangers:mekanism_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:mekanism_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "exchangers:mekanism_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "OCO", "CAC", diff --git a/src/main/resources/data/exchangers/recipes/mekanism/hard/ultimate_exchanger.json b/src/main/resources/data/exchangers/recipes/mekanism/hard/ultimate_exchanger.json index 01b3df7..5059b13 100644 --- a/src/main/resources/data/exchangers/recipes/mekanism/hard/ultimate_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/mekanism/hard/ultimate_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:mekanism_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "mekanism" - }, - { - "type": "exchangers:mekanism_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:mekanism_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "exchangers:mekanism_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "UTU", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/mekanism/mekanism_exchanger_core_tier1.json b/src/main/resources/data/exchangers/recipes/mekanism/mekanism_exchanger_core_tier1.json index c84d69e..27ca3e9 100644 --- a/src/main/resources/data/exchangers/recipes/mekanism/mekanism_exchanger_core_tier1.json +++ b/src/main/resources/data/exchangers/recipes/mekanism/mekanism_exchanger_core_tier1.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:mekanism_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "mekanism" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:mekanism_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "mekanism" + } + ] + }, "pattern": [ "OSO", "SAS", diff --git a/src/main/resources/data/exchangers/recipes/mekanism/normal/advanced_exchanger.json b/src/main/resources/data/exchangers/recipes/mekanism/normal/advanced_exchanger.json index fa0a29a..21de303 100644 --- a/src/main/resources/data/exchangers/recipes/mekanism/normal/advanced_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/mekanism/normal/advanced_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:mekanism_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "mekanism" - }, - { - "type": "exchangers:mekanism_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:mekanism_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "exchangers:mekanism_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "ACA", "TXT", diff --git a/src/main/resources/data/exchangers/recipes/mekanism/normal/elite_exchanger.json b/src/main/resources/data/exchangers/recipes/mekanism/normal/elite_exchanger.json index f31ff23..6a787ba 100644 --- a/src/main/resources/data/exchangers/recipes/mekanism/normal/elite_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/mekanism/normal/elite_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:mekanism_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "mekanism" - }, - { - "type": "exchangers:mekanism_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:mekanism_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "exchangers:mekanism_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "ECE", "TXT", diff --git a/src/main/resources/data/exchangers/recipes/mekanism/normal/mekanism_exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/mekanism/normal/mekanism_exchanger_core_tier2.json index fd32a3a..c34ada3 100644 --- a/src/main/resources/data/exchangers/recipes/mekanism/normal/mekanism_exchanger_core_tier2.json +++ b/src/main/resources/data/exchangers/recipes/mekanism/normal/mekanism_exchanger_core_tier2.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:mekanism_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "mekanism" - }, - { - "type": "exchangers:mekanism_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:mekanism_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "exchangers:mekanism_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "DGD", "ACA", diff --git a/src/main/resources/data/exchangers/recipes/mekanism/normal/mekanism_exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/mekanism/normal/mekanism_exchanger_core_tier3.json index 7b35460..2de3460 100644 --- a/src/main/resources/data/exchangers/recipes/mekanism/normal/mekanism_exchanger_core_tier3.json +++ b/src/main/resources/data/exchangers/recipes/mekanism/normal/mekanism_exchanger_core_tier3.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:mekanism_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "mekanism" - }, - { - "type": "exchangers:mekanism_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:mekanism_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "exchangers:mekanism_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "OAO", "ACA", diff --git a/src/main/resources/data/exchangers/recipes/mekanism/normal/ultimate_exchanger.json b/src/main/resources/data/exchangers/recipes/mekanism/normal/ultimate_exchanger.json index cad9b0a..47de2b3 100644 --- a/src/main/resources/data/exchangers/recipes/mekanism/normal/ultimate_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/mekanism/normal/ultimate_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:mekanism_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "mekanism" - }, - { - "type": "exchangers:mekanism_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:mekanism_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "mekanism" + }, + { + "type": "exchangers:mekanism_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "UCU", "TXT", diff --git a/src/main/resources/data/exchangers/recipes/special/bee_exchanger.json b/src/main/resources/data/exchangers/recipes/special/bee_exchanger.json index 563ff84..3b12483 100644 --- a/src/main/resources/data/exchangers/recipes/special/bee_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/special/bee_exchanger.json @@ -1,10 +1,9 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:special_module", "enabled": true - } - ], + "forge:condition": { + "type": "exchangers:special_module", + "enabled": true + }, "pattern": [ "HIH", "HEH", diff --git a/src/main/resources/data/exchangers/recipes/special/tuberous_exchanger.json b/src/main/resources/data/exchangers/recipes/special/tuberous_exchanger.json index 2ff886d..a3e4a32 100644 --- a/src/main/resources/data/exchangers/recipes/special/tuberous_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/special/tuberous_exchanger.json @@ -1,10 +1,9 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:special_module", "enabled": true - } - ], + "forge:condition": { + "type": "exchangers:special_module", + "enabled": true + }, "pattern": [ "PGP", "PEP", diff --git a/src/main/resources/data/exchangers/recipes/thermal/easy/hardened_exchanger.json b/src/main/resources/data/exchangers/recipes/thermal/easy/hardened_exchanger.json index ae904df..c897045 100644 --- a/src/main/resources/data/exchangers/recipes/thermal/easy/hardened_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/thermal/easy/hardened_exchanger.json @@ -1,19 +1,26 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:thermal_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "thermal" - }, - { - "type": "forge:mod_loaded", "modid": "thermal_innovation" - }, - { - "type": "exchangers:thermal_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:thermal_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "thermal" + }, + { + "type": "forge:mod_loaded", + "modid": "thermal_innovation" + }, + { + "type": "exchangers:thermal_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "IUI", "RCR", diff --git a/src/main/resources/data/exchangers/recipes/thermal/easy/reinforced_exchanger.json b/src/main/resources/data/exchangers/recipes/thermal/easy/reinforced_exchanger.json index 0eb36da..a4759c4 100644 --- a/src/main/resources/data/exchangers/recipes/thermal/easy/reinforced_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/thermal/easy/reinforced_exchanger.json @@ -1,19 +1,26 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:thermal_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "thermal" - }, - { - "type": "forge:mod_loaded", "modid": "thermal_innovation" - }, - { - "type": "exchangers:thermal_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:thermal_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "thermal" + }, + { + "type": "forge:mod_loaded", + "modid": "thermal_innovation" + }, + { + "type": "exchangers:thermal_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "EUE", "RCR", diff --git a/src/main/resources/data/exchangers/recipes/thermal/easy/resonant_exchanger.json b/src/main/resources/data/exchangers/recipes/thermal/easy/resonant_exchanger.json index f49acb0..fe2e97b 100644 --- a/src/main/resources/data/exchangers/recipes/thermal/easy/resonant_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/thermal/easy/resonant_exchanger.json @@ -1,19 +1,26 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:thermal_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "thermal" - }, - { - "type": "forge:mod_loaded", "modid": "thermal_innovation" - }, - { - "type": "exchangers:thermal_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:thermal_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "thermal" + }, + { + "type": "forge:mod_loaded", + "modid": "thermal_innovation" + }, + { + "type": "exchangers:thermal_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "IUI", "RCR", diff --git a/src/main/resources/data/exchangers/recipes/thermal/easy/signalum_exchanger.json b/src/main/resources/data/exchangers/recipes/thermal/easy/signalum_exchanger.json index 81a6773..59a8edd 100644 --- a/src/main/resources/data/exchangers/recipes/thermal/easy/signalum_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/thermal/easy/signalum_exchanger.json @@ -1,19 +1,26 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:thermal_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "thermal" - }, - { - "type": "forge:mod_loaded", "modid": "thermal_innovation" - }, - { - "type": "exchangers:thermal_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:thermal_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "thermal" + }, + { + "type": "forge:mod_loaded", + "modid": "thermal_innovation" + }, + { + "type": "exchangers:thermal_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "SUS", "RCR", diff --git a/src/main/resources/data/exchangers/recipes/thermal/easy/thermal_exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/thermal/easy/thermal_exchanger_core_tier2.json index 4b5e484..7ecc663 100644 --- a/src/main/resources/data/exchangers/recipes/thermal/easy/thermal_exchanger_core_tier2.json +++ b/src/main/resources/data/exchangers/recipes/thermal/easy/thermal_exchanger_core_tier2.json @@ -1,19 +1,26 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:thermal_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "thermal" - }, - { - "type": "forge:mod_loaded", "modid": "thermal_innovation" - }, - { - "type": "exchangers:thermal_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:thermal_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "thermal" + }, + { + "type": "forge:mod_loaded", + "modid": "thermal_innovation" + }, + { + "type": "exchangers:thermal_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "BIB", "ILI", diff --git a/src/main/resources/data/exchangers/recipes/thermal/easy/thermal_exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/thermal/easy/thermal_exchanger_core_tier3.json index 8fd814e..0b488f9 100644 --- a/src/main/resources/data/exchangers/recipes/thermal/easy/thermal_exchanger_core_tier3.json +++ b/src/main/resources/data/exchangers/recipes/thermal/easy/thermal_exchanger_core_tier3.json @@ -1,19 +1,26 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:thermal_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "thermal" - }, - { - "type": "forge:mod_loaded", "modid": "thermal_innovation" - }, - { - "type": "exchangers:thermal_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:thermal_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "thermal" + }, + { + "type": "forge:mod_loaded", + "modid": "thermal_innovation" + }, + { + "type": "exchangers:thermal_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "LSL", "SBS", diff --git a/src/main/resources/data/exchangers/recipes/thermal/hard/hardened_exchanger.json b/src/main/resources/data/exchangers/recipes/thermal/hard/hardened_exchanger.json index 3ed27ca..49d66b4 100644 --- a/src/main/resources/data/exchangers/recipes/thermal/hard/hardened_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/thermal/hard/hardened_exchanger.json @@ -1,19 +1,26 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:thermal_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "thermal" - }, - { - "type": "forge:mod_loaded", "modid": "thermal_innovation" - }, - { - "type": "exchangers:thermal_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:thermal_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "thermal" + }, + { + "type": "forge:mod_loaded", + "modid": "thermal_innovation" + }, + { + "type": "exchangers:thermal_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "IRI", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/thermal/hard/reinforced_exchanger.json b/src/main/resources/data/exchangers/recipes/thermal/hard/reinforced_exchanger.json index cfe8c1a..854532b 100644 --- a/src/main/resources/data/exchangers/recipes/thermal/hard/reinforced_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/thermal/hard/reinforced_exchanger.json @@ -1,19 +1,26 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:thermal_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "thermal" - }, - { - "type": "forge:mod_loaded", "modid": "thermal_innovation" - }, - { - "type": "exchangers:thermal_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:thermal_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "thermal" + }, + { + "type": "forge:mod_loaded", + "modid": "thermal_innovation" + }, + { + "type": "exchangers:thermal_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "ERE", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/thermal/hard/resonant_exchanger.json b/src/main/resources/data/exchangers/recipes/thermal/hard/resonant_exchanger.json index 3ae3de3..da97479 100644 --- a/src/main/resources/data/exchangers/recipes/thermal/hard/resonant_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/thermal/hard/resonant_exchanger.json @@ -1,19 +1,26 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:thermal_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "thermal" - }, - { - "type": "forge:mod_loaded", "modid": "thermal_innovation" - }, - { - "type": "exchangers:thermal_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:thermal_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "thermal" + }, + { + "type": "forge:mod_loaded", + "modid": "thermal_innovation" + }, + { + "type": "exchangers:thermal_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "IRI", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/thermal/hard/signalum_exchanger.json b/src/main/resources/data/exchangers/recipes/thermal/hard/signalum_exchanger.json index a463214..3352e0a 100644 --- a/src/main/resources/data/exchangers/recipes/thermal/hard/signalum_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/thermal/hard/signalum_exchanger.json @@ -1,19 +1,26 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:thermal_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "thermal" - }, - { - "type": "forge:mod_loaded", "modid": "thermal_innovation" - }, - { - "type": "exchangers:thermal_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:thermal_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "thermal" + }, + { + "type": "forge:mod_loaded", + "modid": "thermal_innovation" + }, + { + "type": "exchangers:thermal_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "SRS", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/thermal/hard/thermal_exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/thermal/hard/thermal_exchanger_core_tier2.json index 58e89bb..8a453ef 100644 --- a/src/main/resources/data/exchangers/recipes/thermal/hard/thermal_exchanger_core_tier2.json +++ b/src/main/resources/data/exchangers/recipes/thermal/hard/thermal_exchanger_core_tier2.json @@ -1,19 +1,26 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:thermal_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "thermal" - }, - { - "type": "forge:mod_loaded", "modid": "thermal_innovation" - }, - { - "type": "exchangers:thermal_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:thermal_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "thermal" + }, + { + "type": "forge:mod_loaded", + "modid": "thermal_innovation" + }, + { + "type": "exchangers:thermal_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "BIB", "CLC", diff --git a/src/main/resources/data/exchangers/recipes/thermal/hard/thermal_exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/thermal/hard/thermal_exchanger_core_tier3.json index 897dbf9..c48b73d 100644 --- a/src/main/resources/data/exchangers/recipes/thermal/hard/thermal_exchanger_core_tier3.json +++ b/src/main/resources/data/exchangers/recipes/thermal/hard/thermal_exchanger_core_tier3.json @@ -1,19 +1,26 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:thermal_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "thermal" - }, - { - "type": "forge:mod_loaded", "modid": "thermal_innovation" - }, - { - "type": "exchangers:thermal_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:thermal_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "thermal" + }, + { + "type": "forge:mod_loaded", + "modid": "thermal_innovation" + }, + { + "type": "exchangers:thermal_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "LCS", "CBC", diff --git a/src/main/resources/data/exchangers/recipes/thermal/leadstone_exchanger.json b/src/main/resources/data/exchangers/recipes/thermal/leadstone_exchanger.json index c7daa7a..32f521d 100644 --- a/src/main/resources/data/exchangers/recipes/thermal/leadstone_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/thermal/leadstone_exchanger.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:thermal_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "thermal" - }, - { - "type": "forge:mod_loaded", "modid": "thermal_innovation" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:thermal_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "thermal" + }, + { + "type": "forge:mod_loaded", + "modid": "thermal_innovation" + } + ] + }, "pattern": [ "LSL", "LCL", diff --git a/src/main/resources/data/exchangers/recipes/thermal/normal/hardened_exchanger.json b/src/main/resources/data/exchangers/recipes/thermal/normal/hardened_exchanger.json index 2a86f49..8657ab4 100644 --- a/src/main/resources/data/exchangers/recipes/thermal/normal/hardened_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/thermal/normal/hardened_exchanger.json @@ -1,19 +1,26 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:thermal_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "thermal" - }, - { - "type": "forge:mod_loaded", "modid": "thermal_innovation" - }, - { - "type": "exchangers:thermal_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:thermal_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "thermal" + }, + { + "type": "forge:mod_loaded", + "modid": "thermal_innovation" + }, + { + "type": "exchangers:thermal_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "ICI", "RXR", diff --git a/src/main/resources/data/exchangers/recipes/thermal/normal/reinforced_exchanger.json b/src/main/resources/data/exchangers/recipes/thermal/normal/reinforced_exchanger.json index f59e0c4..8634846 100644 --- a/src/main/resources/data/exchangers/recipes/thermal/normal/reinforced_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/thermal/normal/reinforced_exchanger.json @@ -1,19 +1,26 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:thermal_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "thermal" - }, - { - "type": "forge:mod_loaded", "modid": "thermal_innovation" - }, - { - "type": "exchangers:thermal_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:thermal_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "thermal" + }, + { + "type": "forge:mod_loaded", + "modid": "thermal_innovation" + }, + { + "type": "exchangers:thermal_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "ECE", "RXR", diff --git a/src/main/resources/data/exchangers/recipes/thermal/normal/resonant_exchanger.json b/src/main/resources/data/exchangers/recipes/thermal/normal/resonant_exchanger.json index 768cb65..cab8e8d 100644 --- a/src/main/resources/data/exchangers/recipes/thermal/normal/resonant_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/thermal/normal/resonant_exchanger.json @@ -1,19 +1,26 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:thermal_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "thermal" - }, - { - "type": "forge:mod_loaded", "modid": "thermal_innovation" - }, - { - "type": "exchangers:thermal_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:thermal_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "thermal" + }, + { + "type": "forge:mod_loaded", + "modid": "thermal_innovation" + }, + { + "type": "exchangers:thermal_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "ICI", "RXR", diff --git a/src/main/resources/data/exchangers/recipes/thermal/normal/signalum_exchanger.json b/src/main/resources/data/exchangers/recipes/thermal/normal/signalum_exchanger.json index 4a5e1bd..da884fd 100644 --- a/src/main/resources/data/exchangers/recipes/thermal/normal/signalum_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/thermal/normal/signalum_exchanger.json @@ -1,19 +1,26 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:thermal_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "thermal" - }, - { - "type": "forge:mod_loaded", "modid": "thermal_innovation" - }, - { - "type": "exchangers:thermal_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:thermal_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "thermal" + }, + { + "type": "forge:mod_loaded", + "modid": "thermal_innovation" + }, + { + "type": "exchangers:thermal_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "SCS", "RXR", diff --git a/src/main/resources/data/exchangers/recipes/thermal/normal/thermal_exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/thermal/normal/thermal_exchanger_core_tier2.json index ebadd21..a827eb3 100644 --- a/src/main/resources/data/exchangers/recipes/thermal/normal/thermal_exchanger_core_tier2.json +++ b/src/main/resources/data/exchangers/recipes/thermal/normal/thermal_exchanger_core_tier2.json @@ -1,19 +1,26 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:thermal_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "thermal" - }, - { - "type": "forge:mod_loaded", "modid": "thermal_innovation" - }, - { - "type": "exchangers:thermal_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:thermal_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "thermal" + }, + { + "type": "forge:mod_loaded", + "modid": "thermal_innovation" + }, + { + "type": "exchangers:thermal_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "BIB", "LCL", diff --git a/src/main/resources/data/exchangers/recipes/thermal/normal/thermal_exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/thermal/normal/thermal_exchanger_core_tier3.json index 9213d67..ca652b8 100644 --- a/src/main/resources/data/exchangers/recipes/thermal/normal/thermal_exchanger_core_tier3.json +++ b/src/main/resources/data/exchangers/recipes/thermal/normal/thermal_exchanger_core_tier3.json @@ -1,19 +1,26 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:thermal_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "thermal" - }, - { - "type": "forge:mod_loaded", "modid": "thermal_innovation" - }, - { - "type": "exchangers:thermal_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:thermal_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "thermal" + }, + { + "type": "forge:mod_loaded", + "modid": "thermal_innovation" + }, + { + "type": "exchangers:thermal_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "LSL", "BCB", diff --git a/src/main/resources/data/exchangers/recipes/thermal/thermal_exchanger_core_tier1.json b/src/main/resources/data/exchangers/recipes/thermal/thermal_exchanger_core_tier1.json index 90e9d05..27c3193 100644 --- a/src/main/resources/data/exchangers/recipes/thermal/thermal_exchanger_core_tier1.json +++ b/src/main/resources/data/exchangers/recipes/thermal/thermal_exchanger_core_tier1.json @@ -1,16 +1,22 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:thermal_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "thermal" - }, - { - "type": "forge:mod_loaded", "modid": "thermal_innovation" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:thermal_module", + "enabled": true + }, + { + "type": "forge:mod_loaded", + "modid": "thermal" + }, + { + "type": "forge:mod_loaded", + "modid": "thermal_innovation" + } + ] + }, "pattern": [ "CLC", "LDL", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/easy/amethyst_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/easy/amethyst_exchanger.json index 8e6e2b4..384cbaf 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/easy/amethyst_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/easy/amethyst_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "AEA", "ACA", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/easy/copper_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/easy/copper_exchanger.json index c428017..416a9cd 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/easy/copper_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/easy/copper_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "IEI", "ICI", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/easy/diamond_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/easy/diamond_exchanger.json index 62f5880..82afd48 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/easy/diamond_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/easy/diamond_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "DED", "DCD", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/easy/emerald_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/easy/emerald_exchanger.json index 3ce78bb..0fb5ab4 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/easy/emerald_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/easy/emerald_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "MEM", "MCM", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/easy/end_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/easy/end_exchanger.json index 0afb461..85419e0 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/easy/end_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/easy/end_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "SEP", "PCS", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/easy/exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/vanilla/easy/exchanger_core_tier2.json index 6f386cd..eafed5f 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/easy/exchanger_core_tier2.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/easy/exchanger_core_tier2.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "ILI", "LEL", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/easy/exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/vanilla/easy/exchanger_core_tier3.json index 29b2a5b..6bb3876 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/easy/exchanger_core_tier3.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/easy/exchanger_core_tier3.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "DED", "EBE", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/easy/golden_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/easy/golden_exchanger.json index 417de27..c60b6fa 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/easy/golden_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/easy/golden_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "GEG", "GCG", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/easy/iron_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/easy/iron_exchanger.json index 1b78cdd..5dde14b 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/easy/iron_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/easy/iron_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "IEI", "ICI", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/easy/netherite_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/easy/netherite_exchanger.json index 4f79f6f..151db70 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/easy/netherite_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/easy/netherite_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "SNS", "ECE", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/easy/obsidian_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/easy/obsidian_exchanger.json index dadad54..19084a3 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/easy/obsidian_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/easy/obsidian_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "OEO", "OCO", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/easy/stone_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/easy/stone_exchanger.json index cf518aa..e87c738 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/easy/stone_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/easy/stone_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "easy" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "easy" + } + ] + }, "pattern": [ "SES", "SCS", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/exchanger_core_tier1.json b/src/main/resources/data/exchangers/recipes/vanilla/exchanger_core_tier1.json index ab664b6..e760223 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/exchanger_core_tier1.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/exchanger_core_tier1.json @@ -1,10 +1,9 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - } - ], + "forge:condition": { + "type": "exchangers:vanilla_module", + "enabled": true + }, "pattern": [ "WRW", "RPR", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/hard/amethyst_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/hard/amethyst_exchanger.json index 88a5889..db57254 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/hard/amethyst_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/hard/amethyst_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "AEA", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/hard/copper_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/hard/copper_exchanger.json index c2716e1..a2037d7 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/hard/copper_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/hard/copper_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "IEI", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/hard/diamond_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/hard/diamond_exchanger.json index 82feefa..e5a8a28 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/hard/diamond_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/hard/diamond_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "DED", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/hard/emerald_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/hard/emerald_exchanger.json index b148004..22d6a63 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/hard/emerald_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/hard/emerald_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "MEM", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/hard/end_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/hard/end_exchanger.json index 71739dc..fdce338 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/hard/end_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/hard/end_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "SEP", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/hard/exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/vanilla/hard/exchanger_core_tier2.json index ec468dd..9944337 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/hard/exchanger_core_tier2.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/hard/exchanger_core_tier2.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "ILI", "CEC", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/hard/exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/vanilla/hard/exchanger_core_tier3.json index 399d4d1..a7336a2 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/hard/exchanger_core_tier3.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/hard/exchanger_core_tier3.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "DCE", "CBC", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/hard/golden_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/hard/golden_exchanger.json index 7575ef5..426bb7b 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/hard/golden_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/hard/golden_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "GEG", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/hard/iron_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/hard/iron_exchanger.json index 0759831..fd029db 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/hard/iron_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/hard/iron_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "IEI", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/hard/netherite_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/hard/netherite_exchanger.json index 2700a6b..78c6321 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/hard/netherite_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/hard/netherite_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "NEN", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/hard/obsidian_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/hard/obsidian_exchanger.json index 63a6283..8474d69 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/hard/obsidian_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/hard/obsidian_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "OEO", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/hard/stone_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/hard/stone_exchanger.json index 899f1d0..93d0ce8 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/hard/stone_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/hard/stone_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "hard" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "hard" + } + ] + }, "pattern": [ "SES", "CXC", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/normal/amethyst_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/normal/amethyst_exchanger.json index 132a48c..f76a05f 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/normal/amethyst_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/normal/amethyst_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "ACA", "EXE", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/normal/copper_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/normal/copper_exchanger.json index cdf1705..acfcdd3 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/normal/copper_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/normal/copper_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "ICI", "EXE", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/normal/diamond_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/normal/diamond_exchanger.json index decc10f..e820cd5 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/normal/diamond_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/normal/diamond_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "DCD", "EXE", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/normal/emerald_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/normal/emerald_exchanger.json index 515fde3..5a2c23f 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/normal/emerald_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/normal/emerald_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "MCM", "EXE", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/normal/end_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/normal/end_exchanger.json index e5137ef..0d300b3 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/normal/end_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/normal/end_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "SCP", "EXE", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/normal/exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/vanilla/normal/exchanger_core_tier2.json index 8aa9f98..024463f 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/normal/exchanger_core_tier2.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/normal/exchanger_core_tier2.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "ILI", "ECE", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/normal/exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/vanilla/normal/exchanger_core_tier3.json index 4c44d92..9e9523b 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/normal/exchanger_core_tier3.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/normal/exchanger_core_tier3.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "DED", "BCB", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/normal/golden_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/normal/golden_exchanger.json index 08816f8..17398db 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/normal/golden_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/normal/golden_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "GCG", "EXE", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/normal/iron_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/normal/iron_exchanger.json index c83a568..fac7509 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/normal/iron_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/normal/iron_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "ICI", "EXE", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/normal/netherite_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/normal/netherite_exchanger.json index c3d63a6..ede6d01 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/normal/netherite_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/normal/netherite_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "SCS", "EXE", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/normal/obsidian_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/normal/obsidian_exchanger.json index bb0b0ff..4345898 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/normal/obsidian_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/normal/obsidian_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "OCO", "EXE", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/normal/stone_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/normal/stone_exchanger.json index 67c5265..c8dc831 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/normal/stone_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/normal/stone_exchanger.json @@ -1,13 +1,18 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - }, - { - "type": "exchangers:vanilla_recipes_type", "value": "normal" - } - ], + "forge:condition": { + "type": "forge:and", + "values": [ + { + "type": "exchangers:vanilla_module", + "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", + "value": "normal" + } + ] + }, "pattern": [ "SCS", "EXE", diff --git a/src/main/resources/data/exchangers/recipes/vanilla/wooden_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/wooden_exchanger.json index cbc07bf..e8ff509 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/wooden_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/wooden_exchanger.json @@ -1,10 +1,9 @@ { "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:vanilla_module", "enabled": true - } - ], + "forge:condition": { + "type": "exchangers:vanilla_module", + "enabled": true + }, "pattern": [ "WEW", "WCW",