From 12cfe38a50179e9f9e30e13a215253e548f5fb1e Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 1 Nov 2015 16:10:36 +0000 Subject: [PATCH] Fixes #212 now you need to hold shift to see our info --- .../techreborn/client/StackToolTipEvent.java | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/src/main/java/techreborn/client/StackToolTipEvent.java b/src/main/java/techreborn/client/StackToolTipEvent.java index d7a047d6f..ca58049e7 100644 --- a/src/main/java/techreborn/client/StackToolTipEvent.java +++ b/src/main/java/techreborn/client/StackToolTipEvent.java @@ -16,35 +16,36 @@ public class StackToolTipEvent { @SubscribeEvent public void handleItemTooltipEvent(ItemTooltipEvent event) { - if(event.itemStack.getItem() instanceof IListInfoProvider){ + if (event.itemStack.getItem() instanceof IListInfoProvider) { ((IListInfoProvider) event.itemStack.getItem()).addInfo(event.toolTip, false); - } else if (event.itemStack.getItem() instanceof IEnergyInterfaceItem){ - int percentage = percentage((int)((IEnergyInterfaceItem) event.itemStack.getItem()).getMaxPower(event.itemStack), (int)((IEnergyInterfaceItem) event.itemStack.getItem()).getEnergy(event.itemStack)); - ChatFormatting color; - if(percentage<= 10){ - color = ChatFormatting.RED; - } else if(percentage >= 75){ - color = ChatFormatting.GREEN; - } else { - color = ChatFormatting.YELLOW; - } - event.toolTip.add(color + "" + (int)((IEnergyInterfaceItem) event.itemStack.getItem()).getEnergy(event.itemStack) + ChatFormatting.LIGHT_PURPLE + " stored eu"); - event.toolTip.add(Color.GREEN + "" + (int)((IEnergyInterfaceItem) event.itemStack.getItem()).getMaxPower(event.itemStack) + ChatFormatting.LIGHT_PURPLE + " max eu"); - if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)){ - event.toolTip.add(ChatFormatting.GREEN +"" + percentage + "%" + ChatFormatting.LIGHT_PURPLE +" charged"); - event.toolTip.add(Color.GREEN + "" + (int)((IEnergyInterfaceItem) event.itemStack.getItem()).getMaxTransfer(event.itemStack) + ChatFormatting.LIGHT_PURPLE + " eu/tick in/out"); + } else if (event.itemStack.getItem() instanceof IEnergyInterfaceItem) { + if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { + int percentage = percentage((int) ((IEnergyInterfaceItem) event.itemStack.getItem()).getMaxPower(event.itemStack), (int) ((IEnergyInterfaceItem) event.itemStack.getItem()).getEnergy(event.itemStack)); + ChatFormatting color; + if (percentage <= 10) { + color = ChatFormatting.RED; + } else if (percentage >= 75) { + color = ChatFormatting.GREEN; + } else { + color = ChatFormatting.YELLOW; + } + event.toolTip.add(color + "" + (int) ((IEnergyInterfaceItem) event.itemStack.getItem()).getEnergy(event.itemStack) + ChatFormatting.LIGHT_PURPLE + " stored eu"); + event.toolTip.add(Color.GREEN + "" + (int) ((IEnergyInterfaceItem) event.itemStack.getItem()).getMaxPower(event.itemStack) + ChatFormatting.LIGHT_PURPLE + " max eu"); + event.toolTip.add(ChatFormatting.GREEN + "" + percentage + "%" + ChatFormatting.LIGHT_PURPLE + " charged"); + event.toolTip.add(Color.GREEN + "" + (int) ((IEnergyInterfaceItem) event.itemStack.getItem()).getMaxTransfer(event.itemStack) + ChatFormatting.LIGHT_PURPLE + " eu/tick in/out"); } } else { Block block = Block.getBlockFromItem(event.itemStack.getItem()); - if(block != null && block instanceof BlockContainer && block.getClass().getCanonicalName().startsWith("techreborn.")){ + if (block != null && block instanceof BlockContainer && block.getClass().getCanonicalName().startsWith("techreborn.")) { TileEntity tile = block.createTileEntity(Minecraft.getMinecraft().theWorld, event.itemStack.getItemDamage()); - if(tile instanceof IListInfoProvider){ + if (tile instanceof IListInfoProvider) { ((IListInfoProvider) tile).addInfo(event.toolTip, false); } } } } + public int percentage(int MaxValue, int CurrentValue) { if (CurrentValue == 0) return 0;