1 files changed, 4 insertions, 62 deletions

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 87093c4d..fee71b54 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonRoomEdit.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/gui/GuiDungeonRoomEdit.java
@@ -19,6 +19,7 @@
 package kr.syeyoung.dungeonsguide.roomedit.gui;
 
 import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoom;
+import kr.syeyoung.dungeonsguide.gui.MGui;
 import kr.syeyoung.dungeonsguide.gui.MPanel;
 import kr.syeyoung.dungeonsguide.gui.elements.MTabbedPane;
 import kr.syeyoung.dungeonsguide.roomedit.panes.*;
@@ -33,9 +34,7 @@ import org.lwjgl.opengl.GL11;
 import java.awt.*;
 import java.io.IOException;
 
-public class GuiDungeonRoomEdit extends GuiScreen {
-
-    private final MPanel mainPanel = new MPanel();
+public class GuiDungeonRoomEdit extends MGui {
 
     private final DungeonRoom room;
 
@@ -47,7 +46,7 @@ public class GuiDungeonRoomEdit extends GuiScreen {
         this.room = room;
 
         MTabbedPane tabbedPane = new MTabbedPane();
-        mainPanel.add(tabbedPane);
+        getMainPanel().add(tabbedPane);
         tabbedPane.setBackground2(new Color(17, 17, 17, 179));
 
 
@@ -71,63 +70,6 @@ public class GuiDungeonRoomEdit extends GuiScreen {
     public void initGui() {
         super.initGui();
         // update bounds
-        ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
-        mainPanel.setBounds(new Rectangle(Math.min((scaledResolution.getScaledWidth() - 500) / 2, scaledResolution.getScaledWidth()), Math.min((scaledResolution.getScaledHeight() - 300) / 2, scaledResolution.getScaledHeight()),500,300));
-    }
-
-    @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);
-        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();
-    }
-
-    @Override
-    public void keyTyped(char typedChar, int keyCode) throws IOException {
-        super.keyTyped(typedChar, keyCode);
-        mainPanel.keyTyped0(typedChar, keyCode);
-    }
-
-    @Override
-    public void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException {
-        super.mouseClicked(mouseX, mouseY, mouseButton);
-        mainPanel.mouseClicked0(mouseX, mouseY,mouseX,mouseY, mouseButton);
-    }
-
-    @Override
-    public void mouseReleased(int mouseX, int mouseY, int state) {
-        mainPanel.mouseReleased0(mouseX, mouseY,mouseX,mouseY, state);
-    }
-
-    @Override
-    public void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) {
-        mainPanel.mouseClickMove0(mouseX,mouseY,mouseX,mouseY,clickedMouseButton,timeSinceLastClick);
-    }
-
-    @Override
-    public void handleMouseInput() throws IOException {
-        super.handleMouseInput();
-
-        int i = Mouse.getEventX() * this.width / this.mc.displayWidth;
-        int j = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1;
-
-        int wheel = Mouse.getDWheel();
-        if (wheel != 0) {
-            mainPanel.mouseScrolled0(i, j,i,j, wheel);
-        }
+        getMainPanel().setBounds(new Rectangle(10, Math.min((Minecraft.getMinecraft().displayHeight - 300) / 2, Minecraft.getMinecraft().displayHeight),200,300));
     }
 }