From 56c8eb6f5f52a8c64fef56936243342a217f3be7 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Sat, 18 Jun 2016 13:51:43 +0200
Subject: [PATCH] Use the GL state manager everywhere

---
 src/main/java/refinedstorage/gui/GuiBase.java |  21 +++++++++---------
 .../refinedstorage/gui/GuiController.java     |   4 +---
 .../refinedstorage/textures/gui/grid.png      | Bin 1960 -> 1960 bytes
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/main/java/refinedstorage/gui/GuiBase.java b/src/main/java/refinedstorage/gui/GuiBase.java
index c2e4d79d9..82e3f13e9 100755
--- a/src/main/java/refinedstorage/gui/GuiBase.java
+++ b/src/main/java/refinedstorage/gui/GuiBase.java
@@ -8,7 +8,6 @@ import net.minecraft.inventory.Container;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import org.lwjgl.input.Mouse;
-import org.lwjgl.opengl.GL11;
 import refinedstorage.RefinedStorage;
 import refinedstorage.gui.sidebutton.SideButton;
 
@@ -87,18 +86,20 @@ public abstract class GuiBase extends GuiContainer {
 
     @Override
     protected void drawGuiContainerBackgroundLayer(float renderPartialTicks, int mouseX, int mouseY) {
-        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+        GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
 
         drawBackground(guiLeft, guiTop, mouseX, mouseY);
 
         if (scrollbar != null) {
+            GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+
             scrollbar.draw(this);
         }
     }
 
     @Override
     protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
-        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+        GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
 
         mouseX -= guiLeft;
         mouseY -= guiTop;
@@ -209,7 +210,7 @@ public abstract class GuiBase extends GuiContainer {
         if (text != null) {
             GlStateManager.pushMatrix();
             GlStateManager.translate(x, y, 1);
-            GL11.glScalef(0.5f, 0.5f, 1);
+            GlStateManager.scale(0.5f, 0.5f, 1);
 
             GlStateManager.disableLighting();
             GlStateManager.disableRescaleNormal();
@@ -234,9 +235,9 @@ public abstract class GuiBase extends GuiContainer {
     }
 
     public void drawString(int x, int y, String message, int color) {
-        GL11.glDisable(GL11.GL_LIGHTING);
+        GlStateManager.disableLighting();
         fontRendererObj.drawString(message, x, y, color);
-        GL11.glEnable(GL11.GL_LIGHTING);
+        GlStateManager.enableLighting();
     }
 
     public void drawTooltip(int x, int y, String message) {
@@ -244,15 +245,15 @@ public abstract class GuiBase extends GuiContainer {
     }
 
     public void drawTooltip(int x, int y, List<String> lines) {
-        GL11.glDisable(GL11.GL_LIGHTING);
+        GlStateManager.disableLighting();
         drawHoveringText(lines, x, y);
-        GL11.glEnable(GL11.GL_LIGHTING);
+        GlStateManager.enableLighting();
     }
 
     public void drawTooltip(int x, int y, ItemStack stack) {
-        GL11.glDisable(GL11.GL_LIGHTING);
+        GlStateManager.disableLighting();
         renderToolTip(stack, x, y);
-        GL11.glEnable(GL11.GL_LIGHTING);
+        GlStateManager.enableLighting();
     }
 
     public void drawTexture(int x, int y, int textureX, int textureY, int width, int height) {
diff --git a/src/main/java/refinedstorage/gui/GuiController.java b/src/main/java/refinedstorage/gui/GuiController.java
index 128c40af4..9522f3842 100755
--- a/src/main/java/refinedstorage/gui/GuiController.java
+++ b/src/main/java/refinedstorage/gui/GuiController.java
@@ -102,9 +102,7 @@ public class GuiController extends GuiBase {
         }
 
         if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) {
-            drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_usage", controller.getEnergyUsage())
-                + "\n"
-                + t("misc.refinedstorage:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null)));
+            drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_usage", controller.getEnergyUsage()) + "\n" + t("misc.refinedstorage:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null)));
         }
     }
 
diff --git a/src/main/resources/assets/refinedstorage/textures/gui/grid.png b/src/main/resources/assets/refinedstorage/textures/gui/grid.png
index d2bc104a9cca0509aaf93c2e198c779526fbf2c2..2d2cb3a5f22a6b6753e171e3f7db912ffa1d4611 100644
GIT binary patch
delta 23
fcmZ3%zk+{52n*L91_r)8j8pd%d2Wtl@nQx5T%HGZ

delta 23
fcmZ3%zk+{52n*L<1_r*pjPAcDtlb>P;>8RAUmOSP