From ad38b6f52b095581f8d1d89b131dd88e50e68d2a Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Sat, 18 Jan 2014 15:31:00 -0500 Subject: [PATCH] Minor fix --- common/mekanism/common/block/BlockBasic.java | 23 +++----------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/common/mekanism/common/block/BlockBasic.java b/common/mekanism/common/block/BlockBasic.java index cfc2da54f..348a666d5 100644 --- a/common/mekanism/common/block/BlockBasic.java +++ b/common/mekanism/common/block/BlockBasic.java @@ -128,6 +128,7 @@ public class BlockBasic extends Block icons[13][0] = register.registerIcon("mekanism:TinBlock"); icons[14][0] = register.registerIcon("mekanism:SalinationController"); icons[14][1] = register.registerIcon("mekanism:SalinationControllerOn"); + icons[14][2] = register.registerIcon("mekanism:SalinationBlock"); icons[15][0] = register.registerIcon("mekanism:SalinationValve"); glassRenderer.registerIcons(register); @@ -175,7 +176,7 @@ public class BlockBasic extends Block return tileEntity.structured ? icons[14][1] : icons[14][0]; } else { - return icons[12][0]; + return icons[14][2]; } } else { @@ -221,7 +222,7 @@ public class BlockBasic extends Block return icons[14][0]; } else { - return icons[12][0]; + return icons[14][2]; } } } @@ -430,24 +431,6 @@ public class BlockBasic extends Block } } } - else if(blockID == Mekanism.basicBlock2ID) - { - if(world.isRemote) - { - return true; - } - - if(metadata == 0) - { - TileEntitySalinationTank tank = (TileEntitySalinationTank)world.getBlockTileEntity(x, y, z); - - if(!entityplayer.isSneaking()) - { - entityplayer.openGui(Mekanism.instance, 33, world, x, y, z); - return true; - } - } - } return false; }