From 3d4636d8da69c097b7258bda54702c7de4529eb4 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sat, 27 Dec 2014 21:37:20 +0000 Subject: [PATCH] Config option for generator lighting --- .../generators/client/GeneratorsClientProxy.java | 13 +++++++++++++ .../client/MekanismGeneratorsClient.java | 16 ++++++++++++++++ .../generators/common/block/BlockGenerator.java | 15 ++++++++++----- 3 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 src/main/java/mekanism/generators/client/MekanismGeneratorsClient.java diff --git a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java index dc35bd8e5..6e5731c75 100644 --- a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java +++ b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java @@ -1,5 +1,6 @@ package mekanism.generators.client; +import mekanism.common.Mekanism; import mekanism.generators.client.gui.GuiBioGenerator; import mekanism.generators.client.gui.GuiGasGenerator; import mekanism.generators.client.gui.GuiHeatGenerator; @@ -44,6 +45,18 @@ 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 new file mode 100644 index 000000000..1f24f382f --- /dev/null +++ b/src/main/java/mekanism/generators/client/MekanismGeneratorsClient.java @@ -0,0 +1,16 @@ +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/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 65b57b5ae..7ff49d6cd 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -16,6 +16,7 @@ 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; @@ -135,19 +136,23 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IP @Override public int getLightValue(IBlockAccess world, int x, int y, int z) { - TileEntity tileEntity = world.getTileEntity(x, y, z); - - if(tileEntity instanceof IActiveState && !(tileEntity instanceof TileEntitySolarGenerator)) + if(MekanismGeneratorsClient.enableAmbientLighting) { - if(((IActiveState)tileEntity).getActive() && ((IActiveState)tileEntity).lightUpdate()) + TileEntity tileEntity = world.getTileEntity(x, y, z); + + if(tileEntity instanceof IActiveState && !(tileEntity instanceof TileEntitySolarGenerator)) { - return 15; + if(((IActiveState)tileEntity).getActive() && ((IActiveState)tileEntity).lightUpdate()) + { + return MekanismGeneratorsClient.ambientLightingLevel; + } } } return 0; } + @Override public int damageDropped(int i) {