From a298d8eedb984fed8608b853dd52c6711375a18b Mon Sep 17 00:00:00 2001 From: Calclavia Date: Thu, 30 Jan 2014 20:32:03 +0800 Subject: [PATCH] Fixed #179 - Right clicking engineering table with item --- .../archaic/engineering/BlockEngineeringTable.java | 8 +++++--- .../core/render/RenderItemOverlayTile.java | 11 ++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/resonantinduction/archaic/engineering/BlockEngineeringTable.java b/src/main/java/resonantinduction/archaic/engineering/BlockEngineeringTable.java index 098fcb52..dbf0f9f7 100644 --- a/src/main/java/resonantinduction/archaic/engineering/BlockEngineeringTable.java +++ b/src/main/java/resonantinduction/archaic/engineering/BlockEngineeringTable.java @@ -111,11 +111,11 @@ public class BlockEngineeringTable extends BlockRIRotatable @Override public boolean onMachineActivated(World world, int x, int y, int z, EntityPlayer player, int hitSide, float hitX, float hitY, float hitZ) { - if(player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() instanceof ItemHammer) + if (player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() instanceof ItemHammer) { return false; } - + TileEntity te = world.getBlockTileEntity(x, y, z); if (te instanceof TileEngineeringTable) @@ -163,7 +163,7 @@ public class BlockEngineeringTable extends BlockRIRotatable /** * Take out of engineering table. */ - if (!world.isRemote && player.inventory.getCurrentItem() == null) + if (!world.isRemote) { tile.setPlayerInventory(player.inventory); @@ -188,6 +188,8 @@ public class BlockEngineeringTable extends BlockRIRotatable tile.setPlayerInventory(null); } + + return true; } } diff --git a/src/main/java/resonantinduction/core/render/RenderItemOverlayTile.java b/src/main/java/resonantinduction/core/render/RenderItemOverlayTile.java index 2b0bf890..d7527b2c 100644 --- a/src/main/java/resonantinduction/core/render/RenderItemOverlayTile.java +++ b/src/main/java/resonantinduction/core/render/RenderItemOverlayTile.java @@ -45,14 +45,11 @@ public abstract class RenderItemOverlayTile extends TileEntitySpecialRenderer EntityPlayer player = Minecraft.getMinecraft().thePlayer; boolean isLooking = false; - if (player.isSneaking()) - { - MovingObjectPosition objectPosition = player.rayTrace(8, 1); + MovingObjectPosition objectPosition = player.rayTrace(8, 1); - if (objectPosition != null) - { - isLooking = objectPosition.blockX == tileEntity.xCoord && objectPosition.blockY == tileEntity.yCoord && objectPosition.blockZ == tileEntity.zCoord; - } + if (objectPosition != null) + { + isLooking = objectPosition.blockX == tileEntity.xCoord && objectPosition.blockY == tileEntity.yCoord && objectPosition.blockZ == tileEntity.zCoord; } for (int i = 0; i < (matrixX * matrixZ); i++)