From e5ca6d2485ebe2577831e7b509cbc87f86c16f14 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 3 May 2015 00:34:37 -0400 Subject: [PATCH] #2416 Fix ClientProxy checking config settings in static init --- .../java/crazypants/enderio/ClientProxy.java | 39 +++++++++---------- .../java/crazypants/enderio/CommonProxy.java | 6 ++- src/main/java/crazypants/enderio/EnderIO.java | 2 + 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 6f592a9e..d2f41e7d 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -89,14 +89,10 @@ import crazypants.enderio.machine.light.ElectricLightRenderer; import crazypants.enderio.machine.obelisk.BlockObeliskAbstract; import crazypants.enderio.machine.obelisk.ObeliskRenderer; import crazypants.enderio.machine.obelisk.ObeliskSpecialRenderer; -import crazypants.enderio.machine.obelisk.attractor.BlockAttractor; import crazypants.enderio.machine.obelisk.attractor.TileAttractor; import crazypants.enderio.machine.obelisk.aversion.AversionObeliskRenderer; -import crazypants.enderio.machine.obelisk.aversion.BlockAversionObelisk; import crazypants.enderio.machine.obelisk.aversion.TileAversionObelisk; -import crazypants.enderio.machine.obelisk.weather.BlockWeatherObelisk; import crazypants.enderio.machine.obelisk.weather.TileWeatherObelisk; -import crazypants.enderio.machine.obelisk.xp.BlockExperienceObelisk; import crazypants.enderio.machine.obelisk.xp.TileExperienceOblisk; import crazypants.enderio.machine.painter.BlockPaintedFenceGate; import crazypants.enderio.machine.painter.BlockPaintedFenceGateRenderer; @@ -154,23 +150,6 @@ public class ClientProxy extends CommonProxy { }; // @formatter:on - static { - RedstoneConduit.initIcons(); - InsulatedRedstoneConduit.initIcons(); - RedstoneSwitch.initIcons(); - PowerConduit.initIcons(); - LiquidConduit.initIcons(); - AdvancedLiquidConduit.initIcons(); - EnderLiquidConduit.initIcons(); - ItemConduit.initIcons(); - if(GasUtil.isGasConduitEnabled()) { - GasConduit.initIcons(); - } - if(MEUtil.isMEEnabled()) { - MEConduit.initIcons(); - } - } - private final List conduitRenderers = new ArrayList(); private final DefaultConduitRenderer dcr = new DefaultConduitRenderer(); @@ -212,6 +191,24 @@ public class ClientProxy extends CommonProxy { public void setCbr(ConduitBundleRenderer cbr) { this.cbr = cbr; } + + @Override + public void loadIcons() { + RedstoneConduit.initIcons(); + InsulatedRedstoneConduit.initIcons(); + RedstoneSwitch.initIcons(); + PowerConduit.initIcons(); + LiquidConduit.initIcons(); + AdvancedLiquidConduit.initIcons(); + EnderLiquidConduit.initIcons(); + ItemConduit.initIcons(); + if(GasUtil.isGasConduitEnabled()) { + GasConduit.initIcons(); + } + if(MEUtil.isMEEnabled()) { + MEConduit.initIcons(); + } + } @Override public void load() { diff --git a/src/main/java/crazypants/enderio/CommonProxy.java b/src/main/java/crazypants/enderio/CommonProxy.java index e608d242..f8c35693 100644 --- a/src/main/java/crazypants/enderio/CommonProxy.java +++ b/src/main/java/crazypants/enderio/CommonProxy.java @@ -41,6 +41,10 @@ public class CommonProxy { return 5; } + public void loadIcons() { + ; + } + public void load() { FMLCommonHandler.instance().bus().register(tickTimer); } @@ -79,7 +83,5 @@ public class CommonProxy { onClientTick(); } } - } - } diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 8dee23f2..f42af335 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -307,6 +307,8 @@ public class EnderIO { public void preInit(FMLPreInitializationEvent event) { Config.load(event); + + proxy.loadIcons(); ConduitGeometryUtil.setupBounds((float) Config.conduitScale);