diff options
author | Martin Robertz <dream-master@gmx.net> | 2021-12-13 22:00:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-13 22:00:33 +0100 |
commit | 628fe2f0da60e08dcb3a6f900ce8e48278b8e639 (patch) | |
tree | e3f0a65ec0616d0492be2a12b9e20f0fc320b88d /src/Java/gtPlusPlus/core/handler | |
parent | c2b4f33d9e7b3dbfdb430a33349741eb1e6f2758 (diff) | |
parent | a52711dc135c700b0e72f49330e513523ff49d0f (diff) | |
download | GT5-Unofficial-628fe2f0da60e08dcb3a6f900ce8e48278b8e639.tar.gz GT5-Unofficial-628fe2f0da60e08dcb3a6f900ce8e48278b8e639.tar.bz2 GT5-Unofficial-628fe2f0da60e08dcb3a6f900ce8e48278b8e639.zip |
Merge pull request #67 from GTNewHorizons/Misc2
Rare Earth Changes + Minor bug fixes
Diffstat (limited to 'src/Java/gtPlusPlus/core/handler')
-rw-r--r-- | src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java index fda7760607..10dea8a7bf 100644 --- a/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java +++ b/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java @@ -6,8 +6,10 @@ import gtPlusPlus.GTplusplus; import gtPlusPlus.GTplusplus.INIT_PHASE; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.sys.KeyboardUtils; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; @@ -22,7 +24,7 @@ public class GeneralTooltipEventHandler { @SubscribeEvent public void onItemTooltip(ItemTooltipEvent event){ - + if (GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.STARTED && GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.SERVER_START) { return; } @@ -68,8 +70,16 @@ public class GeneralTooltipEventHandler { event.toolTip.add(EnumChatFormatting.GOLD+"Capacity: "+EnumChatFormatting.AQUA+"128000L"); } } - - + + // Custom Flasks + + if (GregtechItemList.VOLUMETRIC_FLASK_8k.hasBeenSet() && event.itemStack.getItem() == GregtechItemList.VOLUMETRIC_FLASK_8k.getItem()) { + event.toolTip.add("Max Capacity: "+MathUtils.formatNumbers(8000)+"L"); + } + if (GregtechItemList.VOLUMETRIC_FLASK_32k.hasBeenSet() && event.itemStack.getItem() == GregtechItemList.VOLUMETRIC_FLASK_32k.getItem()) { + event.toolTip.add("Max Capacity: "+MathUtils.formatNumbers(32000)+"L"); + } + if (CORE.ConfigSwitches.enableAnimatedTurbines) { boolean shift = false; |