1.3 Update

- Ported from commit 9c04b0b
JackyyTV · Jul 16, 2017 · 0cb7624 · 0cb7624
1 parent d49ad74
commit 0cb7624
Show file tree

Hide file tree

Showing 7 changed files with 165 additions and 152 deletions.
diff --git 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
@@ -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
@@ -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();
+            }
         }
     }