diff --git a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java index 6e5731c75..88f825a0d 100644 --- a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java +++ b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java @@ -13,6 +13,7 @@ import mekanism.generators.client.render.RenderHeatGenerator; import mekanism.generators.client.render.RenderSolarGenerator; import mekanism.generators.client.render.RenderWindTurbine; import mekanism.generators.common.GeneratorsCommonProxy; +import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; import mekanism.generators.common.tile.TileEntityBioGenerator; import mekanism.generators.common.tile.TileEntityGasGenerator; @@ -45,18 +46,6 @@ public class GeneratorsClientProxy extends GeneratorsCommonProxy ClientRegistry.registerTileEntity(TileEntityWindTurbine.class, "WindTurbine", new RenderWindTurbine()); } - @Override - public void loadConfiguration() - { - super.loadConfiguration(); - - MekanismGeneratorsClient.enableAmbientLighting = Mekanism.configuration.get("generation", "EnableAmbientLighting", true).getBoolean(true); - MekanismGeneratorsClient.ambientLightingLevel = Mekanism.configuration.get("generation", "AmbientLightingLevel", 15, "", 0, 15).getInt(15); - - if(Mekanism.configuration.hasChanged()) - Mekanism.configuration.save(); - } - @Override public void registerRenderInformation() { diff --git a/src/main/java/mekanism/generators/client/MekanismGeneratorsClient.java b/src/main/java/mekanism/generators/client/MekanismGeneratorsClient.java deleted file mode 100644 index 1f24f382f..000000000 --- a/src/main/java/mekanism/generators/client/MekanismGeneratorsClient.java +++ /dev/null @@ -1,16 +0,0 @@ -package mekanism.generators.client; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import mekanism.generators.common.MekanismGenerators; - -public class MekanismGeneratorsClient extends MekanismGenerators -{ - - @SideOnly(Side.CLIENT) - - //General Configuration - public static boolean enableAmbientLighting; - public static int ambientLightingLevel; - -} diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index 5d95fa8ab..800d5d179 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -49,6 +49,9 @@ public class GeneratorsCommonProxy */ public void loadConfiguration() { + MekanismGenerators.enableAmbientLighting = Mekanism.configuration.get("general", "EnableAmbientLighting", true).getBoolean(true); + MekanismGenerators.ambientLightingLevel = Mekanism.configuration.get("general", "AmbientLightingLevel", 15, "", 0, 15).getInt(15); + MekanismGenerators.advancedSolarGeneration = Mekanism.configuration.get("generation", "AdvancedSolarGeneration", 300D).getDouble(300D); MekanismGenerators.bioGeneration = Mekanism.configuration.get("generation", "BioGeneration", 350D).getDouble(350D); MekanismGenerators.heatGeneration = Mekanism.configuration.get("generation", "HeatGeneration", 150D).getDouble(150D); diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index f69898a41..5e4a9e2cd 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -34,6 +34,8 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; @@ -71,6 +73,11 @@ public class MekanismGenerators implements IModule public static int windGenerationMinY; public static int windGenerationMaxY; + @SideOnly(Side.CLIENT) + + //General Configuration + public static boolean enableAmbientLighting; + public static int ambientLightingLevel; @EventHandler public void postInit(FMLPostInitializationEvent event) diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 7ff49d6cd..1bbe6e937 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -16,7 +16,6 @@ import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.util.MekanismUtils; import mekanism.generators.client.GeneratorsClientProxy; -import mekanism.generators.client.MekanismGeneratorsClient; import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; import mekanism.generators.common.tile.TileEntityBioGenerator; @@ -136,7 +135,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IP @Override public int getLightValue(IBlockAccess world, int x, int y, int z) { - if(MekanismGeneratorsClient.enableAmbientLighting) + if(MekanismGenerators.enableAmbientLighting) { TileEntity tileEntity = world.getTileEntity(x, y, z); @@ -144,7 +143,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IP { if(((IActiveState)tileEntity).getActive() && ((IActiveState)tileEntity).lightUpdate()) { - return MekanismGeneratorsClient.ambientLightingLevel; + return MekanismGenerators.ambientLightingLevel; } } }