diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index f5d7d211e..7dc65ad9e 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -36,19 +36,18 @@ public class MekanismConfig public static EnergyType activeType = EnergyType.J; public static TempType tempUnit = TempType.K; public static double TO_IC2; - public static double TO_BC; public static double TO_TE; public static double FROM_H2; public static double FROM_IC2; - public static double FROM_BC; public static double FROM_TE; public static int laserRange; public static double laserEnergyNeededPerHardness; public static double minerSilkMultiplier = 6; - public static boolean blacklistBC; public static boolean blacklistIC2; public static boolean blacklistRF; public static boolean destroyDisabledBlocks; + public static boolean enableAmbientLighting; + public static int ambientLightingLevel; } public static class client @@ -62,8 +61,6 @@ public class MekanismConfig public static boolean oldTransmitterRender = false; public static boolean replaceSoundsWhenResuming = true; public static boolean renderCTM = true; - public static boolean enableAmbientLighting; - public static int ambientLightingLevel; } public static class machines diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 65c035fdb..8ee709594 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -93,7 +93,6 @@ import mekanism.client.render.tileentity.RenderLaserTractorBeam; import mekanism.client.render.tileentity.RenderLogisticalSorter; import mekanism.client.render.tileentity.RenderMetallurgicInfuser; import mekanism.client.render.tileentity.RenderObsidianTNT; -import mekanism.client.render.tileentity.RenderOredictionificator; import mekanism.client.render.tileentity.RenderPortableTank; import mekanism.client.render.tileentity.RenderPressurizedReactionChamber; import mekanism.client.render.tileentity.RenderRotaryCondensentrator; @@ -212,8 +211,6 @@ public class ClientProxy extends CommonProxy client.replaceSoundsWhenResuming = Mekanism.configuration.get("client", "ReplaceSoundsWhenResuming", true, "If true, will reduce lagging between player sounds. Setting to false will reduce GC load").getBoolean(); client.renderCTM = Mekanism.configuration.get("client", "CTMRenderer", true).getBoolean(); - client.enableAmbientLighting = Mekanism.configuration.get("client", "EnableAmbientLighting", true).getBoolean(true); - client.ambientLightingLevel = Mekanism.configuration.get("client", "AmbientLightingLevel", 15).getInt(15); if(Mekanism.configuration.hasChanged()) { diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 02af36e51..dd3f5cf5d 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -303,6 +303,8 @@ public class CommonProxy general.laserRange = Mekanism.configuration.get("general", "LaserRange", 64).getInt(64); general.laserEnergyNeededPerHardness = Mekanism.configuration.get("general", "LaserDiggingEnergy", 100000).getInt(100000); general.destroyDisabledBlocks = Mekanism.configuration.get("general", "DestroyDisabledBlocks", true).getBoolean(true); + general.enableAmbientLighting = Mekanism.configuration.get("general", "EnableAmbientLighting", true).getBoolean(true); + general.ambientLightingLevel = Mekanism.configuration.get("general", "AmbientLightingLevel", 15).getInt(15); for(MachineType type : MachineType.getValidMachines()) { diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index f961571b4..2c7698627 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -720,7 +720,6 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon } @Override - @SideOnly(Side.CLIENT) public int getLightValue(IBlockAccess world, int x, int y, int z) { TileEntity tileEntity = world.getTileEntity(x, y, z); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index eb6700581..e8676eb65 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -351,10 +351,9 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer } @Override - @SideOnly(Side.CLIENT) public int getLightValue(IBlockAccess world, int x, int y, int z) { - if(client.enableAmbientLighting) + if(general.enableAmbientLighting) { TileEntity tileEntity = world.getTileEntity(x, y, z); @@ -362,7 +361,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer { if(((IActiveState)tileEntity).getActive() && ((IActiveState)tileEntity).lightUpdate()) { - return client.ambientLightingLevel; + return general.ambientLightingLevel; } } } diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 5faab3fcc..c335aa626 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -3,7 +3,6 @@ package mekanism.generators.common.block; import java.util.List; import java.util.Random; -import mekanism.api.MekanismConfig.client; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.common.ItemAttacher; @@ -134,10 +133,9 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IP } @Override - @SideOnly(Side.CLIENT) public int getLightValue(IBlockAccess world, int x, int y, int z) { - if(client.enableAmbientLighting) + if(general.enableAmbientLighting) { TileEntity tileEntity = world.getTileEntity(x, y, z); @@ -145,7 +143,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IP { if(((IActiveState)tileEntity).getActive() && ((IActiveState)tileEntity).lightUpdate()) { - return client.ambientLightingLevel; + return general.ambientLightingLevel; } } }