From 0cb762490d35f67f9cc7fe8f83dfad9f51e633c5 Mon Sep 17 00:00:00 2001 From: Jacky1356400 Date: Sun, 16 Jul 2017 21:37:44 +0800 Subject: [PATCH] 1.3 Update - Ported from commit 9c04b0b --- gradle.properties | 2 +- .../jacky1356400/exchangers/Exchangers.java | 2 +- .../exchangers/ExchangersItems.java | 120 ++++++------ .../me/jacky1356400/exchangers/Recipes.java | 171 +++++++++--------- .../exchangers/handler/ExchangerHandler.java | 2 +- .../exchangers/proxy/CommonProxy.java | 18 +- src/main/resources/mcmod.info | 2 +- 7 files changed, 165 insertions(+), 152 deletions(-) diff --git a/gradle.properties b/gradle.properties index b865f36..3c60e20 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,5 +3,5 @@ org.gradle.jvmargs=-Xmx4G mc_version=1.11.2 forge_version=13.20.1.2393 -mod_version=1.2 +mod_version=1.3 mappings_version=snapshot_20170612 diff --git a/src/main/java/me/jacky1356400/exchangers/Exchangers.java b/src/main/java/me/jacky1356400/exchangers/Exchangers.java index 475d0c0..89ff484 100644 --- a/src/main/java/me/jacky1356400/exchangers/Exchangers.java +++ b/src/main/java/me/jacky1356400/exchangers/Exchangers.java @@ -12,7 +12,7 @@ @Mod(modid = Exchangers.MODID, version = Exchangers.VERSION, name = Exchangers.MODNAME, dependencies = Exchangers.DEPENDS, useMetadata = true) public class Exchangers { - public static final String VERSION = "1.11.2-1.2"; + public static final String VERSION = "1.11.2-1.3"; public static final String MODID = "exchangers"; public static final String MODNAME = "Exchangers"; public static final String PREFIX = MODID + "."; diff --git a/src/main/java/me/jacky1356400/exchangers/ExchangersItems.java b/src/main/java/me/jacky1356400/exchangers/ExchangersItems.java index e0f17b6..c3a5bde 100644 --- a/src/main/java/me/jacky1356400/exchangers/ExchangersItems.java +++ b/src/main/java/me/jacky1356400/exchangers/ExchangersItems.java @@ -72,37 +72,43 @@ public static void init(){ exchangerCoreT3 = GameRegistry.register(new ItemExchangerCoreT3()); } //Ender IO Exchangers - if ((Config.enderIOModule = true) && (Loader.isModLoaded("enderio"))) { - conductiveIronExchanger = GameRegistry.register(new ItemConductiveIronExchanger()); - pulsatingIronExchanger = GameRegistry.register(new ItemPulsatingIronExchanger()); - electricalSteelExchanger = GameRegistry.register(new ItemElectricalSteelExchanger()); - energeticExchanger = GameRegistry.register(new ItemEnergeticExchanger()); - darkSteelExchanger = GameRegistry.register(new ItemDarkSteelExchanger()); - vibrantExchanger = GameRegistry.register(new ItemVibrantExchanger()); - eioExchangerCoreT1 = GameRegistry.register(new ItemEIOExchangerCoreT1()); - eioExchangerCoreT2 = GameRegistry.register(new ItemEIOExchangerCoreT2()); - eioExchangerCoreT3 = GameRegistry.register(new ItemEIOExchangerCoreT3()); + if (Config.enderIOModule = true) { + if (Loader.isModLoaded("enderio")) { + conductiveIronExchanger = GameRegistry.register(new ItemConductiveIronExchanger()); + pulsatingIronExchanger = GameRegistry.register(new ItemPulsatingIronExchanger()); + electricalSteelExchanger = GameRegistry.register(new ItemElectricalSteelExchanger()); + energeticExchanger = GameRegistry.register(new ItemEnergeticExchanger()); + darkSteelExchanger = GameRegistry.register(new ItemDarkSteelExchanger()); + vibrantExchanger = GameRegistry.register(new ItemVibrantExchanger()); + eioExchangerCoreT1 = GameRegistry.register(new ItemEIOExchangerCoreT1()); + eioExchangerCoreT2 = GameRegistry.register(new ItemEIOExchangerCoreT2()); + eioExchangerCoreT3 = GameRegistry.register(new ItemEIOExchangerCoreT3()); + } } //Thermal Expansion Exchangers - if ((Config.thermalExpansionModule = true) && (Loader.isModLoaded("thermalexpansion"))) { - leadstoneExchanger = GameRegistry.register(new ItemLeadstoneExchanger()); - hardenedExchanger = GameRegistry.register(new ItemHardenedExchanger()); - reinforcedExchanger = GameRegistry.register(new ItemReinforcedExchanger()); - signalumExchanger = GameRegistry.register(new ItemSignalumExchanger()); - resonantExchanger = GameRegistry.register(new ItemResonantExchanger()); - teExchangerCoreT1 = GameRegistry.register(new ItemTEExchangerCoreT1()); - teExchangerCoreT2 = GameRegistry.register(new ItemTEExchangerCoreT2()); - teExchangerCoreT3 = GameRegistry.register(new ItemTEExchangerCoreT3()); + if (Config.thermalExpansionModule = true) { + if (Loader.isModLoaded("thermalexpansion")) { + leadstoneExchanger = GameRegistry.register(new ItemLeadstoneExchanger()); + hardenedExchanger = GameRegistry.register(new ItemHardenedExchanger()); + reinforcedExchanger = GameRegistry.register(new ItemReinforcedExchanger()); + signalumExchanger = GameRegistry.register(new ItemSignalumExchanger()); + resonantExchanger = GameRegistry.register(new ItemResonantExchanger()); + teExchangerCoreT1 = GameRegistry.register(new ItemTEExchangerCoreT1()); + teExchangerCoreT2 = GameRegistry.register(new ItemTEExchangerCoreT2()); + teExchangerCoreT3 = GameRegistry.register(new ItemTEExchangerCoreT3()); + } } //Mekanism Exchangers - if ((Config.mekanismModule = true) && (Loader.isModLoaded("mekanism"))) { - basicExchanger = GameRegistry.register(new ItemBasicExchanger()); - advancedExchanger = GameRegistry.register(new ItemAdvancedExchanger()); - eliteExchanger = GameRegistry.register(new ItemEliteExchanger()); - ultimateExchanger = GameRegistry.register(new ItemUltimateExchanger()); - mekanismExchangerCoreT1 = GameRegistry.register(new ItemMekanismExchangerCoreT1()); - mekanismExchangerCoreT2 = GameRegistry.register(new ItemMekanismExchangerCoreT2()); - mekanismExchangerCoreT3 = GameRegistry.register(new ItemMekanismExchangerCoreT3()); + if (Config.mekanismModule = true) { + if (Loader.isModLoaded("mekanism")) { + basicExchanger = GameRegistry.register(new ItemBasicExchanger()); + advancedExchanger = GameRegistry.register(new ItemAdvancedExchanger()); + eliteExchanger = GameRegistry.register(new ItemEliteExchanger()); + ultimateExchanger = GameRegistry.register(new ItemUltimateExchanger()); + mekanismExchangerCoreT1 = GameRegistry.register(new ItemMekanismExchangerCoreT1()); + mekanismExchangerCoreT2 = GameRegistry.register(new ItemMekanismExchangerCoreT2()); + mekanismExchangerCoreT3 = GameRegistry.register(new ItemMekanismExchangerCoreT3()); + } } } @@ -126,37 +132,43 @@ public static void initModels(){ exchangerCoreT3.initModel(); } //Ender IO Exchangers - if ((Config.enderIOModule = true) && (Loader.isModLoaded("enderio"))) { - conductiveIronExchanger.initModel(); - pulsatingIronExchanger.initModel(); - electricalSteelExchanger.initModel(); - energeticExchanger.initModel(); - darkSteelExchanger.initModel(); - vibrantExchanger.initModel(); - eioExchangerCoreT1.initModel(); - eioExchangerCoreT2.initModel(); - eioExchangerCoreT3.initModel(); + if (Config.enderIOModule = true) { + if (Loader.isModLoaded("enderio")) { + conductiveIronExchanger.initModel(); + pulsatingIronExchanger.initModel(); + electricalSteelExchanger.initModel(); + energeticExchanger.initModel(); + darkSteelExchanger.initModel(); + vibrantExchanger.initModel(); + eioExchangerCoreT1.initModel(); + eioExchangerCoreT2.initModel(); + eioExchangerCoreT3.initModel(); + } } //Thermal Expansion Exchangers - if ((Config.thermalExpansionModule = true) && (Loader.isModLoaded("thermalexpansion"))) { - leadstoneExchanger.initModel(); - hardenedExchanger.initModel(); - reinforcedExchanger.initModel(); - signalumExchanger.initModel(); - resonantExchanger.initModel(); - teExchangerCoreT1.initModel(); - teExchangerCoreT2.initModel(); - teExchangerCoreT3.initModel(); + if (Config.thermalExpansionModule = true) { + if (Loader.isModLoaded("thermalexpansion")) { + leadstoneExchanger.initModel(); + hardenedExchanger.initModel(); + reinforcedExchanger.initModel(); + signalumExchanger.initModel(); + resonantExchanger.initModel(); + teExchangerCoreT1.initModel(); + teExchangerCoreT2.initModel(); + teExchangerCoreT3.initModel(); + } } //Mekanism Exchangers - if ((Config.mekanismModule = true) && (Loader.isModLoaded("mekanism"))) { - basicExchanger.initModel(); - advancedExchanger.initModel(); - eliteExchanger.initModel(); - ultimateExchanger.initModel(); - mekanismExchangerCoreT1.initModel(); - mekanismExchangerCoreT2.initModel(); - mekanismExchangerCoreT3.initModel(); + if (Config.mekanismModule = true) { + if (Loader.isModLoaded("mekanism")) { + basicExchanger.initModel(); + advancedExchanger.initModel(); + eliteExchanger.initModel(); + ultimateExchanger.initModel(); + mekanismExchangerCoreT1.initModel(); + mekanismExchangerCoreT2.initModel(); + mekanismExchangerCoreT3.initModel(); + } } } diff --git a/src/main/java/me/jacky1356400/exchangers/Recipes.java b/src/main/java/me/jacky1356400/exchangers/Recipes.java index 731675e..a43d2ab 100644 --- a/src/main/java/me/jacky1356400/exchangers/Recipes.java +++ b/src/main/java/me/jacky1356400/exchangers/Recipes.java @@ -14,9 +14,9 @@ public class Recipes { public static void init(){ if (Config.vanillaModule = true) { + ShapedOreRecipe woodenExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.woodenExchanger), "WEW", "WCW", "WEW", 'W', "logWood", 'E', Items.ENDER_EYE, 'C', ExchangersItems.exchangerCoreT1); + GameRegistry.addRecipe(woodenExchangerRecipe); if (Config.vanillaProgressiveRecipes = true) { - ShapedOreRecipe woodenExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.woodenExchanger), "WEW", "WCW", "WEW", 'W', "logWood", 'E', Items.ENDER_EYE, 'C', ExchangersItems.exchangerCoreT1); - GameRegistry.addRecipe(woodenExchangerRecipe); ShapedOreRecipe stoneExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.stoneExchanger), "SES", "CXC", "SES", 'S', "stone", 'E', Items.ENDER_EYE, 'C', ExchangersItems.exchangerCoreT1, 'X', ExchangersItems.woodenExchanger); GameRegistry.addRecipe(stoneExchangerRecipe); ShapedOreRecipe goldenExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.goldenExchanger), "GEG", "CXC", "GEG", 'G', "ingotGold", 'E', Items.ENDER_EYE, 'C', ExchangersItems.exchangerCoreT2, 'X', ExchangersItems.stoneExchanger); @@ -31,8 +31,6 @@ public static void init(){ GameRegistry.addRecipe(obsidianExchangerRecipe); } else { - ShapedOreRecipe woodenExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.woodenExchanger), "WEW", "WCW", "WEW", 'W', "logWood", 'E', Items.ENDER_EYE, 'C', ExchangersItems.exchangerCoreT1); - GameRegistry.addRecipe(woodenExchangerRecipe); ShapedOreRecipe stoneExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.stoneExchanger), "SES", "SCS", "SES", 'S', "stone", 'E', Items.ENDER_EYE, 'C', ExchangersItems.exchangerCoreT1); GameRegistry.addRecipe(stoneExchangerRecipe); ShapedOreRecipe goldenExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.goldenExchanger), "GEG", "GCG", "GEG", 'G', "ingotGold", 'E', Items.ENDER_EYE, 'C', ExchangersItems.exchangerCoreT2); @@ -59,103 +57,100 @@ public static void init(){ GameRegistry.addRecipe(tuberousExchangerRecipe); } - if ((Config.enderIOModule = true) && (Loader.isModLoaded("EnderIO"))) { - if (Config.enderIOProgressiveRecipes = true) { + if (Config.enderIOModule = true) { + if (Loader.isModLoaded("enderio")) { ShapedOreRecipe conductiveIronExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.conductiveIronExchanger), "IBI", "ICI", "IBI", 'I', "ingotConductiveIron", 'B', EnderIOIntegration.basicCapacitor, 'C', ExchangersItems.eioExchangerCoreT1); GameRegistry.addRecipe(conductiveIronExchangerRecipe); - ShapedOreRecipe pulsatingIronExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.pulsatingIronExchanger), "IPI", "CXC", "IBI", 'I', "ingotPulsatingIron", 'P', EnderIOIntegration.pulsatingCrystal, 'B', EnderIOIntegration.basicCapacitor, 'C', ExchangersItems.eioExchangerCoreT1, 'X', ExchangersItems.conductiveIronExchanger); - GameRegistry.addRecipe(pulsatingIronExchangerRecipe); - ShapedOreRecipe electricalSteelExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.electricalSteelExchanger), "SDS", "CXC", "SBS", 'S', "ingotElectricalSteel", 'B', EnderIOIntegration.capacitorBankBasic, 'D', EnderIOIntegration.doubleLayerCapacitor, 'C', ExchangersItems.eioExchangerCoreT2, 'X', ExchangersItems.pulsatingIronExchanger); - GameRegistry.addRecipe(electricalSteelExchangerRecipe); - ShapedOreRecipe energeticExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.energeticExchanger), "ADA", "CXC", "ABA", 'A', "ingotEnergeticAlloy", 'B', EnderIOIntegration.capacitorBank, 'D', EnderIOIntegration.doubleLayerCapacitor, 'C', ExchangersItems.eioExchangerCoreT2, 'X', ExchangersItems.electricalSteelExchanger); - GameRegistry.addRecipe(energeticExchangerRecipe); - ShapedOreRecipe darkSteelExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.darkSteelExchanger), "SVS", "CXC", "SOS", 'S', "ingotDarkSteel", 'O', EnderIOIntegration.octadicCapacitor, 'V', EnderIOIntegration.vibrantCrystal, 'C', ExchangersItems.eioExchangerCoreT3, 'X', ExchangersItems.energeticExchanger); - GameRegistry.addRecipe(darkSteelExchangerRecipe); - ShapedOreRecipe vibrantExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.vibrantExchanger), "AEA", "CXC", "ABA", 'A', "ingotVibrantAlloy", 'B', EnderIOIntegration.capacitorBankVibrant, 'E', EnderIOIntegration.enderCrystal, 'C', ExchangersItems.eioExchangerCoreT3, 'X', ExchangersItems.darkSteelExchanger); - GameRegistry.addRecipe(vibrantExchangerRecipe); + if (Config.enderIOProgressiveRecipes = true) { + ShapedOreRecipe pulsatingIronExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.pulsatingIronExchanger), "IPI", "CXC", "IBI", 'I', "ingotPulsatingIron", 'P', EnderIOIntegration.pulsatingCrystal, 'B', EnderIOIntegration.basicCapacitor, 'C', ExchangersItems.eioExchangerCoreT1, 'X', ExchangersItems.conductiveIronExchanger); + GameRegistry.addRecipe(pulsatingIronExchangerRecipe); + ShapedOreRecipe electricalSteelExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.electricalSteelExchanger), "SDS", "CXC", "SBS", 'S', "ingotElectricalSteel", 'B', EnderIOIntegration.capacitorBankBasic, 'D', EnderIOIntegration.doubleLayerCapacitor, 'C', ExchangersItems.eioExchangerCoreT2, 'X', ExchangersItems.pulsatingIronExchanger); + GameRegistry.addRecipe(electricalSteelExchangerRecipe); + ShapedOreRecipe energeticExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.energeticExchanger), "ADA", "CXC", "ABA", 'A', "ingotEnergeticAlloy", 'B', EnderIOIntegration.capacitorBank, 'D', EnderIOIntegration.doubleLayerCapacitor, 'C', ExchangersItems.eioExchangerCoreT2, 'X', ExchangersItems.electricalSteelExchanger); + GameRegistry.addRecipe(energeticExchangerRecipe); + ShapedOreRecipe darkSteelExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.darkSteelExchanger), "SVS", "CXC", "SOS", 'S', "ingotDarkSteel", 'O', EnderIOIntegration.octadicCapacitor, 'V', EnderIOIntegration.vibrantCrystal, 'C', ExchangersItems.eioExchangerCoreT3, 'X', ExchangersItems.energeticExchanger); + GameRegistry.addRecipe(darkSteelExchangerRecipe); + ShapedOreRecipe vibrantExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.vibrantExchanger), "AEA", "CXC", "ABA", 'A', "ingotVibrantAlloy", 'B', EnderIOIntegration.capacitorBankVibrant, 'E', EnderIOIntegration.enderCrystal, 'C', ExchangersItems.eioExchangerCoreT3, 'X', ExchangersItems.darkSteelExchanger); + GameRegistry.addRecipe(vibrantExchangerRecipe); + } else { + ShapedOreRecipe pulsatingIronExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.pulsatingIronExchanger), "IPI", "ICI", "IBI", 'I', "ingotPulsatingIron", 'P', EnderIOIntegration.pulsatingCrystal, 'B', EnderIOIntegration.basicCapacitor, 'C', ExchangersItems.eioExchangerCoreT1); + GameRegistry.addRecipe(pulsatingIronExchangerRecipe); + ShapedOreRecipe electricalSteelExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.electricalSteelExchanger), "SDS", "SCS", "SBS", 'S', "ingotElectricalSteel", 'B', EnderIOIntegration.capacitorBankBasic, 'D', EnderIOIntegration.doubleLayerCapacitor, 'C', ExchangersItems.eioExchangerCoreT2); + GameRegistry.addRecipe(electricalSteelExchangerRecipe); + ShapedOreRecipe energeticExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.energeticExchanger), "ADA", "ACA", "ABA", 'A', "ingotEnergeticAlloy", 'B', EnderIOIntegration.capacitorBank, 'D', EnderIOIntegration.doubleLayerCapacitor, 'C', ExchangersItems.eioExchangerCoreT2); + GameRegistry.addRecipe(energeticExchangerRecipe); + ShapedOreRecipe darkSteelExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.darkSteelExchanger), "SVS", "SCS", "SOS", 'S', "ingotDarkSteel", 'B', EnderIOIntegration.octadicCapacitor, 'V', EnderIOIntegration.vibrantCrystal, 'C', ExchangersItems.eioExchangerCoreT3); + GameRegistry.addRecipe(darkSteelExchangerRecipe); + ShapedOreRecipe vibrantExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.vibrantExchanger), "AEA", "ACA", "ABA", 'A', "ingotVibrantAlloy", 'B', EnderIOIntegration.capacitorBankVibrant, 'E', EnderIOIntegration.enderCrystal, 'C', ExchangersItems.eioExchangerCoreT3); + GameRegistry.addRecipe(vibrantExchangerRecipe); + } + ShapedOreRecipe eioExchangerCoreT1Recipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.eioExchangerCoreT1), "PCP", "CNC", "PCP", 'P', "nuggetPulsatingIron", 'C', "ingotConductiveIron", 'N', EnderIOIntegration.bucketNutrientDistillation); + GameRegistry.addRecipe(eioExchangerCoreT1Recipe); + ShapedOreRecipe eioExchangerCoreT2Recipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.eioExchangerCoreT2), "PSP", "CDC", "PSP", 'P', "itemPulsatingPowder", 'S', "ingotElectricalSteel", 'C', ExchangersItems.eioExchangerCoreT1, 'D', EnderIOIntegration.bucketDewOfTheVoid); + GameRegistry.addRecipe(eioExchangerCoreT2Recipe); + ShapedOreRecipe eioExchangerCoreT3Recipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.eioExchangerCoreT3), "DCD", "CVC", "DCD", 'C', ExchangersItems.eioExchangerCoreT2, 'D', "ingotDarkSteel", 'V', EnderIOIntegration.bucketVaporOfLevity); + GameRegistry.addRecipe(eioExchangerCoreT3Recipe); } - else { - ShapedOreRecipe conductiveIronExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.conductiveIronExchanger), "IBI", "ICI", "IBI", 'I', "ingotConductiveIron", 'B', EnderIOIntegration.basicCapacitor, 'C', ExchangersItems.eioExchangerCoreT1); - GameRegistry.addRecipe(conductiveIronExchangerRecipe); - ShapedOreRecipe pulsatingIronExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.pulsatingIronExchanger), "IPI", "ICI", "IBI", 'I', "ingotPulsatingIron", 'P', EnderIOIntegration.pulsatingCrystal, 'B', EnderIOIntegration.basicCapacitor, 'C', ExchangersItems.eioExchangerCoreT1); - GameRegistry.addRecipe(pulsatingIronExchangerRecipe); - ShapedOreRecipe electricalSteelExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.electricalSteelExchanger), "SDS", "SCS", "SBS", 'S', "ingotElectricalSteel", 'B', EnderIOIntegration.capacitorBankBasic, 'D', EnderIOIntegration.doubleLayerCapacitor, 'C', ExchangersItems.eioExchangerCoreT2); - GameRegistry.addRecipe(electricalSteelExchangerRecipe); - ShapedOreRecipe energeticExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.energeticExchanger), "ADA", "ACA", "ABA", 'A', "ingotEnergeticAlloy", 'B', EnderIOIntegration.capacitorBank, 'D', EnderIOIntegration.doubleLayerCapacitor, 'C', ExchangersItems.eioExchangerCoreT2); - GameRegistry.addRecipe(energeticExchangerRecipe); - ShapedOreRecipe darkSteelExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.darkSteelExchanger), "SVS", "SCS", "SOS", 'S', "ingotDarkSteel", 'B', EnderIOIntegration.octadicCapacitor, 'V', EnderIOIntegration.vibrantCrystal, 'C', ExchangersItems.eioExchangerCoreT3); - GameRegistry.addRecipe(darkSteelExchangerRecipe); - ShapedOreRecipe vibrantExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.vibrantExchanger), "AEA", "ACA", "ABA", 'A', "ingotVibrantAlloy", 'B', EnderIOIntegration.capacitorBankVibrant, 'E', EnderIOIntegration.enderCrystal, 'C', ExchangersItems.eioExchangerCoreT3); - GameRegistry.addRecipe(vibrantExchangerRecipe); - } - ShapedOreRecipe eioExchangerCoreT1Recipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.eioExchangerCoreT1), "PCP", "CNC", "PCP", 'P', "nuggetPulsatingIron", 'C', "ingotConductiveIron", 'N', EnderIOIntegration.bucketNutrientDistillation); - GameRegistry.addRecipe(eioExchangerCoreT1Recipe); - ShapedOreRecipe eioExchangerCoreT2Recipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.eioExchangerCoreT2), "PSP", "CDC", "PSP", 'P', "itemPulsatingPowder", 'S', "ingotElectricalSteel", 'C', ExchangersItems.eioExchangerCoreT1, 'D', EnderIOIntegration.bucketDewOfTheVoid); - GameRegistry.addRecipe(eioExchangerCoreT2Recipe); - ShapedOreRecipe eioExchangerCoreT3Recipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.eioExchangerCoreT3), "DCD", "CVC", "DCD", 'C', ExchangersItems.eioExchangerCoreT2, 'D', "ingotDarkSteel", 'V', EnderIOIntegration.bucketVaporOfLevity); - GameRegistry.addRecipe(eioExchangerCoreT3Recipe); } - if ((Config.thermalExpansionModule = true) && (Loader.isModLoaded("thermalexpansion"))) { - if (Config.thermalExpansionProgressiveRecipes = true) { - ShapedOreRecipe leadstoneExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.leadstoneExchanger), "LSL", "LCL", "LFL", 'L', "ingotLead", 'S', ThermalExpansionIntegration.redstoneServo, 'F', ThermalExpansionIntegration.fluxCapacitorBasic, 'C', ExchangersItems.teExchangerCoreT1); - GameRegistry.addRecipe(leadstoneExchangerRecipe); - ShapedOreRecipe hardenedExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.hardenedExchanger), "IRI", "CXC", "IFI", 'I', "ingotInvar", 'R', ThermalExpansionIntegration.redstoneReceptionCoil, 'F', ThermalExpansionIntegration.fluxCapacitorHardened, 'C', ExchangersItems.teExchangerCoreT1, 'X', ExchangersItems.leadstoneExchanger); - GameRegistry.addRecipe(hardenedExchangerRecipe); - ShapedOreRecipe reinforcedExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.reinforcedExchanger), "ERE", "CXC", "EFE", 'E', "ingotElectrum", 'R', ThermalExpansionIntegration.redstoneTransmissionCoil, 'F', ThermalExpansionIntegration.fluxCapacitorReinforced, 'C', ExchangersItems.teExchangerCoreT2, 'X', ExchangersItems.hardenedExchanger); - GameRegistry.addRecipe(reinforcedExchangerRecipe); - ShapedOreRecipe signalumExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.signalumExchanger), "SRS", "CXC", "SFS", 'S', "ingotSignalum", 'R', ThermalExpansionIntegration.redstoneConductanceCoil, 'F', ThermalExpansionIntegration.fluxCapacitorSignalum, 'C', ExchangersItems.teExchangerCoreT3, 'X', ExchangersItems.reinforcedExchanger); - GameRegistry.addRecipe(signalumExchangerRecipe); - ShapedOreRecipe resonantExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.resonantExchanger), "IRI", "CXC", "IFI", 'I', "ingotEnderium", 'R', ThermalExpansionIntegration.redstoneConductanceCoil, 'F', ThermalExpansionIntegration.fluxCapacitorResonant, 'C', ExchangersItems.teExchangerCoreT3, 'X', ExchangersItems.signalumExchanger); - GameRegistry.addRecipe(resonantExchangerRecipe); - } - else { + if (Config.thermalExpansionModule = true) { + if (Loader.isModLoaded("thermalexpansion")) { ShapedOreRecipe leadstoneExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.leadstoneExchanger), "LSL", "LCL", "LFL", 'L', "ingotLead", 'S', ThermalExpansionIntegration.redstoneServo, 'F', ThermalExpansionIntegration.fluxCapacitorBasic, 'C', ExchangersItems.teExchangerCoreT1); GameRegistry.addRecipe(leadstoneExchangerRecipe); - ShapedOreRecipe hardenedExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.hardenedExchanger), "IRI", "ICI", "IFI", 'I', "ingotInvar", 'R', ThermalExpansionIntegration.redstoneReceptionCoil, 'F', ThermalExpansionIntegration.fluxCapacitorHardened, 'C', ExchangersItems.teExchangerCoreT1); - GameRegistry.addRecipe(hardenedExchangerRecipe); - ShapedOreRecipe reinforcedExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.reinforcedExchanger), "ERE", "ECE", "EFE", 'E', "ingotElectrum", 'R', ThermalExpansionIntegration.redstoneTransmissionCoil, 'F', ThermalExpansionIntegration.fluxCapacitorReinforced, 'C', ExchangersItems.teExchangerCoreT2); - GameRegistry.addRecipe(reinforcedExchangerRecipe); - ShapedOreRecipe signalumExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.signalumExchanger), "SRS", "SCS", "SFS", 'S', "ingotSignalum", 'R', ThermalExpansionIntegration.redstoneConductanceCoil, 'F', ThermalExpansionIntegration.fluxCapacitorSignalum, 'C', ExchangersItems.teExchangerCoreT3); - GameRegistry.addRecipe(signalumExchangerRecipe); - ShapedOreRecipe resonantExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.resonantExchanger), "IRI", "ICI", "IFI", 'I', "ingotEnderium", 'R', ThermalExpansionIntegration.redstoneConductanceCoil, 'F', ThermalExpansionIntegration.fluxCapacitorResonant, 'C', ExchangersItems.teExchangerCoreT3); - GameRegistry.addRecipe(resonantExchangerRecipe); + if (Config.thermalExpansionProgressiveRecipes = true) { + ShapedOreRecipe hardenedExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.hardenedExchanger), "IRI", "CXC", "IFI", 'I', "ingotInvar", 'R', ThermalExpansionIntegration.redstoneReceptionCoil, 'F', ThermalExpansionIntegration.fluxCapacitorHardened, 'C', ExchangersItems.teExchangerCoreT1, 'X', ExchangersItems.leadstoneExchanger); + GameRegistry.addRecipe(hardenedExchangerRecipe); + ShapedOreRecipe reinforcedExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.reinforcedExchanger), "ERE", "CXC", "EFE", 'E', "ingotElectrum", 'R', ThermalExpansionIntegration.redstoneTransmissionCoil, 'F', ThermalExpansionIntegration.fluxCapacitorReinforced, 'C', ExchangersItems.teExchangerCoreT2, 'X', ExchangersItems.hardenedExchanger); + GameRegistry.addRecipe(reinforcedExchangerRecipe); + ShapedOreRecipe signalumExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.signalumExchanger), "SRS", "CXC", "SFS", 'S', "ingotSignalum", 'R', ThermalExpansionIntegration.redstoneConductanceCoil, 'F', ThermalExpansionIntegration.fluxCapacitorSignalum, 'C', ExchangersItems.teExchangerCoreT3, 'X', ExchangersItems.reinforcedExchanger); + GameRegistry.addRecipe(signalumExchangerRecipe); + ShapedOreRecipe resonantExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.resonantExchanger), "IRI", "CXC", "IFI", 'I', "ingotEnderium", 'R', ThermalExpansionIntegration.redstoneConductanceCoil, 'F', ThermalExpansionIntegration.fluxCapacitorResonant, 'C', ExchangersItems.teExchangerCoreT3, 'X', ExchangersItems.signalumExchanger); + GameRegistry.addRecipe(resonantExchangerRecipe); + } else { + ShapedOreRecipe hardenedExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.hardenedExchanger), "IRI", "ICI", "IFI", 'I', "ingotInvar", 'R', ThermalExpansionIntegration.redstoneReceptionCoil, 'F', ThermalExpansionIntegration.fluxCapacitorHardened, 'C', ExchangersItems.teExchangerCoreT1); + GameRegistry.addRecipe(hardenedExchangerRecipe); + ShapedOreRecipe reinforcedExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.reinforcedExchanger), "ERE", "ECE", "EFE", 'E', "ingotElectrum", 'R', ThermalExpansionIntegration.redstoneTransmissionCoil, 'F', ThermalExpansionIntegration.fluxCapacitorReinforced, 'C', ExchangersItems.teExchangerCoreT2); + GameRegistry.addRecipe(reinforcedExchangerRecipe); + ShapedOreRecipe signalumExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.signalumExchanger), "SRS", "SCS", "SFS", 'S', "ingotSignalum", 'R', ThermalExpansionIntegration.redstoneConductanceCoil, 'F', ThermalExpansionIntegration.fluxCapacitorSignalum, 'C', ExchangersItems.teExchangerCoreT3); + GameRegistry.addRecipe(signalumExchangerRecipe); + ShapedOreRecipe resonantExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.resonantExchanger), "IRI", "ICI", "IFI", 'I', "ingotEnderium", 'R', ThermalExpansionIntegration.redstoneConductanceCoil, 'F', ThermalExpansionIntegration.fluxCapacitorResonant, 'C', ExchangersItems.teExchangerCoreT3); + GameRegistry.addRecipe(resonantExchangerRecipe); + } + ShapedOreRecipe teExchangerCoreT1Recipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.teExchangerCoreT1), "CLC", "LRL", "CLC", 'C', "gearCopper", 'L', "ingotLead", 'R', ThermalExpansionIntegration.bucketResonantEnder); + GameRegistry.addRecipe(teExchangerCoreT1Recipe); + ShapedOreRecipe teExchangerCoreT2Recipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.teExchangerCoreT2), "BIB", "CGC", "BIB", 'B', "gearBronze", 'I', "gearInvar", 'C', ExchangersItems.teExchangerCoreT1, 'G', ThermalExpansionIntegration.bucketEnergizedGlowstone); + GameRegistry.addRecipe(teExchangerCoreT2Recipe); + ShapedOreRecipe teExchangerCoreT3Recipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.teExchangerCoreT3), "LCL", "CGC", "LCL", 'C', ExchangersItems.teExchangerCoreT2, 'L', "gearLumium", 'G', ThermalExpansionIntegration.bucketGelidCryotheum); + GameRegistry.addRecipe(teExchangerCoreT3Recipe); } - ShapedOreRecipe teExchangerCoreT1Recipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.teExchangerCoreT1), "CLC", "LRL", "CLC", 'C', "gearCopper", 'L', "ingotLead", 'R', ThermalExpansionIntegration.bucketResonantEnder); - GameRegistry.addRecipe(teExchangerCoreT1Recipe); - ShapedOreRecipe teExchangerCoreT2Recipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.teExchangerCoreT2), "BIB", "CGC", "BIB", 'B', "gearBronze", 'I', "gearInvar",'C', ExchangersItems.teExchangerCoreT1, 'G', ThermalExpansionIntegration.bucketEnergizedGlowstone); - GameRegistry.addRecipe(teExchangerCoreT2Recipe); - ShapedOreRecipe teExchangerCoreT3Recipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.teExchangerCoreT3), "LCL", "CGC", "LCL", 'C', ExchangersItems.teExchangerCoreT2, 'L', "gearLumium", 'G', ThermalExpansionIntegration.bucketGelidCryotheum); - GameRegistry.addRecipe(teExchangerCoreT3Recipe); } - if ((Config.mekanismModule = true) && (Loader.isModLoaded("mekanism"))) { - if (Config.mekanismProgressiveRecipes = true) { - ShapedOreRecipe basicExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.basicExchanger), "BTB", "BCB", "BTB", 'B', MekanismIntegration.circuitBasic, 'T', MekanismIntegration.energyTablet, 'C', ExchangersItems.mekanismExchangerCoreT1); - GameRegistry.addRecipe(basicExchangerRecipe); - ShapedOreRecipe advancedExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.advancedExchanger), "ATA", "CXC", "ATA", 'A', MekanismIntegration.circuitAdvanced, 'T', MekanismIntegration.energyTablet, 'C', ExchangersItems.mekanismExchangerCoreT2, 'X', ExchangersItems.basicExchanger); - GameRegistry.addRecipe(advancedExchangerRecipe); - ShapedOreRecipe eliteExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.eliteExchanger), "EPE", "CXC", "ETE", 'E', MekanismIntegration.circuitElite, 'P', MekanismIntegration.teleportationCore , 'T', MekanismIntegration.energyTablet, 'C', ExchangersItems.mekanismExchangerCoreT3, 'X', ExchangersItems.advancedExchanger); - GameRegistry.addRecipe(eliteExchangerRecipe); - ShapedOreRecipe ultimateExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.ultimateExchanger), "UTU", "CXC", "UTU", 'U', MekanismIntegration.circuitUltimate, 'T', MekanismIntegration.portableTeleporter, 'C', ExchangersItems.mekanismExchangerCoreT3, 'X', ExchangersItems.eliteExchanger); - GameRegistry.addRecipe(ultimateExchangerRecipe); - } - else { + if (Config.mekanismModule = true) { + if (Loader.isModLoaded("mekanism")) { ShapedOreRecipe basicExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.basicExchanger), "BTB", "BCB", "BTB", 'B', MekanismIntegration.circuitBasic, 'T', MekanismIntegration.energyTablet, 'C', ExchangersItems.mekanismExchangerCoreT1); GameRegistry.addRecipe(basicExchangerRecipe); - ShapedOreRecipe advancedExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.advancedExchanger), "ATA", "ACA", "ATA", 'A', MekanismIntegration.circuitAdvanced, 'T', MekanismIntegration.energyTablet, 'C', ExchangersItems.mekanismExchangerCoreT2); - GameRegistry.addRecipe(advancedExchangerRecipe); - ShapedOreRecipe eliteExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.eliteExchanger), "EPE", "ECE", "ETE", 'E', MekanismIntegration.circuitElite, 'P', MekanismIntegration.teleportationCore , 'T', MekanismIntegration.energyTablet, 'C', ExchangersItems.mekanismExchangerCoreT3); - GameRegistry.addRecipe(eliteExchangerRecipe); - ShapedOreRecipe ultimateExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.ultimateExchanger), "UTU", "UCU", "UTU", 'U', MekanismIntegration.circuitUltimate, 'T', MekanismIntegration.portableTeleporter, 'C', ExchangersItems.mekanismExchangerCoreT3); - GameRegistry.addRecipe(ultimateExchangerRecipe); + if (Config.mekanismProgressiveRecipes = true) { + ShapedOreRecipe advancedExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.advancedExchanger), "ATA", "CXC", "ATA", 'A', MekanismIntegration.circuitAdvanced, 'T', MekanismIntegration.energyTablet, 'C', ExchangersItems.mekanismExchangerCoreT2, 'X', ExchangersItems.basicExchanger); + GameRegistry.addRecipe(advancedExchangerRecipe); + ShapedOreRecipe eliteExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.eliteExchanger), "EPE", "CXC", "ETE", 'E', MekanismIntegration.circuitElite, 'P', MekanismIntegration.teleportationCore, 'T', MekanismIntegration.energyTablet, 'C', ExchangersItems.mekanismExchangerCoreT3, 'X', ExchangersItems.advancedExchanger); + GameRegistry.addRecipe(eliteExchangerRecipe); + ShapedOreRecipe ultimateExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.ultimateExchanger), "UTU", "CXC", "UTU", 'U', MekanismIntegration.circuitUltimate, 'T', MekanismIntegration.portableTeleporter, 'C', ExchangersItems.mekanismExchangerCoreT3, 'X', ExchangersItems.eliteExchanger); + GameRegistry.addRecipe(ultimateExchangerRecipe); + } else { + ShapedOreRecipe advancedExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.advancedExchanger), "ATA", "ACA", "ATA", 'A', MekanismIntegration.circuitAdvanced, 'T', MekanismIntegration.energyTablet, 'C', ExchangersItems.mekanismExchangerCoreT2); + GameRegistry.addRecipe(advancedExchangerRecipe); + ShapedOreRecipe eliteExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.eliteExchanger), "EPE", "ECE", "ETE", 'E', MekanismIntegration.circuitElite, 'P', MekanismIntegration.teleportationCore, 'T', MekanismIntegration.energyTablet, 'C', ExchangersItems.mekanismExchangerCoreT3); + GameRegistry.addRecipe(eliteExchangerRecipe); + ShapedOreRecipe ultimateExchangerRecipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.ultimateExchanger), "UTU", "UCU", "UTU", 'U', MekanismIntegration.circuitUltimate, 'T', MekanismIntegration.portableTeleporter, 'C', ExchangersItems.mekanismExchangerCoreT3); + GameRegistry.addRecipe(ultimateExchangerRecipe); + } + ShapedOreRecipe mekanismExchangerCoreT1Recipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.mekanismExchangerCoreT1), "OSO", "SAS", "OSO", 'O', "ingotOsmium", 'S', "ingotSteel", 'A', "alloyAdvanced"); + GameRegistry.addRecipe(mekanismExchangerCoreT1Recipe); + ShapedOreRecipe mekanismExchangerCoreT2Recipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.mekanismExchangerCoreT2), "DGD", "CAC", "DGD", 'D', "dustDiamond", 'G', "ingotRefinedGlowstone", 'C', ExchangersItems.mekanismExchangerCoreT1, 'A', "alloyElite"); + GameRegistry.addRecipe(mekanismExchangerCoreT2Recipe); + ShapedOreRecipe mekanismExchangerCoreT3Recipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.mekanismExchangerCoreT3), "OCO", "CAC", "OCO", 'C', ExchangersItems.mekanismExchangerCoreT2, 'O', "dustRefinedObsidian", 'A', "alloyUltimate"); + GameRegistry.addRecipe(mekanismExchangerCoreT3Recipe); } - ShapedOreRecipe mekanismExchangerCoreT1Recipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.mekanismExchangerCoreT1), "OSO", "SAS", "OSO", 'O', "ingotOsmium", 'S', "ingotSteel", 'A', "alloyAdvanced"); - GameRegistry.addRecipe(mekanismExchangerCoreT1Recipe); - ShapedOreRecipe mekanismExchangerCoreT2Recipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.mekanismExchangerCoreT2), "DGD", "CAC", "DGD", 'D', "dustDiamond", 'G', "ingotRefinedGlowstone", 'C', ExchangersItems.mekanismExchangerCoreT1, 'A', "alloyElite"); - GameRegistry.addRecipe(mekanismExchangerCoreT2Recipe); - ShapedOreRecipe mekanismExchangerCoreT3Recipe = new ShapedOreRecipe(new ItemStack(ExchangersItems.mekanismExchangerCoreT3), "OCO", "CAC", "OCO", 'C', ExchangersItems.mekanismExchangerCoreT2, 'O', "dustRefinedObsidian", 'A', "alloyUltimate"); - GameRegistry.addRecipe(mekanismExchangerCoreT3Recipe); } } diff --git a/src/main/java/me/jacky1356400/exchangers/handler/ExchangerHandler.java b/src/main/java/me/jacky1356400/exchangers/handler/ExchangerHandler.java index 187f902..d17d98c 100644 --- a/src/main/java/me/jacky1356400/exchangers/handler/ExchangerHandler.java +++ b/src/main/java/me/jacky1356400/exchangers/handler/ExchangerHandler.java @@ -179,7 +179,7 @@ public void switchMode(EntityPlayer player, ItemStack stack) { if (modeSwitch > MODE_3X3) modeSwitch = MODE_1X1; } - if (heldItem.getItem() instanceof ItemLeadstoneExchanger) { + if (heldItem.getItem() instanceof ItemHardenedExchanger) { if (modeSwitch > MODE_7X7) modeSwitch = MODE_1X1; } diff --git a/src/main/java/me/jacky1356400/exchangers/proxy/CommonProxy.java b/src/main/java/me/jacky1356400/exchangers/proxy/CommonProxy.java index 91fef81..4f63d10 100644 --- a/src/main/java/me/jacky1356400/exchangers/proxy/CommonProxy.java +++ b/src/main/java/me/jacky1356400/exchangers/proxy/CommonProxy.java @@ -30,14 +30,20 @@ public void preInit(FMLPreInitializationEvent e){ config = new Configuration(new File(configDir.getPath(), "exchangers.cfg")); Config.readConfig(); ExchangersItems.init(); - if ((Config.enderIOModule = true) && (Loader.isModLoaded("enderio"))) { - EnderIOIntegration.init(); + if (Config.enderIOModule = true) { + if (Loader.isModLoaded("enderio")) { + EnderIOIntegration.init(); + } } - if ((Config.thermalExpansionModule = true) && (Loader.isModLoaded("thermalexpansion"))) { - ThermalExpansionIntegration.init(); + if (Config.thermalExpansionModule = true) { + if (Loader.isModLoaded("thermalexpansion")) { + ThermalExpansionIntegration.init(); + } } - if ((Config.mekanismModule = true) && (Loader.isModLoaded("mekanism"))) { - MekanismIntegration.init(); + if (Config.mekanismModule = true) { + if (Loader.isModLoaded("mekanism")) { + MekanismIntegration.init(); + } } Recipes.init(); PacketHandler.registerMessages(Exchangers.MODID); diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 9637dd0..5cede16 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "exchangers", "name": "Exchangers", "description": "Block Exchangers.", - "version": "1.11.2-1.2", + "version": "1.11.2-1.3", "mcversion": "1.11.2", "url": "https://github.com/Jacky1356400/Exchangers", "updateUrl": "",