Fix dense ME conduit texture and some ITool bugs

This commit is contained in:
tterrag1098 committed 2014-11-23 03:04:29 -05:00
1 parent 84be1e559a
commit 47f78f891a
5 files changed
+9 -5

No files matched your search

@@ -797,6 +797,10 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade
}
IConduitBundle bundle = (IConduitBundle) te;
List<RaytraceResult> hits = new ArrayList<RaytraceResult>();
if (player == null) {
player = EnderIO.proxy.getClientPlayer();
}
if(ConduitUtil.isSolidFacadeRendered(bundle, player)) {
setBlockBounds(0, 0, 0, 1, 1, 1);
@@ -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) {
@@ -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() {
@@ -100,7 +100,7 @@ public class ItemYetaWrench extends Item implements ITool, IResourceTooltipProvi
@Override
public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) {
return true;
return false;
}
@@ -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) {