From 5b656a566e90364b2abc214017f0a565416beaad Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 19 Sep 2014 11:06:39 +0800 Subject: [PATCH] Changed rendering of power bar on tools to make it easier to see power level. --- .../enderio/item/darksteel/EnergyUpgrade.java | 1 - .../enderio/item/darksteel/PoweredItemRenderer.java | 12 +++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java index e1872762..99877273 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java @@ -221,7 +221,6 @@ public class EnergyUpgrade extends AbstractUpgrade { public boolean isAbsorbDamageWithPower() { boolean res= RANDOM.nextFloat() < Config.darkSteelPowerDamgeAbsorptionRatio; - System.out.println("EnergyUpgrade.isAbsorbDamageWithPower: "+ res); return res; } diff --git a/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java b/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java index 2d0b8b32..6c1dc289 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java +++ b/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java @@ -66,7 +66,7 @@ public class PoweredItemRenderer implements IItemRenderer { g = 0.4f; b = 1f; y = 13; - renderBar(y, maxDam, maxDam - dispDamage, new Color(200, 100, 10), Color.red); + renderBar2(y, maxDam, maxDam - dispDamage, new Color(200, 100, 10), Color.red); } GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); @@ -77,6 +77,16 @@ public class PoweredItemRenderer implements IItemRenderer { return EnergyUpgrade.loadFromItem(item) == null && item.getItemDamageForDisplay() == 0; } + private void renderBar2(int y, double maxDam, double dispDamage, Color full, Color empty) { + double ratio = dispDamage / maxDam; + Vector4f fg = ColorUtil.toFloat(full); + Vector4f ec = ColorUtil.toFloat(empty); + fg.interpolate(ec, (float) ratio); + int barLength = (int) Math.round(12.0 * (1 - ratio)); + RenderUtil.renderQuad2D(2, y, 0, barLength, 1, fg); + } + + private void renderBar(int y, double maxDam, double dispDamage, Color full, Color empty) { double ratio = dispDamage / maxDam; Vector4f fg = ColorUtil.toFloat(full);