From 7dec274a569c5c7910ab69e917b40c1c6c57212d Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Thu, 19 Mar 2015 07:06:21 -0400 Subject: [PATCH] Fixed server-sided light value calls --- src/main/java/mekanism/common/block/BlockBasic.java | 2 +- src/main/java/mekanism/common/block/BlockMachine.java | 2 +- .../java/mekanism/generators/common/block/BlockGenerator.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 645b983ab..f961571b4 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -9,7 +9,6 @@ import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.api.energy.IEnergizedItem; import mekanism.api.energy.IStrictEnergyStorage; -import mekanism.client.ClientProxy; import mekanism.client.render.MekanismRenderer.ICustomBlockIcon; import mekanism.common.CTMData; import mekanism.common.ItemAttacher; @@ -721,6 +720,7 @@ 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 0a47e0b75..eb6700581 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -14,7 +14,6 @@ import mekanism.api.MekanismConfig.machines; import mekanism.api.MekanismConfig.usage; import mekanism.api.energy.IEnergizedItem; import mekanism.api.energy.IStrictEnergyStorage; -import mekanism.client.ClientProxy; import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; @@ -352,6 +351,7 @@ 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) diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 0b843634c..5faab3fcc 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -17,7 +17,6 @@ import mekanism.common.base.ISustainedTank; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.util.MekanismUtils; -import mekanism.generators.client.GeneratorsClientProxy; import mekanism.generators.common.GeneratorsBlocks; import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; @@ -135,6 +134,7 @@ 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)