custom party finder

7 files changed, 34 insertions, 20 deletions

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/gui/MGui.java b/src/main/java/kr/syeyoung/dungeonsguide/gui/MGui.java
index 7c35306d..feef2848 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/gui/MGui.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/gui/MGui.java
@@ -78,8 +78,8 @@ public class MGui extends GuiScreen {
             mainPanel.keyTyped0(typedChar, keyCode);
             super.keyTyped(typedChar, keyCode);
         } catch (Throwable e) {
-            if (!e.getMessage().contains("hack to stop"))
-            e.printStackTrace();
+            if (e.getMessage() == null || !e.getMessage().contains("hack to stop"))
+                e.printStackTrace();
         }
     }
 
@@ -90,7 +90,7 @@ public class MGui extends GuiScreen {
             mainPanel.mouseClicked0(mouseX, mouseY
                     ,mouseX, mouseY, mouseButton);
         } catch (Throwable e) {
-            if (!e.getMessage().contains("hack to stop"))
+            if (e.getMessage() == null || !e.getMessage().contains("hack to stop"))
             e.printStackTrace();
         }
     }
@@ -106,7 +106,7 @@ public class MGui extends GuiScreen {
             mainPanel.mouseReleased0(mouseX, mouseY
                     ,mouseX,mouseY , state);
         } catch (Throwable e) {
-            if (!e.getMessage().contains("hack to stop"))
+            if (e.getMessage() == null || !e.getMessage().contains("hack to stop"))
             e.printStackTrace();
         }
     }
@@ -117,7 +117,7 @@ public class MGui extends GuiScreen {
             mainPanel.mouseClickMove0(mouseX, mouseY
                     ,mouseX ,mouseY, clickedMouseButton, timeSinceLastClick);
         } catch (Throwable e) {
-            if (!e.getMessage().contains("hack to stop"))
+            if (e.getMessage() == null || !e.getMessage().contains("hack to stop"))
             e.printStackTrace();
         }
     }
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/gui/MPanel.java b/src/main/java/kr/syeyoung/dungeonsguide/gui/MPanel.java
index 319a7af8..a91cb6c6 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/gui/MPanel.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/gui/MPanel.java
@@ -88,7 +88,7 @@ public class MPanel {
     public void add(MPanel child) {
         if (child.parent != null) throw new IllegalArgumentException("What have you done");
         this.childComponents.add(child);
-        child.parent = this;
+        child.setParent(this);
     }
 
     public void openTooltip(MTooltip mPanel) {
@@ -99,7 +99,7 @@ public class MPanel {
     }
 
     public void remove(MPanel panel) {
-        panel.parent = null;
+        panel.setParent(null);
         this.childComponents.remove(panel);
     }
 
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MButton.java b/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MButton.java
index d30b82c9..da2ff78c 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MButton.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MButton.java
@@ -37,9 +37,10 @@ public class MButton extends MPanel {
     private String text;
 
     private Color foreground = Color.white;
-    private Color hover = Color.gray;
-    private Color clicked = Color.lightGray;
-    private Color disabled = Color.darkGray;
+    private int background = RenderUtils.blendAlpha(0xFF141414, 0.08f);
+    private int hover =  RenderUtils.blendAlpha(0xFF141414, 0.14f);
+    private int clicked =  RenderUtils.blendAlpha(0xFF141414, 0.16f);
+    private int disabled =0xFF141414;
 
     private boolean enabled = true;
 
@@ -49,14 +50,15 @@ public class MButton extends MPanel {
     public void render(int absMousex, int absMousey, int relMousex0, int relMousey0, float partialTicks, Rectangle clip) {
         Dimension bounds = getSize();
 
-        Color bg = backgroundColor;
+        int bg = background;
         if (!enabled) {
             bg = disabled;
+        } else if (isclicked) {
+            bg = clicked;
         } else if (new Rectangle(new Point(0,0),bounds).contains(relMousex0, relMousey0)) {
             bg = hover;
         }
-        if (bg != null)
-            Gui.drawRect(0,0,getBounds().width, getBounds().height, bg.getRGB());
+        Gui.drawRect(0,0,getBounds().width, getBounds().height, bg);
 
         FontRenderer renderer = Minecraft.getMinecraft().fontRendererObj;
         int width = renderer.getStringWidth(getText());
@@ -69,9 +71,18 @@ public class MButton extends MPanel {
         renderer.drawString(getText(), x,y, foreground.getRGB());
     }
 
+    boolean isclicked = false;
     @Override
     public void mouseClicked(int absMouseX, int absMouseY, int relMouseX, int relMouseY, int mouseButton) {
-        if (onActionPerformed != null && lastAbsClip.contains(absMouseX, absMouseY))
-            onActionPerformed.run();
+        if (lastAbsClip.contains(absMouseX, absMouseY)) {
+            isclicked = true;
+            if (onActionPerformed != null)
+                onActionPerformed.run();
+        }
+    }
+
+    @Override
+    public void mouseReleased(int absMouseX, int absMouseY, int relMouseX, int relMouseY, int state) {
+        isclicked = false;
     }
 }
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MList.java b/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MList.java
index de3e4b40..f6df0e19 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MList.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MList.java
@@ -51,7 +51,7 @@ public class MList extends MPanel {
         for (int i = 1; i < getChildComponents().size(); i++) {
             MPanel panel = getChildComponents().get(i);
             Rectangle bound = panel.getBounds();
-            Gui.drawRect(0,bound.y - (gap/2), getBounds().width, bound.y - (gap/2)+1, gapLineColor);
+            Gui.drawRect(0, bound.y - gap, getBounds().width, bound.y, gapLineColor);
         }
     }
 
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MPassiveLabelAndElement.java b/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MPassiveLabelAndElement.java
index af29f92a..a90e40e5 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MPassiveLabelAndElement.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MPassiveLabelAndElement.java
@@ -34,6 +34,9 @@ public class MPassiveLabelAndElement extends MPanel {
     @Getter @Setter
     private Runnable onClick;
 
+    @Getter @Setter
+    private double divideRatio = 1/3.0;
+
     public MPassiveLabelAndElement(String label, MPanel element) {
         this.add(this.label = new MLabel());
         this.label.setText(label);
@@ -62,7 +65,7 @@ public class MPassiveLabelAndElement extends MPanel {
 
     @Override
     public void onBoundsUpdate() {
-        label.setBounds(new Rectangle(0,0,getBounds().width / 3, getBounds().height));
-        element.setBounds(new Rectangle(getBounds().width / 3,0,getBounds().width / 3 * 2, getBounds().height));
+        label.setBounds(new Rectangle(0,0, (int) (getBounds().width * divideRatio), getBounds().height));
+        element.setBounds(new Rectangle((int) (getBounds().width * divideRatio),0, (int) (getBounds().width * (1-divideRatio)), getBounds().height));
     }
 }
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MScrollablePanel.java b/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MScrollablePanel.java
index ffdab32b..bdbf51d0 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MScrollablePanel.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MScrollablePanel.java
@@ -112,7 +112,7 @@ public class MScrollablePanel extends MPanel {
         }
     }
 
-    private void evalulateContentArea() {
+    public void evalulateContentArea() {
         if (contentArea.getChildComponents().size() == 0) {
             contentAreaDim= new Rectangle(0,0,0,0);
             return;
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MTextField.java b/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MTextField.java
index c26a1b21..a971cc30 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MTextField.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MTextField.java
@@ -39,7 +39,7 @@ import java.io.IOException;
 public class MTextField extends MPanel {
     private final Color foreground = Color.white;
 
-    private String text = "asdasdasd";
+    private String text = "";
     private int cursorBlickTicker = 0;
 
     private int selectionStart = 0;