From d8e94b00d26e50ea80d86320bfa0e610f24da2d8 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Wed, 23 Jul 2014 11:06:58 -0400 Subject: [PATCH] Added effect information to upgrade GUI --- .../client/gui/GuiUpgradeManagement.java | 7 +++++++ src/main/java/mekanism/common/Upgrade.java | 20 +++++++++++++++++++ .../mekanism/common/util/MekanismUtils.java | 8 ++++---- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java index 35da089c3..d5f144614 100644 --- a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java +++ b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java @@ -53,6 +53,13 @@ public class GuiUpgradeManagement extends GuiMekanism renderText(selectedType.getName() + " " + MekanismUtils.localize("gui.upgrade"), 92, 8, 0.6F, true); renderText(MekanismUtils.localize("gui.upgrades.amount") + ": " + amount + "/" + selectedType.getMax(), 92, 16, 0.6F, true); + + int text = 0; + + for(String s : selectedType.getInfo((TileEntity)tileEntity)) + { + renderText(s, 92, 22+(6*text++), 0.6F, true); + } } int rendered = 0; diff --git a/src/main/java/mekanism/common/Upgrade.java b/src/main/java/mekanism/common/Upgrade.java index 881fb5693..9f9326bdf 100644 --- a/src/main/java/mekanism/common/Upgrade.java +++ b/src/main/java/mekanism/common/Upgrade.java @@ -1,6 +1,8 @@ package mekanism.common; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import mekanism.api.EnumColor; @@ -8,6 +10,7 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.Constants.NBT; public enum Upgrade @@ -65,6 +68,23 @@ public enum Upgrade return null; } + public List getInfo(TileEntity tile) + { + List ret = new ArrayList(); + + if(tile instanceof IUpgradeTile) + { + if(canMultiply()) + { + double effect = Math.pow(Mekanism.maxUpgradeMultiplier, (float)((IUpgradeTile)tile).getComponent().getUpgrades(this)/(float)getMax()); + + ret.add(MekanismUtils.localize("gui.upgrades.effect") + ": " + (Math.round(effect*100)/100F) + "x"); + } + } + + return ret; + } + public static Map buildMap(NBTTagCompound nbtTags) { Map upgrades = new HashMap(); diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index cf10a9b34..0ce0959ee 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -607,7 +607,7 @@ public final class MekanismUtils */ public static int getTicks(IUpgradeTile mgmt, int def) { - return (int)(def * Math.pow(Mekanism.maxUpgradeMultiplier, -mgmt.getComponent().getUpgrades(Upgrade.SPEED)/8.0)); + return (int)(def * Math.pow(Mekanism.maxUpgradeMultiplier, (float)-mgmt.getComponent().getUpgrades(Upgrade.SPEED)/(float)Upgrade.SPEED.getMax())); } /** @@ -619,7 +619,7 @@ public final class MekanismUtils */ public static double getEnergyPerTick(IUpgradeTile mgmt, double def) { - return def * Math.pow(Mekanism.maxUpgradeMultiplier, (2*mgmt.getComponent().getUpgrades(Upgrade.SPEED)-mgmt.getComponent().getUpgrades(Upgrade.ENERGY))/8.0); + return def * Math.pow(Mekanism.maxUpgradeMultiplier, (2*mgmt.getComponent().getUpgrades(Upgrade.SPEED)-(float)mgmt.getComponent().getUpgrades(Upgrade.ENERGY))/(float)Upgrade.SPEED.getMax()); } /** @@ -630,7 +630,7 @@ public final class MekanismUtils */ public static double getMaxEnergy(IUpgradeTile mgmt, double def) { - return def * Math.pow(Mekanism.maxUpgradeMultiplier, mgmt.getComponent().getUpgrades(Upgrade.ENERGY)/8.0); + return def * Math.pow(Mekanism.maxUpgradeMultiplier, (float)mgmt.getComponent().getUpgrades(Upgrade.ENERGY)/(float)Upgrade.ENERGY.getMax()); } /** @@ -642,7 +642,7 @@ public final class MekanismUtils public static double getMaxEnergy(ItemStack itemStack, double def) { Map upgrades = Upgrade.buildMap(itemStack.stackTagCompound); - return def * Math.pow(Mekanism.maxUpgradeMultiplier, upgrades.get(Upgrade.ENERGY)/8.0); + return def * Math.pow(Mekanism.maxUpgradeMultiplier, (float)upgrades.get(Upgrade.ENERGY)/(float)Upgrade.ENERGY.getMax()); } /**