diff --git a/archaic/src/main/java/resonantinduction/archaic/process/BlockCast.java b/archaic/src/main/java/resonantinduction/archaic/process/BlockCast.java index aec1a1b3..46866d82 100644 --- a/archaic/src/main/java/resonantinduction/archaic/process/BlockCast.java +++ b/archaic/src/main/java/resonantinduction/archaic/process/BlockCast.java @@ -17,7 +17,9 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockCast extends BlockTile { - Icon top; + Icon topIcon; + Icon side1Icon; + Icon side2Icon; public BlockCast(int id) { @@ -29,28 +31,24 @@ public class BlockCast extends BlockTile @Override public void registerIcons(IconRegister iconReg) { - this.top = iconReg.registerIcon(Reference.PREFIX + "material_wood_top"); + topIcon = iconReg.registerIcon(Reference.PREFIX + "metalCast_top"); + side1Icon = iconReg.registerIcon(Reference.PREFIX + "metalCast_side_1"); + side2Icon = iconReg.registerIcon(Reference.PREFIX + "metalCast_side_2"); super.registerIcons(iconReg); } - @Override - @SideOnly(Side.CLIENT) - public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int side) - { - return getIcon(side, 0); - } - /** Returns the block texture based on the side being looked at. Args: side */ @Override @SideOnly(Side.CLIENT) public Icon getIcon(int side, int meta) { - if (side == 1) - { - return top; - } + if (side == 0) + return blockIcon; - return blockIcon; + if (side == 1) + return topIcon; + + return side % 2 == 0 ? side1Icon : side2Icon; } @Override @@ -60,7 +58,6 @@ public class BlockCast extends BlockTile if (tile != null) tile.updateEntity(); - } @Override diff --git a/archaic/src/main/java/resonantinduction/archaic/process/RenderCast.java b/archaic/src/main/java/resonantinduction/archaic/process/RenderCast.java index cb81c071..cf8cce0e 100644 --- a/archaic/src/main/java/resonantinduction/archaic/process/RenderCast.java +++ b/archaic/src/main/java/resonantinduction/archaic/process/RenderCast.java @@ -17,7 +17,7 @@ public class RenderCast extends RenderItemOverlayTile if (tileEntity instanceof TileCast) { TileCast tile = (TileCast) tileEntity; - renderItemOnSides(tileEntity, tile.getStackInSlot(0), x, y, z, "Empty"); + renderItemOnSides(tileEntity, tile.getStackInSlot(0), x, y, z, ""); } } } diff --git a/archaic/src/main/java/resonantinduction/archaic/process/RenderMillstone.java b/archaic/src/main/java/resonantinduction/archaic/process/RenderMillstone.java index a2083a6e..3d9bab2d 100644 --- a/archaic/src/main/java/resonantinduction/archaic/process/RenderMillstone.java +++ b/archaic/src/main/java/resonantinduction/archaic/process/RenderMillstone.java @@ -17,7 +17,7 @@ public class RenderMillstone extends RenderItemOverlayTile if (tileEntity instanceof TileMillstone) { TileMillstone tile = (TileMillstone) tileEntity; - renderItemOnSides(tileEntity, tile.getStackInSlot(0), x, y, z, "Empty"); + renderItemOnSides(tileEntity, tile.getStackInSlot(0), x, y, z, ""); } } } diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/metalCast_side_1.png b/src/main/resources/assets/resonantinduction/textures/blocks/metalCast_side_1.png new file mode 100644 index 00000000..214b737b Binary files /dev/null and b/src/main/resources/assets/resonantinduction/textures/blocks/metalCast_side_1.png differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/metalCast_side_2.png b/src/main/resources/assets/resonantinduction/textures/blocks/metalCast_side_2.png new file mode 100644 index 00000000..4d8d7c79 Binary files /dev/null and b/src/main/resources/assets/resonantinduction/textures/blocks/metalCast_side_2.png differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/metalCast_top.png b/src/main/resources/assets/resonantinduction/textures/blocks/metalCast_top.png new file mode 100644 index 00000000..f4b7613c Binary files /dev/null and b/src/main/resources/assets/resonantinduction/textures/blocks/metalCast_top.png differ