From a15ff8c41f42ef1405a5fdadce28e5190e8b5f33 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Fri, 25 Mar 2016 21:51:01 +0100
Subject: [PATCH] Fixes

---
 src/main/java/refinedstorage/gui/GuiBase.java | 71 ++++++++-----------
 1 file changed, 28 insertions(+), 43 deletions(-)

diff --git a/src/main/java/refinedstorage/gui/GuiBase.java b/src/main/java/refinedstorage/gui/GuiBase.java
index 83c3b281d..239ee6099 100755
--- a/src/main/java/refinedstorage/gui/GuiBase.java
+++ b/src/main/java/refinedstorage/gui/GuiBase.java
@@ -1,18 +1,11 @@
 package refinedstorage.gui;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.VertexBuffer;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.inventory.Container;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.text.translation.I18n;
 import org.lwjgl.opengl.GL11;
 import refinedstorage.RefinedStorage;
@@ -155,52 +148,44 @@ public abstract class GuiBase extends GuiContainer {
         zLevel = 200.0F;
         itemRender.zLevel = 200.0F;
 
-        FontRenderer font = null;
-
-        if (stack != null) {
-            font = stack.getItem().getFontRenderer(stack);
-        }
-
-        if (font == null) {
-            font = fontRendererObj;
-        }
-
         itemRender.renderItemIntoGUI(stack, x, y);
 
         if (withOverlay) {
-       		renderSlotOverlay(stack, message,x,y);
-	}
+            drawItemOverlay(stack, message, x, y);
+        }
 
         zLevel = 0.0F;
         itemRender.zLevel = 0.0F;
     }
 
-	private void renderSlotOverlay(ItemStack stack, String text, int x, int y) {
-		if (text != null) {
-		GlStateManager.pushMatrix();
-		GlStateManager.translate(x, y, 1);
-		GL11.glScalef(0.5f, 0.5f, 1);
+    public void drawItemOverlay(ItemStack stack, String text, int x, int y) {
+        if (text != null) {
+            GlStateManager.pushMatrix();
+            GlStateManager.translate(x, y, 1);
+            GL11.glScalef(0.5f, 0.5f, 1);
 
-        	int stringWidth = fontRendererObj.getStringWidth(text);
-        	GlStateManager.disableLighting();
-        	GlStateManager.disableRescaleNormal();
-        	GlStateManager.depthMask(false);
-        	GlStateManager.enableBlend();
-        	GlStateManager.blendFunc(770, 771);
-        	GlStateManager.disableDepth();
-        	fontRendererObj.drawStringWithShadow(text, 30-stringWidth, 22, 16777215);
-        	GlStateManager.enableDepth();
-        	GlStateManager.enableTexture2D();
-        	GlStateManager.depthMask(true);
-        	GlStateManager.enableLighting(); 
-        	GlStateManager.disableBlend();
-        	GlStateManager.popMatrix();
-        	
-		}	
-		
-		itemRender.renderItemOverlayIntoGUI(fontRendererObj, stack, x, y, "");
+            int stringWidth = fontRendererObj.getStringWidth(text);
+
+            GlStateManager.disableLighting();
+            GlStateManager.disableRescaleNormal();
+            GlStateManager.depthMask(false);
+            GlStateManager.enableBlend();
+            GlStateManager.blendFunc(770, 771);
+            GlStateManager.disableDepth();
+
+            fontRendererObj.drawStringWithShadow(text, 30 - stringWidth, 22, 16777215);
+
+            GlStateManager.enableDepth();
+            GlStateManager.enableTexture2D();
+            GlStateManager.depthMask(true);
+            GlStateManager.enableLighting();
+            GlStateManager.disableBlend();
+            GlStateManager.popMatrix();
+        }
+
+        itemRender.renderItemOverlayIntoGUI(fontRendererObj, stack, x, y, "");
     }
-	
+
     public void drawString(int x, int y, String message) {
         drawString(x, y, message, 4210752);
     }