diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 8a4b7a04..b86113e1 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -80,6 +80,8 @@ enderio.itemGasConduit.tooltip.maxExtract=Max Extract: enderio.itemGasConduit.tooltip.maxIo=Max IO: enderio.itemGasConduit.tooltip.detailed.line1=Transfers Mekanism-compatible gases +enderio.itemMEConduit.name=ME Conduit + //Materials enderio.itemMaterial.name=Materials enderio.silicon.name=Silicon diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index d7f0b990..13e677db 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -30,8 +30,7 @@ import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.gui.TooltipAddera; -import crazypants.enderio.machine.AbstractMachineBlock; -import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.IIoConfigurable; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.power.TileCapacitorBank; import crazypants.enderio.power.IInternalPowerReceptor; @@ -88,15 +87,13 @@ public class WailaCompat implements IWailaDataProvider { int x = pos.blockX, y = pos.blockY, z = pos.blockZ; - if(block instanceof AbstractMachineBlock) { - if(te != null && te instanceof AbstractMachineEntity) { - AbstractMachineEntity machine = (AbstractMachineEntity) te; - ForgeDirection side = accessor.getSide(); - IoMode mode = machine.getIoMode(side); - currenttip.add(EnumChatFormatting.YELLOW - + String.format(Lang.localize("gui.machine.side"), EnumChatFormatting.WHITE + Lang.localize("gui.machine.side." + side.name().toLowerCase()))); - currenttip.add(EnumChatFormatting.YELLOW + String.format(Lang.localize("gui.machine.ioMode"), mode.colorLocalisedName())); - } + if(te instanceof IIoConfigurable) { + IIoConfigurable machine = (IIoConfigurable) te; + ForgeDirection side = accessor.getSide(); + IoMode mode = machine.getIoMode(side); + currenttip.add(EnumChatFormatting.YELLOW + + String.format(Lang.localize("gui.machine.side"), EnumChatFormatting.WHITE + Lang.localize("gui.machine.side." + side.name().toLowerCase()))); + currenttip.add(EnumChatFormatting.YELLOW + String.format(Lang.localize("gui.machine.ioMode"), mode.colorLocalisedName())); } if(block instanceof IWailaInfoProvider) { @@ -135,7 +132,6 @@ public class WailaCompat implements IWailaDataProvider { } else { - if(block instanceof IAdvancedTooltipProvider) { TooltipAddera.addInformation((IAdvancedTooltipProvider) block, itemStack, player, currenttip, false); } else if(item instanceof IAdvancedTooltipProvider) { @@ -158,7 +154,7 @@ public class WailaCompat implements IWailaDataProvider { currenttip.add(String.format("%s%s%s / %s%s%s RF", EnumChatFormatting.WHITE, fmt.format(stored), EnumChatFormatting.RESET, EnumChatFormatting.WHITE, fmt.format(max), EnumChatFormatting.RESET)); - } else if(te instanceof IConduitBundle) { + } else if(te instanceof IConduitBundle && itemStack != null && itemStack.getItem() == EnderIO.itemPowerConduit) { NBTTagCompound nbtRoot = accessor.getNBTData(); short nbtVersion = nbtRoot.getShort("nbtVersion"); NBTTagList conduitTags = (NBTTagList) nbtRoot.getTag("conduits");