facking glstatemanager

4 files changed, 28 insertions, 12 deletions

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonAddSet.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonAddSet.java
index 9d9f3b5c..651a892a 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonAddSet.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonAddSet.java
@@ -125,14 +125,18 @@ public class GuiDungeonAddSet extends GuiScreen {
     @Override
     public void drawScreen(int mouseX, int mouseY, float partialTicks) {
         ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
-        GL11.glPushMatrix();
+        GlStateManager.pushMatrix();
+        GlStateManager.pushAttrib();
+        GlStateManager.disableDepth();
+        GlStateManager.depthMask(false);
         GlStateManager.disableLighting();
-        GlStateManager.disableFog();
+        GlStateManager.disableFog();GL11.glDisable(GL11.GL_FOG);
         GlStateManager.color(1,1,1,1);
         GlStateManager.pushAttrib();
         mainPanel.render0(scaledResolution, new Point(0,0), new Rectangle(0,0,scaledResolution.getScaledWidth(),scaledResolution.getScaledHeight()), mouseX, mouseY, mouseX, mouseY, partialTicks);
         GlStateManager.popAttrib();
-        GL11.glPopMatrix();
+        GlStateManager.popMatrix();
+        GlStateManager.popAttrib();
     }
 
     @Override
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonParameterEdit.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonParameterEdit.java
index e704129c..c9bdc050 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonParameterEdit.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonParameterEdit.java
@@ -164,14 +164,18 @@ public class GuiDungeonParameterEdit extends GuiScreen {
     @Override
     public void drawScreen(int mouseX, int mouseY, float partialTicks) {
         ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
-        GL11.glPushMatrix();
+        GlStateManager.pushMatrix();
+        GlStateManager.pushAttrib();
+        GlStateManager.disableDepth();
+        GlStateManager.depthMask(false);
         GlStateManager.disableLighting();
-        GlStateManager.disableFog();
+        GlStateManager.disableFog();GL11.glDisable(GL11.GL_FOG);
         GlStateManager.color(1,1,1,1);
         GlStateManager.pushAttrib();
         mainPanel.render0(scaledResolution, new Point(0,0), new Rectangle(0,0,scaledResolution.getScaledWidth(),scaledResolution.getScaledHeight()), mouseX, mouseY, mouseX, mouseY, partialTicks);
         GlStateManager.popAttrib();
-        GL11.glPopMatrix();
+        GlStateManager.popAttrib();
+        GlStateManager.popMatrix();
     }
 
     @Override
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonRoomEdit.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonRoomEdit.java
index 4eaeedae..e8c71fe9 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonRoomEdit.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonRoomEdit.java
@@ -59,14 +59,18 @@ public class GuiDungeonRoomEdit extends GuiScreen {
     @Override
     public void drawScreen(int mouseX, int mouseY, float partialTicks) {
         ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
-        GL11.glPushMatrix();
+        GlStateManager.pushMatrix();
+        GlStateManager.pushAttrib();
+        GlStateManager.disableDepth();
+        GlStateManager.depthMask(false);
         GlStateManager.disableLighting();
-        GlStateManager.disableFog();
+        GlStateManager.disableFog();GL11.glDisable(GL11.GL_FOG);
         GlStateManager.color(1,1,1,1);
         GlStateManager.pushAttrib();
         mainPanel.render0(scaledResolution, new Point(0,0), new Rectangle(0,0,scaledResolution.getScaledWidth(),scaledResolution.getScaledHeight()), mouseX, mouseY, mouseX, mouseY, partialTicks);
         GlStateManager.popAttrib();
-        GL11.glPopMatrix();
+        GlStateManager.popAttrib();
+        GlStateManager.popMatrix();
     }
 
     @Override
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonValueEdit.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonValueEdit.java
index e9e5a60d..50269853 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonValueEdit.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonValueEdit.java
@@ -122,14 +122,18 @@ public class GuiDungeonValueEdit extends GuiScreen {
     public void drawScreen(int mouseX, int mouseY, float partialTicks) {
         try {
             ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
-            GL11.glPushMatrix();
+            GlStateManager.pushMatrix();
+            GlStateManager.pushAttrib();
+            GlStateManager.disableDepth();
+            GlStateManager.depthMask(false);
             GlStateManager.disableLighting();
-            GlStateManager.disableFog();
+            GlStateManager.disableFog();GL11.glDisable(GL11.GL_FOG);
             GlStateManager.color(1,1,1,1);
             GlStateManager.pushAttrib();
             mainPanel.render0(scaledResolution, new Point(0, 0), new Rectangle(0, 0, scaledResolution.getScaledWidth(), scaledResolution.getScaledHeight()), mouseX, mouseY, mouseX, mouseY, partialTicks);
             GlStateManager.popAttrib();
-            GL11.glPopMatrix();
+            GlStateManager.popAttrib();
+            GlStateManager.popMatrix();
         } catch (Throwable e) {
             e.printStackTrace();
         }