From 1a35ed161a4acf5a2b813f8dcb584196e60bcf48 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 1 Feb 2016 14:42:44 -0700 Subject: [PATCH] Clicking energy info tab will toggle energy unit display type --- .../client/gui/element/GuiEnergyInfo.java | 24 ++++++++++++++++--- .../resources/assets/mekanism/lang/en_US.lang | 1 + 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java index d51ed1d9e..aa84186a0 100644 --- a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java +++ b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java @@ -1,14 +1,18 @@ package mekanism.client.gui.element; +import java.util.ArrayList; import java.util.List; +import mekanism.api.MekanismConfig.general; +import mekanism.api.util.UnitDisplayUtils.EnergyType; import mekanism.client.gui.IGuiWrapper; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import codechicken.lib.vec.Rectangle4i; @SideOnly(Side.CLIENT) public class GuiEnergyInfo extends GuiElement @@ -48,7 +52,15 @@ public class GuiEnergyInfo extends GuiElement { if(xAxis >= -21 && xAxis <= -3 && yAxis >= 142 && yAxis <= 160) { - displayTooltips(infoHandler.getInfo(), xAxis, yAxis); + List info = new ArrayList(); + + for(String s : infoHandler.getInfo()) + { + info.add(s); + } + + info.add(LangUtils.localize("gui.energyType") + ": " + general.activeType); + displayTooltips(info, xAxis, yAxis); } } @@ -56,5 +68,11 @@ public class GuiEnergyInfo extends GuiElement public void preMouseClicked(int xAxis, int yAxis, int button) {} @Override - public void mouseClicked(int xAxis, int yAxis, int button) {} + public void mouseClicked(int xAxis, int yAxis, int button) + { + if(button == 0) + { + general.activeType = EnergyType.values()[(general.activeType.ordinal()+1)%EnergyType.values().length]; + } + } } diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 51383001d..ff6ca90b0 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -497,6 +497,7 @@ gui.maxProduction=Max Production gui.limiting=Limiting gui.steamInput=Steam Input gui.capacity=Capacity +gui.energyType=Energy Type gui.reactor.injectionRate=Injection Rate