diff --git a/src/main/java/tconstruct/blocks/BlockLandmine.java b/src/main/java/tconstruct/blocks/BlockLandmine.java index 96039c4f..e7d1f8c7 100644 --- a/src/main/java/tconstruct/blocks/BlockLandmine.java +++ b/src/main/java/tconstruct/blocks/BlockLandmine.java @@ -42,6 +42,8 @@ import tconstruct.blocks.logic.TileEntityLandmine; import tconstruct.client.block.RenderLandmine; import tconstruct.common.TProxyCommon; import tconstruct.util.landmine.Helper; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * @@ -87,6 +89,7 @@ public class BlockLandmine extends BlockContainer } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { TileEntityLandmine te = (TileEntityLandmine) par1IBlockAccess.getTileEntity(par2, par3, par4); diff --git a/src/main/java/tconstruct/blocks/CraftingSlab.java b/src/main/java/tconstruct/blocks/CraftingSlab.java index d0291a57..fd1b8f56 100644 --- a/src/main/java/tconstruct/blocks/CraftingSlab.java +++ b/src/main/java/tconstruct/blocks/CraftingSlab.java @@ -25,6 +25,8 @@ import tconstruct.common.TProxyCommon; import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import tconstruct.util.config.PHConstruct; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class CraftingSlab extends InventorySlab { @@ -48,6 +50,7 @@ public class CraftingSlab extends InventorySlab } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) { return icons[(meta % 8) * 3 + getTextureIndex(side)]; diff --git a/src/main/java/tconstruct/blocks/CraftingStationBlock.java b/src/main/java/tconstruct/blocks/CraftingStationBlock.java index 3b4147fc..9fe5d4b4 100644 --- a/src/main/java/tconstruct/blocks/CraftingStationBlock.java +++ b/src/main/java/tconstruct/blocks/CraftingStationBlock.java @@ -18,6 +18,8 @@ import tconstruct.blocks.logic.CraftingStationLogic; import tconstruct.client.block.TableRender; import tconstruct.common.TProxyCommon; import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class CraftingStationBlock extends InventoryBlock { @@ -41,6 +43,7 @@ public class CraftingStationBlock extends InventoryBlock } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) { return icons[getTextureIndex(side)]; diff --git a/src/main/java/tconstruct/blocks/DryingRack.java b/src/main/java/tconstruct/blocks/DryingRack.java index ac5e56e3..a774b6c5 100644 --- a/src/main/java/tconstruct/blocks/DryingRack.java +++ b/src/main/java/tconstruct/blocks/DryingRack.java @@ -20,6 +20,8 @@ import tconstruct.blocks.logic.DryingRackLogic; import tconstruct.client.block.DryingRackRender; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class DryingRack extends InventoryBlock { @@ -225,6 +227,7 @@ public class DryingRack extends InventoryBlock } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) { return Blocks.planks.getIcon(side, 0); diff --git a/src/main/java/tconstruct/blocks/EquipBlock.java b/src/main/java/tconstruct/blocks/EquipBlock.java index 412e2007..cb565975 100644 --- a/src/main/java/tconstruct/blocks/EquipBlock.java +++ b/src/main/java/tconstruct/blocks/EquipBlock.java @@ -43,6 +43,7 @@ public class EquipBlock extends InventoryBlock } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) { return Blocks.iron_block.getIcon(side, meta); diff --git a/src/main/java/tconstruct/blocks/FurnaceSlab.java b/src/main/java/tconstruct/blocks/FurnaceSlab.java index 8c39a7e7..d3f079a1 100644 --- a/src/main/java/tconstruct/blocks/FurnaceSlab.java +++ b/src/main/java/tconstruct/blocks/FurnaceSlab.java @@ -14,6 +14,8 @@ import tconstruct.TConstruct; import tconstruct.blocks.logic.FurnaceLogic; import tconstruct.common.TProxyCommon; import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class FurnaceSlab extends InventorySlab { @@ -57,12 +59,14 @@ public class FurnaceSlab extends InventorySlab } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) { return icons[(meta % 8) * 3 + getTextureIndex(side)]; } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (IBlockAccess world, int x, int y, int z, int side) { TileEntity logic = world.getTileEntity(x, y, z); diff --git a/src/main/java/tconstruct/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/blocks/GlassBlockConnected.java index 10e548d6..52b33301 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockConnected.java +++ b/src/main/java/tconstruct/blocks/GlassBlockConnected.java @@ -10,6 +10,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import tconstruct.library.TConstructRegistry; import tconstruct.util.config.PHConstruct; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * @author fuj1n @@ -79,6 +81,7 @@ public class GlassBlockConnected extends MantleBlock } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { return par1IBlockAccess.getBlockMetadata(par2, par3, par4) == 15 ? icons[0] : getConnectedBlockTexture(par1IBlockAccess, par2, par3, par4, par5, icons); @@ -600,6 +603,7 @@ public class GlassBlockConnected extends MantleBlock } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (int par1, int par2) { return icons[0]; diff --git a/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java b/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java index e0526b1a..692a5933 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java +++ b/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java @@ -11,6 +11,8 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import tconstruct.util.config.PHConstruct; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * @author fuj1n @@ -31,6 +33,7 @@ public class GlassBlockConnectedMeta extends GlassBlockConnected } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { int meta = par1IBlockAccess.getBlockMetadata(par2, par3, par4); @@ -51,6 +54,7 @@ public class GlassBlockConnectedMeta extends GlassBlockConnected } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (int par1, int par2) { return icons[par2][0]; diff --git a/src/main/java/tconstruct/blocks/GlassPaneConnected.java b/src/main/java/tconstruct/blocks/GlassPaneConnected.java index 1ac6caf8..895f4441 100644 --- a/src/main/java/tconstruct/blocks/GlassPaneConnected.java +++ b/src/main/java/tconstruct/blocks/GlassPaneConnected.java @@ -13,6 +13,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import tconstruct.client.block.PaneConnectedRender; import tconstruct.util.config.PHConstruct; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class GlassPaneConnected extends GlassBlockConnected { @@ -32,6 +34,7 @@ public class GlassPaneConnected extends GlassBlockConnected } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { if (par5 == 0 || par5 == 1) diff --git a/src/main/java/tconstruct/blocks/GravelOre.java b/src/main/java/tconstruct/blocks/GravelOre.java index 57bbd3b3..a96587d4 100644 --- a/src/main/java/tconstruct/blocks/GravelOre.java +++ b/src/main/java/tconstruct/blocks/GravelOre.java @@ -13,6 +13,8 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class GravelOre extends BlockSand { @@ -39,6 +41,7 @@ public class GravelOre extends BlockSand } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) { return icons[meta]; diff --git a/src/main/java/tconstruct/blocks/LavaTankBlock.java b/src/main/java/tconstruct/blocks/LavaTankBlock.java index 5a227fe5..d0d552f7 100644 --- a/src/main/java/tconstruct/blocks/LavaTankBlock.java +++ b/src/main/java/tconstruct/blocks/LavaTankBlock.java @@ -25,6 +25,8 @@ import net.minecraftforge.fluids.FluidTankInfo; import tconstruct.blocks.logic.LavaTankLogic; import tconstruct.client.block.TankRender; import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class LavaTankBlock extends BlockContainer { @@ -118,6 +120,7 @@ public class LavaTankBlock extends BlockContainer } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) { if (meta >= 3) diff --git a/src/main/java/tconstruct/blocks/LiquidMetalFinite.java b/src/main/java/tconstruct/blocks/LiquidMetalFinite.java index ab1bc4cb..9199df35 100644 --- a/src/main/java/tconstruct/blocks/LiquidMetalFinite.java +++ b/src/main/java/tconstruct/blocks/LiquidMetalFinite.java @@ -9,9 +9,10 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidFinite; import net.minecraftforge.fluids.Fluid; -import tconstruct.common.TContent; import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class LiquidMetalFinite extends BlockFluidFinite { @@ -40,6 +41,7 @@ public class LiquidMetalFinite extends BlockFluidFinite } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) { if (side == 0 || side == 1) diff --git a/src/main/java/tconstruct/blocks/SmelteryBlock.java b/src/main/java/tconstruct/blocks/SmelteryBlock.java index 3726f864..7e544de7 100644 --- a/src/main/java/tconstruct/blocks/SmelteryBlock.java +++ b/src/main/java/tconstruct/blocks/SmelteryBlock.java @@ -27,6 +27,8 @@ import tconstruct.blocks.logic.SmelteryLogic; import tconstruct.client.block.SmelteryRender; import tconstruct.library.TConstructRegistry; import tconstruct.util.config.PHConstruct; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class SmelteryBlock extends InventoryBlock { @@ -72,6 +74,7 @@ public class SmelteryBlock extends InventoryBlock } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) { if (meta < 2) @@ -93,6 +96,7 @@ public class SmelteryBlock extends InventoryBlock } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (IBlockAccess world, int x, int y, int z, int side) { TileEntity logic = world.getTileEntity(x, y, z); diff --git a/src/main/java/tconstruct/blocks/TConstructFluid.java b/src/main/java/tconstruct/blocks/TConstructFluid.java index fb5ffa07..67650fc3 100644 --- a/src/main/java/tconstruct/blocks/TConstructFluid.java +++ b/src/main/java/tconstruct/blocks/TConstructFluid.java @@ -6,6 +6,8 @@ import net.minecraft.util.IIcon; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TConstructFluid extends BlockFluidClassic { @@ -44,6 +46,7 @@ public class TConstructFluid extends BlockFluidClassic // TODO getIcon() @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) { if (side == 0 || side == 1) diff --git a/src/main/java/tconstruct/blocks/ToolForgeBlock.java b/src/main/java/tconstruct/blocks/ToolForgeBlock.java index 0d7ee1e2..172d7709 100644 --- a/src/main/java/tconstruct/blocks/ToolForgeBlock.java +++ b/src/main/java/tconstruct/blocks/ToolForgeBlock.java @@ -22,6 +22,8 @@ import tconstruct.client.block.TableForgeRender; import tconstruct.common.TProxyCommon; import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ToolForgeBlock extends InventoryBlock { @@ -54,6 +56,7 @@ public class ToolForgeBlock extends InventoryBlock } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) { if (side == 1) diff --git a/src/main/java/tconstruct/blocks/ToolStationBlock.java b/src/main/java/tconstruct/blocks/ToolStationBlock.java index e20cd1a3..1b2d280a 100644 --- a/src/main/java/tconstruct/blocks/ToolStationBlock.java +++ b/src/main/java/tconstruct/blocks/ToolStationBlock.java @@ -25,6 +25,8 @@ import tconstruct.client.block.TableRender; import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import tconstruct.util.config.PHConstruct; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ToolStationBlock extends InventoryBlock { @@ -52,6 +54,7 @@ public class ToolStationBlock extends InventoryBlock } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) { if (meta <= 4) diff --git a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java index 3ffabeb9..1cf1efbe 100644 --- a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java +++ b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java @@ -33,6 +33,7 @@ public class BarricadeBlock extends MantleBlock } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) { return modelBlock.getIcon(2, modelMeta); diff --git a/src/main/java/tconstruct/blocks/traps/Landmine.java b/src/main/java/tconstruct/blocks/traps/Landmine.java index 6e7908c6..5de60f48 100644 --- a/src/main/java/tconstruct/blocks/traps/Landmine.java +++ b/src/main/java/tconstruct/blocks/traps/Landmine.java @@ -19,6 +19,8 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class Landmine extends MantleBlock { @@ -36,6 +38,7 @@ public class Landmine extends MantleBlock } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (IBlockAccess world, int x, int y, int z, int side) { Block block = world.getBlock(x, y - 1, z); @@ -47,6 +50,7 @@ public class Landmine extends MantleBlock } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) { return Blocks.sponge.getIcon(1, meta); diff --git a/src/main/java/tconstruct/library/component/TankLayerScan.java b/src/main/java/tconstruct/library/component/TankLayerScan.java index 65c5f7d7..8fbea5a8 100644 --- a/src/main/java/tconstruct/library/component/TankLayerScan.java +++ b/src/main/java/tconstruct/library/component/TankLayerScan.java @@ -1,14 +1,21 @@ package tconstruct.library.component; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; -import mantle.blocks.iface.*; -import mantle.world.*; +import mantle.blocks.iface.IFacingLogic; +import mantle.blocks.iface.IMasterLogic; +import mantle.blocks.iface.IServantLogic; +import mantle.world.CoordTuple; +import mantle.world.CoordTupleSort; import net.minecraft.block.Block; -import net.minecraft.nbt.*; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagIntArray; +import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import tconstruct.TConstruct; -import tconstruct.library.util.*; public class TankLayerScan extends LogicComponent { @@ -531,6 +538,7 @@ public class TankLayerScan extends LogicComponent structureTop = tags.getInteger("structureTop"); } + @Override public void readNetworkNBT (NBTTagCompound tags) { completeStructure = tags.getBoolean("Complete"); @@ -563,6 +571,7 @@ public class TankLayerScan extends LogicComponent tags.setInteger("structureTop", structureTop); } + @Override public void writeNetworkNBT (NBTTagCompound tags) { tags.setBoolean("Complete", completeStructure);