From eb0c801440d896b924054068ba37dce70e900def Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Thu, 5 Sep 2013 20:35:21 -0400 Subject: [PATCH] @SideOnly(Side.CLIENT) Ya i got a bit lazy way back when this was required. Hope this fixes any issues with mods calling my code server side and crashing. --- src/dark/fluid/client/ClientProxy.java | 4 +++- src/dark/fluid/client/model/ModelCenterTank.java | 4 +++- src/dark/fluid/client/model/ModelCornerTank.java | 4 +++- src/dark/fluid/client/model/ModelEngine.java | 4 +++- src/dark/fluid/client/model/ModelFurnace.java | 4 +++- src/dark/fluid/client/model/ModelGearPiston.java | 4 +++- src/dark/fluid/client/model/ModelGenerator.java | 4 +++- src/dark/fluid/client/model/ModelLargePipe.java | 4 +++- src/dark/fluid/client/model/ModelLiquidTank.java | 4 +++- src/dark/fluid/client/model/ModelLiquidTankCorner.java | 4 +++- src/dark/fluid/client/model/ModelPump.java | 4 +++- src/dark/fluid/client/model/ModelReleaseValve.java | 4 +++- src/dark/fluid/client/model/ModelSink.java | 4 +++- src/dark/fluid/client/model/ModelTank.java | 4 +++- src/dark/fluid/client/model/ModelTankSide.java | 6 ++++-- src/dark/fluid/client/render/RenderBoiler.java | 5 ++++- src/dark/fluid/client/render/RenderFurnace.java | 5 ++++- src/dark/fluid/client/render/RenderGearPiston.java | 5 ++++- src/dark/fluid/common/FluidMech.java | 4 ++-- src/dark/fluid/common/machines/BlockBoiler.java | 7 +++++-- src/dark/fluid/common/machines/BlockFluid.java | 6 ++++-- src/dark/fluid/common/machines/BlockReleaseValve.java | 7 +++++-- src/dark/fluid/common/machines/BlockSink.java | 6 ++++-- src/dark/fluid/common/machines/BlockSteamPiston.java | 7 +++++-- src/dark/fluid/common/machines/BlockTank.java | 7 +++++-- src/dark/fluid/common/pipes/BlockPipe.java | 5 +++++ src/dark/fluid/common/pump/BlockConstructionPump.java | 7 +++++++ src/dark/fluid/common/pump/BlockPumpMachine.java | 4 ++++ src/dark/mech/client/model/ModelGearRod.java | 4 +++- src/dark/mech/client/model/ModelGenerator.java | 4 +++- src/dark/mech/client/render/RenderGearRod.java | 5 ++++- src/dark/mech/client/render/RenderGenerator.java | 5 ++++- src/dark/mech/common/machines/BlockGenerator.java | 5 +++++ src/dark/mech/common/machines/BlockRod.java | 4 ++++ 34 files changed, 127 insertions(+), 37 deletions(-) diff --git a/src/dark/fluid/client/ClientProxy.java b/src/dark/fluid/client/ClientProxy.java index 0b937c3f..3c0245a3 100644 --- a/src/dark/fluid/client/ClientProxy.java +++ b/src/dark/fluid/client/ClientProxy.java @@ -3,6 +3,8 @@ package dark.fluid.client; import net.minecraftforge.client.MinecraftForgeClient; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import dark.fluid.client.render.BlockRenderHelper; import dark.fluid.client.render.ItemRenderHelper; import dark.fluid.client.render.RenderConstructionPump; @@ -20,7 +22,7 @@ import dark.fluid.common.pipes.TileEntityGenericPipe; import dark.fluid.common.pipes.TileEntityPipe; import dark.fluid.common.pump.TileEntityConstructionPump; import dark.fluid.common.pump.TileEntityStarterPump; - +@SideOnly(Side.CLIENT) public class ClientProxy extends CommonProxy { @Override diff --git a/src/dark/fluid/client/model/ModelCenterTank.java b/src/dark/fluid/client/model/ModelCenterTank.java index c9ab1cd1..fa358f57 100644 --- a/src/dark/fluid/client/model/ModelCenterTank.java +++ b/src/dark/fluid/client/model/ModelCenterTank.java @@ -6,9 +6,11 @@ package dark.fluid.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - +@SideOnly(Side.CLIENT) public class ModelCenterTank extends ModelBase { diff --git a/src/dark/fluid/client/model/ModelCornerTank.java b/src/dark/fluid/client/model/ModelCornerTank.java index c75dd997..fe97711d 100644 --- a/src/dark/fluid/client/model/ModelCornerTank.java +++ b/src/dark/fluid/client/model/ModelCornerTank.java @@ -6,9 +6,11 @@ package dark.fluid.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - +@SideOnly(Side.CLIENT) public class ModelCornerTank extends ModelBase { //Corner diff --git a/src/dark/fluid/client/model/ModelEngine.java b/src/dark/fluid/client/model/ModelEngine.java index 8fc38129..52b3c5bf 100644 --- a/src/dark/fluid/client/model/ModelEngine.java +++ b/src/dark/fluid/client/model/ModelEngine.java @@ -6,9 +6,11 @@ package dark.fluid.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - +@SideOnly(Side.CLIENT) public class ModelEngine extends ModelBase { //fields diff --git a/src/dark/fluid/client/model/ModelFurnace.java b/src/dark/fluid/client/model/ModelFurnace.java index 237300e7..3d34f8c0 100644 --- a/src/dark/fluid/client/model/ModelFurnace.java +++ b/src/dark/fluid/client/model/ModelFurnace.java @@ -6,9 +6,11 @@ package dark.fluid.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - +@SideOnly(Side.CLIENT) public class ModelFurnace extends ModelBase { //fields diff --git a/src/dark/fluid/client/model/ModelGearPiston.java b/src/dark/fluid/client/model/ModelGearPiston.java index 7ebd45f7..6394cf24 100644 --- a/src/dark/fluid/client/model/ModelGearPiston.java +++ b/src/dark/fluid/client/model/ModelGearPiston.java @@ -6,9 +6,11 @@ package dark.fluid.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - +@SideOnly(Side.CLIENT) public class ModelGearPiston extends ModelBase { //fields diff --git a/src/dark/fluid/client/model/ModelGenerator.java b/src/dark/fluid/client/model/ModelGenerator.java index 607ad9c5..8f611696 100644 --- a/src/dark/fluid/client/model/ModelGenerator.java +++ b/src/dark/fluid/client/model/ModelGenerator.java @@ -6,9 +6,11 @@ package dark.fluid.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - +@SideOnly(Side.CLIENT) public class ModelGenerator extends ModelBase { //fields diff --git a/src/dark/fluid/client/model/ModelLargePipe.java b/src/dark/fluid/client/model/ModelLargePipe.java index 1936957a..9ec326b7 100644 --- a/src/dark/fluid/client/model/ModelLargePipe.java +++ b/src/dark/fluid/client/model/ModelLargePipe.java @@ -6,9 +6,11 @@ package dark.fluid.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - +@SideOnly(Side.CLIENT) public class ModelLargePipe extends ModelBase { // fields diff --git a/src/dark/fluid/client/model/ModelLiquidTank.java b/src/dark/fluid/client/model/ModelLiquidTank.java index 83b6ba46..fccdb041 100644 --- a/src/dark/fluid/client/model/ModelLiquidTank.java +++ b/src/dark/fluid/client/model/ModelLiquidTank.java @@ -6,11 +6,13 @@ package dark.fluid.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.tileentity.TileEntity; import dark.fluid.common.machines.TileEntityTank; - +@SideOnly(Side.CLIENT) public class ModelLiquidTank extends ModelBase { // fields diff --git a/src/dark/fluid/client/model/ModelLiquidTankCorner.java b/src/dark/fluid/client/model/ModelLiquidTankCorner.java index 33797437..ebcefc7c 100644 --- a/src/dark/fluid/client/model/ModelLiquidTankCorner.java +++ b/src/dark/fluid/client/model/ModelLiquidTankCorner.java @@ -1,8 +1,10 @@ package dark.fluid.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - +@SideOnly(Side.CLIENT) public class ModelLiquidTankCorner extends ModelBase { // fields diff --git a/src/dark/fluid/client/model/ModelPump.java b/src/dark/fluid/client/model/ModelPump.java index e4cdffca..980ceb06 100644 --- a/src/dark/fluid/client/model/ModelPump.java +++ b/src/dark/fluid/client/model/ModelPump.java @@ -6,9 +6,11 @@ package dark.fluid.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - +@SideOnly(Side.CLIENT) public class ModelPump extends ModelBase { // fields diff --git a/src/dark/fluid/client/model/ModelReleaseValve.java b/src/dark/fluid/client/model/ModelReleaseValve.java index d7824a63..8272f27a 100644 --- a/src/dark/fluid/client/model/ModelReleaseValve.java +++ b/src/dark/fluid/client/model/ModelReleaseValve.java @@ -6,9 +6,11 @@ package dark.fluid.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - +@SideOnly(Side.CLIENT) public class ModelReleaseValve extends ModelBase { diff --git a/src/dark/fluid/client/model/ModelSink.java b/src/dark/fluid/client/model/ModelSink.java index 59a1f938..e1a51e08 100644 --- a/src/dark/fluid/client/model/ModelSink.java +++ b/src/dark/fluid/client/model/ModelSink.java @@ -6,9 +6,11 @@ package dark.fluid.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - +@SideOnly(Side.CLIENT) public class ModelSink extends ModelBase { // fields diff --git a/src/dark/fluid/client/model/ModelTank.java b/src/dark/fluid/client/model/ModelTank.java index 43f56368..283be236 100644 --- a/src/dark/fluid/client/model/ModelTank.java +++ b/src/dark/fluid/client/model/ModelTank.java @@ -6,9 +6,11 @@ package dark.fluid.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - +@SideOnly(Side.CLIENT) public class ModelTank extends ModelBase { //One Block Tank diff --git a/src/dark/fluid/client/model/ModelTankSide.java b/src/dark/fluid/client/model/ModelTankSide.java index b9fc4780..9443cba0 100644 --- a/src/dark/fluid/client/model/ModelTankSide.java +++ b/src/dark/fluid/client/model/ModelTankSide.java @@ -6,9 +6,11 @@ package dark.fluid.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - +@SideOnly(Side.CLIENT) public class ModelTankSide extends ModelBase { @@ -126,7 +128,7 @@ public class ModelTankSide extends ModelBase * @param right - "" to the right * @param bot - "" to the bot * @param top - "" to the top - * + * * Not this only renders one side of the block. You will need to rotate it to face another * direction then render it. If rotating up or down you will need to translate it a bit */ public void render(float size, boolean left, boolean right, boolean bot, boolean top) diff --git a/src/dark/fluid/client/render/RenderBoiler.java b/src/dark/fluid/client/render/RenderBoiler.java index 1167f925..0a8541b6 100644 --- a/src/dark/fluid/client/render/RenderBoiler.java +++ b/src/dark/fluid/client/render/RenderBoiler.java @@ -5,6 +5,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import dark.core.client.renders.RenderMachine; import dark.core.prefab.helpers.ConnectionHelper; import dark.fluid.client.model.ModelCenterTank; @@ -12,7 +15,7 @@ import dark.fluid.client.model.ModelCornerTank; import dark.fluid.client.model.ModelTank; import dark.fluid.common.FluidMech; import dark.fluid.common.machines.TileEntityBoiler; - +@SideOnly(Side.CLIENT) public class RenderBoiler extends RenderMachine { int type = 0; diff --git a/src/dark/fluid/client/render/RenderFurnace.java b/src/dark/fluid/client/render/RenderFurnace.java index b4b5b38c..62375222 100644 --- a/src/dark/fluid/client/render/RenderFurnace.java +++ b/src/dark/fluid/client/render/RenderFurnace.java @@ -5,10 +5,13 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import dark.core.client.renders.RenderMachine; import dark.fluid.client.model.ModelFurnace; import dark.fluid.common.FluidMech; - +@SideOnly(Side.CLIENT) public class RenderFurnace extends RenderMachine { int type = 0; diff --git a/src/dark/fluid/client/render/RenderGearPiston.java b/src/dark/fluid/client/render/RenderGearPiston.java index 047c822f..d90342f4 100644 --- a/src/dark/fluid/client/render/RenderGearPiston.java +++ b/src/dark/fluid/client/render/RenderGearPiston.java @@ -5,11 +5,14 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import dark.core.client.renders.RenderMachine; import dark.fluid.client.model.ModelGearPiston; import dark.fluid.common.FluidMech; import dark.fluid.common.machines.TileEntitySteamPiston; - +@SideOnly(Side.CLIENT) public class RenderGearPiston extends RenderMachine { private ModelGearPiston model; diff --git a/src/dark/fluid/common/FluidMech.java b/src/dark/fluid/common/FluidMech.java index 3d98e45a..c47ac253 100644 --- a/src/dark/fluid/common/FluidMech.java +++ b/src/dark/fluid/common/FluidMech.java @@ -148,7 +148,7 @@ public class FluidMech extends ModPrefab fmWaste = new Fluid(WASTE_FLUID_NAME).setUnlocalizedName("fluid.waste.name").setDensity(1300).setViscosity(1800); FluidRegistry.registerFluid(fmWaste); waste = FluidRegistry.getFluid(WASTE_FLUID_NAME); - if(waste == null) + if (waste == null) { waste = fmWaste; } @@ -170,7 +170,7 @@ public class FluidMech extends ModPrefab FluidRegistry.registerFluid(fmOil); oil = FluidRegistry.getFluid(OIL_FLUID_NAME); - if(oil == null) + if (oil == null) { oil = fmOil; } diff --git a/src/dark/fluid/common/machines/BlockBoiler.java b/src/dark/fluid/common/machines/BlockBoiler.java index f94ce048..ca3ef539 100644 --- a/src/dark/fluid/common/machines/BlockBoiler.java +++ b/src/dark/fluid/common/machines/BlockBoiler.java @@ -2,6 +2,9 @@ package dark.fluid.common.machines; import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; @@ -38,13 +41,13 @@ public class BlockBoiler extends BlockFM return false; } - @Override + @Override @SideOnly(Side.CLIENT) public boolean renderAsNormalBlock() { return false; } - @Override + @Override @SideOnly(Side.CLIENT) public int getRenderType() { return -1; diff --git a/src/dark/fluid/common/machines/BlockFluid.java b/src/dark/fluid/common/machines/BlockFluid.java index c3f2b9d6..deafd63d 100644 --- a/src/dark/fluid/common/machines/BlockFluid.java +++ b/src/dark/fluid/common/machines/BlockFluid.java @@ -1,5 +1,7 @@ package dark.fluid.common.machines; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.Icon; @@ -20,7 +22,7 @@ public class BlockFluid extends BlockFluidFinite } - @Override + @Override @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { this.flowing = par1IconRegister.registerIcon(FluidMech.instance.PREFIX + this.getUnlocalizedName().replace("tile.", "") + "_flowing"); @@ -28,7 +30,7 @@ public class BlockFluid extends BlockFluidFinite fluid.setIcons(still, flowing); } - @Override + @Override @SideOnly(Side.CLIENT) public Icon getIcon(int par1, int par2) { return still; diff --git a/src/dark/fluid/common/machines/BlockReleaseValve.java b/src/dark/fluid/common/machines/BlockReleaseValve.java index e95a566c..00999195 100644 --- a/src/dark/fluid/common/machines/BlockReleaseValve.java +++ b/src/dark/fluid/common/machines/BlockReleaseValve.java @@ -2,6 +2,9 @@ package dark.fluid.common.machines; import java.util.Random; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import net.minecraft.block.material.Material; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -38,13 +41,13 @@ public class BlockReleaseValve extends BlockFM return false; } - @Override + @Override @SideOnly(Side.CLIENT) public boolean renderAsNormalBlock() { return false; } - @Override + @Override @SideOnly(Side.CLIENT) public int getRenderType() { return -1; diff --git a/src/dark/fluid/common/machines/BlockSink.java b/src/dark/fluid/common/machines/BlockSink.java index 255a6ac5..2ea56170 100644 --- a/src/dark/fluid/common/machines/BlockSink.java +++ b/src/dark/fluid/common/machines/BlockSink.java @@ -1,5 +1,7 @@ package dark.fluid.common.machines; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -78,13 +80,13 @@ public class BlockSink extends BlockFM return false; } - @Override + @Override @SideOnly(Side.CLIENT) public boolean renderAsNormalBlock() { return false; } - @Override + @Override @SideOnly(Side.CLIENT) public int getRenderType() { return BlockRenderHelper.renderID; diff --git a/src/dark/fluid/common/machines/BlockSteamPiston.java b/src/dark/fluid/common/machines/BlockSteamPiston.java index a05edc5e..3a69b9c5 100644 --- a/src/dark/fluid/common/machines/BlockSteamPiston.java +++ b/src/dark/fluid/common/machines/BlockSteamPiston.java @@ -2,6 +2,9 @@ package dark.fluid.common.machines; import java.util.Random; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -40,13 +43,13 @@ public class BlockSteamPiston extends BlockFM return false; } - @Override + @Override @SideOnly(Side.CLIENT) public boolean renderAsNormalBlock() { return false; } - @Override + @Override @SideOnly(Side.CLIENT) public int getRenderType() { return -1; diff --git a/src/dark/fluid/common/machines/BlockTank.java b/src/dark/fluid/common/machines/BlockTank.java index 3a78d685..d411873e 100644 --- a/src/dark/fluid/common/machines/BlockTank.java +++ b/src/dark/fluid/common/machines/BlockTank.java @@ -2,6 +2,9 @@ package dark.fluid.common.machines; import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -35,13 +38,13 @@ public class BlockTank extends BlockFM return false; } - @Override + @Override @SideOnly(Side.CLIENT) public boolean renderAsNormalBlock() { return false; } - @Override + @Override @SideOnly(Side.CLIENT) public int getRenderType() { return BlockRenderHelper.renderID; diff --git a/src/dark/fluid/common/pipes/BlockPipe.java b/src/dark/fluid/common/pipes/BlockPipe.java index 191a04ac..15adeac2 100644 --- a/src/dark/fluid/common/pipes/BlockPipe.java +++ b/src/dark/fluid/common/pipes/BlockPipe.java @@ -2,6 +2,9 @@ package dark.fluid.common.pipes; import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -34,6 +37,7 @@ public class BlockPipe extends BlockFM } @Override + @SideOnly(Side.CLIENT) public boolean renderAsNormalBlock() { return false; @@ -46,6 +50,7 @@ public class BlockPipe extends BlockFM } @Override + @SideOnly(Side.CLIENT) public int getRenderType() { return -1; diff --git a/src/dark/fluid/common/pump/BlockConstructionPump.java b/src/dark/fluid/common/pump/BlockConstructionPump.java index 8f06454a..5508890f 100644 --- a/src/dark/fluid/common/pump/BlockConstructionPump.java +++ b/src/dark/fluid/common/pump/BlockConstructionPump.java @@ -2,6 +2,9 @@ package dark.fluid.common.pump; import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -34,6 +37,7 @@ public class BlockConstructionPump extends BlockFM } @Override + @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { this.blockIcon = par1IconRegister.registerIcon(FluidMech.instance.PREFIX + "ironMachineSide"); @@ -42,6 +46,7 @@ public class BlockConstructionPump extends BlockFM } @Override + @SideOnly(Side.CLIENT) public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int side) { TileEntity entity = world.getBlockTileEntity(x, y, z); @@ -68,6 +73,7 @@ public class BlockConstructionPump extends BlockFM } @Override + @SideOnly(Side.CLIENT) public boolean renderAsNormalBlock() { return false; @@ -80,6 +86,7 @@ public class BlockConstructionPump extends BlockFM } @Override + @SideOnly(Side.CLIENT) public int getRenderType() { return BlockRenderHelper.instance.renderID; diff --git a/src/dark/fluid/common/pump/BlockPumpMachine.java b/src/dark/fluid/common/pump/BlockPumpMachine.java index 489e9a1c..e576d68e 100644 --- a/src/dark/fluid/common/pump/BlockPumpMachine.java +++ b/src/dark/fluid/common/pump/BlockPumpMachine.java @@ -9,6 +9,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import dark.fluid.client.render.BlockRenderHelper; import dark.fluid.common.BlockFM; import dark.fluid.common.FluidMech; @@ -30,12 +32,14 @@ public class BlockPumpMachine extends BlockFM } @Override + @SideOnly(Side.CLIENT) public boolean renderAsNormalBlock() { return false; } @Override + @SideOnly(Side.CLIENT) public int getRenderType() { return BlockRenderHelper.renderID; diff --git a/src/dark/mech/client/model/ModelGearRod.java b/src/dark/mech/client/model/ModelGearRod.java index a554f245..09702251 100644 --- a/src/dark/mech/client/model/ModelGearRod.java +++ b/src/dark/mech/client/model/ModelGearRod.java @@ -6,9 +6,11 @@ package dark.mech.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - +@SideOnly(Side.CLIENT) public class ModelGearRod extends ModelBase { // fields diff --git a/src/dark/mech/client/model/ModelGenerator.java b/src/dark/mech/client/model/ModelGenerator.java index 0f6ee633..97b0b432 100644 --- a/src/dark/mech/client/model/ModelGenerator.java +++ b/src/dark/mech/client/model/ModelGenerator.java @@ -6,10 +6,12 @@ package dark.mech.client.model; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.tileentity.TileEntity; - +@SideOnly(Side.CLIENT) public class ModelGenerator extends ModelBase { // fields diff --git a/src/dark/mech/client/render/RenderGearRod.java b/src/dark/mech/client/render/RenderGearRod.java index 93eca662..45dafa22 100644 --- a/src/dark/mech/client/render/RenderGearRod.java +++ b/src/dark/mech/client/render/RenderGearRod.java @@ -5,8 +5,11 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; -import dark.mech.client.model.ModelGearRod; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import dark.mech.client.model.ModelGearRod; +@SideOnly(Side.CLIENT) public class RenderGearRod extends TileEntitySpecialRenderer { private ModelGearRod model; diff --git a/src/dark/mech/client/render/RenderGenerator.java b/src/dark/mech/client/render/RenderGenerator.java index 87f28913..25003aa5 100644 --- a/src/dark/mech/client/render/RenderGenerator.java +++ b/src/dark/mech/client/render/RenderGenerator.java @@ -5,8 +5,11 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; -import dark.mech.client.model.ModelGenerator; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import dark.mech.client.model.ModelGenerator; +@SideOnly(Side.CLIENT) public class RenderGenerator extends TileEntitySpecialRenderer { int type = 0; diff --git a/src/dark/mech/common/machines/BlockGenerator.java b/src/dark/mech/common/machines/BlockGenerator.java index b1805c04..e964e0dd 100644 --- a/src/dark/mech/common/machines/BlockGenerator.java +++ b/src/dark/mech/common/machines/BlockGenerator.java @@ -2,6 +2,9 @@ package dark.mech.common.machines; import java.util.ArrayList; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -67,12 +70,14 @@ public class BlockGenerator extends BlockFM } @Override + @SideOnly(Side.CLIENT) public boolean renderAsNormalBlock() { return false; } @Override + @SideOnly(Side.CLIENT) public int getRenderType() { return BlockRenderHelper.renderID; diff --git a/src/dark/mech/common/machines/BlockRod.java b/src/dark/mech/common/machines/BlockRod.java index 4ecf5f99..64fe2b52 100644 --- a/src/dark/mech/common/machines/BlockRod.java +++ b/src/dark/mech/common/machines/BlockRod.java @@ -1,5 +1,7 @@ package dark.mech.common.machines; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -87,12 +89,14 @@ public class BlockRod extends BlockFM } @Override + @SideOnly(Side.CLIENT) public boolean renderAsNormalBlock() { return false; } @Override + @SideOnly(Side.CLIENT) public int getRenderType() { return BlockRenderHelper.renderID;