From 5cf658fbe85782b21e372d8856f39cedfb09be29 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 14 Sep 2014 00:24:02 -0700 Subject: [PATCH] Give bee products tooltips with their names in the Beealyzer Remove semicolon at end of bee territory area vect (not used) --- .../forestry/apiculture/gui/GuiBeealyzer.java | 15 ++++++++++----- src/main/java/forestry/core/utils/Vect.java | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java index eee45d1fd..7745dca4e 100755 --- a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java +++ b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java @@ -243,6 +243,9 @@ public class GuiBeealyzer extends GuiAlyzer { private void drawAnalyticsPage3(IBee bee, EnumBeeType type) { + float factor = this.factor; + this.setFactor(1.0f); + tempProductList = bee.getProduceList(); startPage(COLUMN_0, COLUMN_1, COLUMN_2); @@ -253,8 +256,8 @@ public class GuiBeealyzer extends GuiAlyzer { int x = COLUMN_0; for (ItemStack stack : tempProductList) { - itemRender.renderItemIntoGUI(fontRendererObj, mc.renderEngine, stack, (int) ((guiLeft + x) * (1 / factor)), - (int) ((guiTop + getLineY()) * (1 / factor))); + widgetManager.add(new ItemStackWidget(adjustToFactor(x), adjustToFactor(getLineY()), stack)); + x += 18; if (x > adjustToFactor(148)) { x = COLUMN_0; @@ -262,16 +265,16 @@ public class GuiBeealyzer extends GuiAlyzer { } } + newLine(); newLine(); newLine(); drawLine(StringUtil.localize("gui.beealyzer.specialty") + ":", COLUMN_0); - newLine(); x = COLUMN_0; for (ItemStack stack : bee.getSpecialtyList()) { - itemRender.renderItemIntoGUI(fontRendererObj, mc.renderEngine, stack, (int) ((guiLeft + x) * (1 / factor)), - (int) ((guiTop + getLineY()) * (1 / factor))); + widgetManager.add(new ItemStackWidget(adjustToFactor(x), adjustToFactor(getLineY()), stack)); + x += 18; if (x > adjustToFactor(148)) { x = COLUMN_0; @@ -280,6 +283,8 @@ public class GuiBeealyzer extends GuiAlyzer { } endPage(); + + this.setFactor(factor); } } diff --git a/src/main/java/forestry/core/utils/Vect.java b/src/main/java/forestry/core/utils/Vect.java index 3c93fbab0..256b8c2d0 100755 --- a/src/main/java/forestry/core/utils/Vect.java +++ b/src/main/java/forestry/core/utils/Vect.java @@ -51,7 +51,7 @@ public class Vect { @Override public String toString() { - return String.format("%sx%sx%s;", x, y, z); + return String.format("%sx%sx%s", x, y, z); } @Override