From e597cf441ffd7974afc35ee5471b929a7acc5582 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 11 Oct 2014 13:14:44 -0400 Subject: [PATCH] Add WAILA support to capacitor bank, transceiver, and tank. @ProfMobius You can remove your plugin now :D --- gradle.properties | 2 +- resources/assets/enderio/lang/en_US.lang | 15 ++++++++ .../enderio/machine/AbstractMachineBlock.java | 2 +- .../zombie/BlockZombieGenerator.java | 2 +- .../machine/power/BlockCapacitorBank.java | 18 +++++++-- .../machine/spawner/BlockPoweredSpawner.java | 2 +- .../enderio/machine/tank/BlockTank.java | 12 ++++++ .../machine/transceiver/BlockTransceiver.java | 37 +++++++++++++++++++ .../machine/transceiver/ChannelType.java | 5 ++- .../enderio/waila/IWailaInfoProvider.java | 3 +- .../crazypants/enderio/waila/WailaCompat.java | 4 +- src/main/java/crazypants/util/Util.java | 10 +++++ 12 files changed, 98 insertions(+), 14 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2c3c98ce..6b7a6811 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,4 +7,4 @@ mod_version=2.1.0 #mod_appendix=beta buildcraft_version=6.0.18 -waila_version=1.5.3_1.7.10 \ No newline at end of file +waila_version=1.5.5_1.7.10 \ No newline at end of file diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 44f270bc..bcc3fea3 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -237,6 +237,10 @@ tile.blockCapacitorBank.tooltip.detailed.line1=Multi-block energy storage. tile.blockCapacitorBank.tooltip.detailed.line2=Can charge RF powered items. tile.blockCapacitorBank.tooltipPrefix=Contains +enderio.capbank.maxIO=Max I/O +enderio.capbank.maxIn=Max Input +enderio.capbank.maxOut=Max Output + tile.blockWirelessCharger.name=Wireless Charger tile.blockWirelessCharger.tooltip.detailed.line1=Charges items in nearby tile.blockWirelessCharger.tooltip.detailed.line2=players inventories @@ -258,6 +262,15 @@ tile.blockTransceiver.tooltip.detailed.line1=Transports items, fluids and power tile.blockTransceiver.tooltip.detailed.line2=wirelessly across any distance and tile.blockTransceiver.tooltip.detailed.line3=between dimensions +enderio.trans.showChannels= + +enderio.trans.power=Power +enderio.trans.item=Item +enderio.trans.fluid=Fluid + +enderio.trans.recieving=Recieving +enderio.trans.sending=Sending + tile.blockPowerMonitor.name=Power Monitor tile.blockPowerMonitor.tooltip.detailed.line1=Displays details of power use and tile.blockPowerMonitor.tooltip.detailed.line2=storage @@ -320,6 +333,8 @@ tile.blockTank.tooltip.detailed.line1=Portable fluid tank tile.blockTank.tooltip.detailed.line2=Can be used to empty and tile.blockTank.tooltip.detailed.line3=fill fluid containers enderio.tank.tank=Tank +enderio.tooltip.none=None +enderio.tooltip.fluidStored=Fluid Stored tile.blockCrafter.name=Crafter tile.blockCrafter.tooltip.detailed.line1=A powered auto-crafter diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index 7fbaea9b..17ce30ae 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -349,7 +349,7 @@ public abstract class AbstractMachineBlock exte } @Override - public void getWailaInfo(List tooltip, World world, int x, int y, int z) {} + public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) {} @Override public int getDefaultDisplayMask(World world, int x, int y, int z) { diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java index 0da05c24..59a6ffe7 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java @@ -147,7 +147,7 @@ public class BlockZombieGenerator extends AbstractMachineBlock tooltip, World world, int x, int y, int z) { + public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { TileEntity te = world.getTileEntity(x, y, z); if (te != null && te instanceof TileZombieGenerator) { tooltip.add(((TileZombieGenerator)te).getFluidStored(ForgeDirection.UNKNOWN) + " mB"); diff --git a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java index 1e7bbd06..dd16f465 100644 --- a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java @@ -9,13 +9,13 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.item.EntityPainting; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -30,7 +30,6 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.ConduitUtil; -import crazypants.enderio.config.Config; import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.IoMode; @@ -38,6 +37,7 @@ import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.enderio.waila.IWailaInfoProvider; import crazypants.util.BlockCoord; +import crazypants.util.Lang; import crazypants.util.Util; import crazypants.vecmath.Vector3d; @@ -385,12 +385,22 @@ public class BlockCapacitorBank extends BlockEio implements IGuiHandler, IAdvanc } @Override - public void getWailaInfo(List tooltip, World world, int x, int y, int z) { + public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileCapacitorBank) { + TileCapacitorBank cap = (TileCapacitorBank) te; + String format = Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE; + + tooltip.add(String.format("%s%d%s / %s%d%s RF", EnumChatFormatting.WHITE, cap.getEnergyStored() * 10, EnumChatFormatting.RESET, EnumChatFormatting.WHITE, cap.getMaxEnergyStored() * 10, EnumChatFormatting.RESET)); + + tooltip.add(String.format("%s : %s%d%sRF/t ", Lang.localize("capbank.maxIO"), format, cap.getMaxIO() * 10, Util.TAB + Util.ALIGNRIGHT)); + tooltip.add(String.format("%s : %s%d%sRF/t ", Lang.localize("capbank.maxIn"), format, cap.getMaxInput() * 10, Util.TAB + Util.ALIGNRIGHT)); + tooltip.add(String.format("%s : %s%d%sRF/t ", Lang.localize("capbank.maxOut"), format, cap.getMaxOutput() * 10, Util.TAB + Util.ALIGNRIGHT)); + } } @Override public int getDefaultDisplayMask(World world, int x, int y, int z) { return IWailaInfoProvider.BIT_DETAILED; } - } diff --git a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java index 138df928..e1272a25 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java @@ -186,7 +186,7 @@ public class BlockPoweredSpawner extends AbstractMachineBlock tooltip, World world, int x, int y, int z) { + public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { TilePoweredSpawner te = (TilePoweredSpawner) world.getTileEntity(x, y, z); tooltip.add(te.getEntityName()); } diff --git a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java index 2d1ba776..bed4baed 100644 --- a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java @@ -259,4 +259,16 @@ public class BlockTank extends AbstractMachineBlock implements IAdvanc return stack.getUnlocalizedName(); } + @Override + public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileTank) { + TileTank tank = (TileTank) te; + FluidStack stored = tank.tank.getFluid(); + String fluid = stored == null ? Lang.localize("tooltip.none") : stored.getFluid().getLocalizedName(stored); + int amount = stored == null ? 0 : stored.amount; + + tooltip.add(String.format("%s%s : %s (%d %s)", EnumChatFormatting.WHITE, Lang.localize("tooltip.fluidStored"), fluid, amount, Lang.localize("fluid.millibucket.abr"))); + } + } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java index 1b018012..3cbe04ca 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java @@ -1,10 +1,12 @@ package crazypants.enderio.machine.transceiver; +import java.util.List; import java.util.Random; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.FMLCommonHandler; @@ -16,6 +18,8 @@ import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.transceiver.gui.ContainerTransceiver; import crazypants.enderio.machine.transceiver.gui.GuiTransceiver; import crazypants.enderio.network.PacketHandler; +import crazypants.util.Lang; +import crazypants.util.Util; public class BlockTransceiver extends AbstractMachineBlock { @@ -98,5 +102,38 @@ public class BlockTransceiver extends AbstractMachineBlock { public void randomDisplayTick(World world, int x, int y, int z, Random rand) { } + @Override + public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileTransceiver && player.isSneaking()) { + TileTransceiver trans = (TileTransceiver) te; + for (ChannelType type : ChannelType.VALUES) { + tooltip.add(EnumChatFormatting.WHITE + Lang.localize("trans." + type.name().toLowerCase())); + + List recieving = trans.getRecieveChannels(type); + List sending = trans.getSendChannels(type); + String recieve = "[" + buildString(recieving) + "]"; + String send = "[" + buildString(sending) + "]"; + + if(!"[]".equals(recieve)) { + tooltip.add(String.format("%s%s " + Util.TAB + ": %s%s", Util.TAB, Lang.localize("trans.recieving"), Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE, recieve)); + } + if(!"[]".equals(send)) { + tooltip.add(String.format("%s%s " + Util.TAB + ": %s%s", Util.TAB, Lang.localize("trans.sending"), Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE, send)); + } + } + } + } + + private String buildString(List channels) { + StringBuilder sb = new StringBuilder(); + for (Channel c : channels) { + sb.append(c.getName()); + if (channels.indexOf(c) != channels.size() - 1) { + sb.append(", "); + } + } + return sb.toString(); + } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/ChannelType.java b/src/main/java/crazypants/enderio/machine/transceiver/ChannelType.java index 012a937e..c7e8aa67 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/ChannelType.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/ChannelType.java @@ -4,6 +4,7 @@ public enum ChannelType { POWER, ITEM, - FLUID - + FLUID; + + public static final ChannelType[] VALUES = values(); } diff --git a/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java b/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java index d77cf3b0..449cd2dd 100644 --- a/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java +++ b/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java @@ -3,6 +3,7 @@ package crazypants.enderio.waila; import java.util.List; import crazypants.enderio.gui.IAdvancedTooltipProvider; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; public interface IWailaInfoProvider { @@ -20,7 +21,7 @@ public interface IWailaInfoProvider { * @param y * @param z */ - public void getWailaInfo(List tooltip, World world, int x, int y, int z); + public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z); /** * A bitmask for the default tooltips to show, use static ints in {@link IWailaInfoProvider} diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index 0549bca2..b7c556c3 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -4,8 +4,6 @@ import static crazypants.enderio.waila.IWailaInfoProvider.*; import java.util.List; -import org.apache.commons.lang3.StringUtils; - import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; @@ -96,7 +94,7 @@ public class WailaCompat implements IWailaDataProvider { TooltipAddera.addInformation((IResourceTooltipProvider) block, itemStack, player, currenttip); } - info.getWailaInfo(currenttip, world, pos.blockX, pos.blockY, pos.blockZ); + info.getWailaInfo(currenttip, player, world, pos.blockX, pos.blockY, pos.blockZ); } else { diff --git a/src/main/java/crazypants/util/Util.java b/src/main/java/crazypants/util/Util.java index 77531ff9..9180165d 100644 --- a/src/main/java/crazypants/util/Util.java +++ b/src/main/java/crazypants/util/Util.java @@ -480,5 +480,15 @@ public class Util { } return result; } + + // copied from WAILA source to avoid API dependency + public static String WailaStyle = "\u00A4"; + public static String WailaIcon = "\u00A5"; + public static String TAB = WailaStyle + WailaStyle +"a"; + public static String ALIGNRIGHT = WailaStyle + WailaStyle +"b"; + public static String ALIGNCENTER = WailaStyle + WailaStyle +"c"; + public static String HEART = WailaStyle + WailaIcon +"a"; + public static String HHEART = WailaStyle + WailaIcon +"b"; + public static String EHEART = WailaStyle + WailaIcon +"c"; }