mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-22 05:02:25 +00:00
#2416 Fix ClientProxy checking config settings in static init
This commit is contained in:
1 parent
b58e0432dc
commit
e5ca6d2485
3 files changed
+24
-23
No files matched your search
@@ -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<ConduitRenderer> conduitRenderers = new ArrayList<ConduitRenderer>();
|
||||
|
||||
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() {
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -307,6 +307,8 @@ public class EnderIO {
|
||||
public void preInit(FMLPreInitializationEvent event) {
|
||||
|
||||
Config.load(event);
|
||||
|
||||
proxy.loadIcons();
|
||||
|
||||
ConduitGeometryUtil.setupBounds((float) Config.conduitScale);
|
||||
|
||||
|
||||
Reference in new issue
Block a user