From cd7d965000b26a45552e7ce2193dbd3fdbf7348c Mon Sep 17 00:00:00 2001 From: Pahimar Date: Wed, 25 May 2016 13:30:17 -0400 Subject: [PATCH] Change the tooltip to show No Exchange Energy in the event an item is blacklisted from being learned and from being exchanged (effectively no value) --- .../handler/ItemTooltipEventHandler.java | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java b/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java index 60308a6b..4d0d6daa 100644 --- a/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java +++ b/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java @@ -1,5 +1,6 @@ package com.pahimar.ee3.client.handler; +import com.pahimar.ee3.api.blacklist.BlacklistRegistryProxy; import com.pahimar.ee3.api.exchange.EnergyValue; import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy; import com.pahimar.ee3.api.knowledge.PlayerKnowledgeRegistryProxy; @@ -36,31 +37,29 @@ public class ItemTooltipEventHandler private static DecimalFormat energyValueDecimalFormat = new DecimalFormat("###,###,###,###,###.###"); @SubscribeEvent - public void handleItemTooltipEvent(ItemTooltipEvent event) - { - if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT) || (event.entityPlayer != null && (event.entityPlayer.openContainer instanceof ContainerAlchenomicon || event.entityPlayer.openContainer instanceof ContainerTransmutationTablet))) - { + public void handleItemTooltipEvent(ItemTooltipEvent event) { + + if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT) || (event.entityPlayer != null && (event.entityPlayer.openContainer instanceof ContainerAlchenomicon || event.entityPlayer.openContainer instanceof ContainerTransmutationTablet))) { + WrappedStack wrappedItemStack = WrappedStack.wrap(event.itemStack); EnergyValue energyValue = EnergyValueRegistryProxy.getEnergyValue(wrappedItemStack); - EnergyValue energyValue2 = EnergyValueRegistryProxy.getEnergyValueForStack(wrappedItemStack); - if (energyValue != null) - { - if (wrappedItemStack.getStackSize() > 1) - { + if (energyValue != null && (BlacklistRegistryProxy.isExchangeable(wrappedItemStack) || BlacklistRegistryProxy.isLearnable(wrappedItemStack))) { + + if (wrappedItemStack.getStackSize() > 1) { event.toolTip.add(String.format("Exchange Energy (Item): %s", energyValueDecimalFormat.format(energyValue.getValue()))); // TODO Localize event.toolTip.add(String.format("Exchange Energy (Stack of %s): %s", event.itemStack.stackSize, energyValueDecimalFormat.format(wrappedItemStack.getStackSize() * energyValue.getValue()))); // TODO Localize - event.toolTip.add(String.format("Exchange Energy 2 (Stack of %s): %s", event.itemStack.stackSize, energyValueDecimalFormat.format(energyValue2.getValue()))); // TODO Localize } - else - { + else { + event.toolTip.add(String.format("Exchange Energy: %s", energyValueDecimalFormat.format(wrappedItemStack.getStackSize() * energyValue.getValue()))); // TODO Localize - if (FluidContainerRegistry.getFluidForFilledItem(event.itemStack) != null) - { + + if (FluidContainerRegistry.getFluidForFilledItem(event.itemStack) != null) { + FluidStack fluidStack = FluidContainerRegistry.getFluidForFilledItem(event.itemStack); - if (EnergyValueRegistryProxy.getEnergyValueForStack(fluidStack) != null) - { + if (EnergyValueRegistryProxy.getEnergyValueForStack(fluidStack) != null) { + EnergyValue fluidStackEnergyValue = EnergyValueRegistryProxy.getEnergyValueForStack(fluidStack); event.toolTip.add(String.format(" - Exchange Energy (%s): %s", fluidStack.getLocalizedName(), energyValueDecimalFormat.format(fluidStackEnergyValue.getValue()))); // TODO Localize event.toolTip.add(String.format(" - Exchange Energy (Container): %s", energyValueDecimalFormat.format(energyValue.getValue() - fluidStackEnergyValue.getValue()))); // TODO Localize