tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor fix

Browse source
This commit is contained in:
Aidan C. Brady 2014-01-18 15:31:00 -05:00
parent 93b7321dea
commit ad38b6f52b
1 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
common/mekanism/common/block/BlockBasic.java
View file

@ -128,6 +128,7 @@ public class BlockBasic extends Block
icons[13][0] = register.registerIcon("mekanism:TinBlock"); icons[13][0] = register.registerIcon("mekanism:TinBlock");
icons[14][0] = register.registerIcon("mekanism:SalinationController"); icons[14][0] = register.registerIcon("mekanism:SalinationController");
icons[14][1] = register.registerIcon("mekanism:SalinationControllerOn"); icons[14][1] = register.registerIcon("mekanism:SalinationControllerOn");
icons[14][2] = register.registerIcon("mekanism:SalinationBlock");
icons[15][0] = register.registerIcon("mekanism:SalinationValve"); icons[15][0] = register.registerIcon("mekanism:SalinationValve");
glassRenderer.registerIcons(register); glassRenderer.registerIcons(register);
@ -175,7 +176,7 @@ public class BlockBasic extends Block
return tileEntity.structured ? icons[14][1] : icons[14][0]; return tileEntity.structured ? icons[14][1] : icons[14][0];
} }
else { else {
return icons[12][0]; return icons[14][2];
} }
} }
else { else {
@ -221,7 +222,7 @@ public class BlockBasic extends Block
return icons[14][0]; return icons[14][0];
} }
else { 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; return false;
} }