diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java index 56fd2155..220764cc 100644 --- a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java @@ -797,6 +797,10 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade } IConduitBundle bundle = (IConduitBundle) te; List hits = new ArrayList(); + + if (player == null) { + player = EnderIO.proxy.getClientPlayer(); + } if(ConduitUtil.isSolidFacadeRendered(bundle, player)) { setBlockBounds(0, 0, 0, 1, 1, 1); diff --git a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java index 18f1bee4..ad439843 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java @@ -24,6 +24,7 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.Log; +import crazypants.enderio.api.tool.ITool; import crazypants.enderio.conduit.IConduitBundle.FacadeRenderState; import crazypants.enderio.conduit.gas.GasConduitNetwork; import crazypants.enderio.conduit.gas.IGasConduit; @@ -177,7 +178,7 @@ public class ConduitUtil { } public static boolean isFacadeHidden(IConduitBundle bundle, EntityPlayer player) { - return bundle.getFacadeId() != null && (ToolUtil.isToolEquipped(player) || isConduitEquipped(player) || isProbeEquipped(player)); + return bundle.getFacadeId() != null && ((ToolUtil.isToolEquipped(player) && (player == null || ToolUtil.getEquippedTool(player).shouldHideFacades(player.getCurrentEquippedItem(), player))) || isConduitEquipped(player) || isProbeEquipped(player)); } public static ConduitDisplayMode getDisplayMode(EntityPlayer player) { diff --git a/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java b/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java index ec9c740c..7f138de4 100644 --- a/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java +++ b/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java @@ -10,7 +10,7 @@ public class ItemMEConduit extends AbstractItemConduit { private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { new ItemConduitSubtype(ModObject.itemMEConduit.name(), "enderio:itemMeConduit"), - new ItemConduitSubtype(ModObject.itemMEConduit.name() + "Dense", "enderio:itemMEConduitDense") + new ItemConduitSubtype(ModObject.itemMEConduit.name() + "Dense", "enderio:itemMeConduitDense") }; public static ItemMEConduit create() { diff --git a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java index 2b32c392..8ccce16e 100644 --- a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java +++ b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java @@ -100,7 +100,7 @@ public class ItemYetaWrench extends Item implements ITool, IResourceTooltipProvi @Override public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { - return true; + return false; } diff --git a/src/main/java/crazypants/enderio/tool/ToolUtil.java b/src/main/java/crazypants/enderio/tool/ToolUtil.java index 48eedb58..fca4871d 100644 --- a/src/main/java/crazypants/enderio/tool/ToolUtil.java +++ b/src/main/java/crazypants/enderio/tool/ToolUtil.java @@ -81,8 +81,7 @@ public class ToolUtil { } private boolean isToolEquippedImpl(EntityPlayer player) { - ITool tool = getEquippedToolImpl(player); - return tool != null && player != null && tool.shouldHideFacades(player.getCurrentEquippedItem(), player); + return getEquippedToolImpl(player) != null; } private ITool getEquippedToolImpl(EntityPlayer player) {