finally fix gui flashing issue.

4 files changed, 38 insertions, 21 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 d8cf391e..da08a330 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonAddSet.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonAddSet.java
@@ -127,19 +127,24 @@ public class GuiDungeonAddSet extends GuiScreen {
 
     @Override
     public void drawScreen(int mouseX, int mouseY, float partialTicks) {
+
+
         ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
         GlStateManager.pushMatrix();
         GlStateManager.pushAttrib();
+        GlStateManager.disableLighting();
+        GlStateManager.disableFog();
+        GL11.glDisable(GL11.GL_FOG);
+        GlStateManager.color(1, 1, 1, 1);
         GlStateManager.disableDepth();
         GlStateManager.depthMask(false);
-        GlStateManager.disableLighting();
-        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.enableDepth();
+        GlStateManager.depthMask(true);
         GlStateManager.popAttrib();
         GlStateManager.popMatrix();
-        GlStateManager.popAttrib();
+        GlStateManager.enableBlend();
+        GlStateManager.enableLighting();
     }
 
     @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 e39b136a..9857b509 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonParameterEdit.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonParameterEdit.java
@@ -163,19 +163,23 @@ public class GuiDungeonParameterEdit extends GuiScreen {
 
     @Override
     public void drawScreen(int mouseX, int mouseY, float partialTicks) {
+
         ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
         GlStateManager.pushMatrix();
         GlStateManager.pushAttrib();
+        GlStateManager.disableLighting();
+        GlStateManager.disableFog();
+        GL11.glDisable(GL11.GL_FOG);
+        GlStateManager.color(1, 1, 1, 1);
         GlStateManager.disableDepth();
         GlStateManager.depthMask(false);
-        GlStateManager.disableLighting();
-        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();
+        GlStateManager.enableDepth();
+        GlStateManager.depthMask(true);
         GlStateManager.popAttrib();
         GlStateManager.popMatrix();
+        GlStateManager.enableBlend();
+        GlStateManager.enableLighting();
     }
 
     @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 34d7f740..f7638fc7 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonRoomEdit.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonRoomEdit.java
@@ -59,19 +59,23 @@ public class GuiDungeonRoomEdit extends GuiScreen {
 
     @Override
     public void drawScreen(int mouseX, int mouseY, float partialTicks) {
+
         ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
         GlStateManager.pushMatrix();
         GlStateManager.pushAttrib();
+        GlStateManager.disableLighting();
+        GlStateManager.disableFog();
+        GL11.glDisable(GL11.GL_FOG);
+        GlStateManager.color(1, 1, 1, 1);
         GlStateManager.disableDepth();
         GlStateManager.depthMask(false);
-        GlStateManager.disableLighting();
-        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();
+        GlStateManager.enableDepth();
+        GlStateManager.depthMask(true);
         GlStateManager.popAttrib();
         GlStateManager.popMatrix();
+        GlStateManager.enableBlend();
+        GlStateManager.enableLighting();
     }
 
     @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 74bffd78..8601275c 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonValueEdit.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonValueEdit.java
@@ -120,19 +120,23 @@ public class GuiDungeonValueEdit extends GuiScreen {
     @Override
     public void drawScreen(int mouseX, int mouseY, float partialTicks) {
         try {
+
             ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
             GlStateManager.pushMatrix();
             GlStateManager.pushAttrib();
+            GlStateManager.disableLighting();
+            GlStateManager.disableFog();
+            GL11.glDisable(GL11.GL_FOG);
+            GlStateManager.color(1, 1, 1, 1);
             GlStateManager.disableDepth();
             GlStateManager.depthMask(false);
-            GlStateManager.disableLighting();
-            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();
+            mainPanel.render0(scaledResolution, new Point(0,0), new Rectangle(0,0,scaledResolution.getScaledWidth(),scaledResolution.getScaledHeight()), mouseX, mouseY, mouseX, mouseY, partialTicks);
+            GlStateManager.enableDepth();
+            GlStateManager.depthMask(true);
             GlStateManager.popAttrib();
             GlStateManager.popMatrix();
+            GlStateManager.enableBlend();
+            GlStateManager.enableLighting();
         } catch (Throwable e) {
             e.printStackTrace();
         }