LAST COMMIT OF TODAY

3 files changed, 94 insertions, 4 deletions

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MLabel.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MLabel.java
index bea1601c..457f24fc 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MLabel.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MLabel.java
@@ -17,8 +17,8 @@ public class MLabel extends MPanel {
     @Setter
     private Color foreground = Color.white;
 
-    public static enum Alignment {
-        LEFT, CENTER, RIGHT;
+    public enum Alignment {
+        LEFT, CENTER, RIGHT
     }
     @Getter
     @Setter
@@ -29,7 +29,7 @@ public class MLabel extends MPanel {
         Dimension bounds = getSize();
 
         FontRenderer renderer = Minecraft.getMinecraft().fontRendererObj;
-        int width = renderer.getStringWidth(text);
+        int width = renderer.getStringWidth(getText());
         int x,y;
         if (alignment == Alignment.CENTER) {
             x = (bounds.width - width) / 2;
@@ -43,6 +43,6 @@ public class MLabel extends MPanel {
         } else{
             return;
         }
-        renderer.drawString(text, x,y, 0xffffff);
+        renderer.drawString(getText(), x,y, 0xffffff);
     }
 }
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MLabelAndElement.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MLabelAndElement.java
index ba62e8ef..298a88e0 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MLabelAndElement.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MLabelAndElement.java
@@ -1,6 +1,9 @@
 package kr.syeyoung.dungeonsguide.roomedit.elements;
 
 import kr.syeyoung.dungeonsguide.roomedit.MPanel;
+import lombok.Getter;
+import lombok.Setter;
+import net.minecraft.client.gui.Gui;
 
 import java.awt.*;
 
@@ -8,6 +11,11 @@ public class MLabelAndElement extends MPanel {
     private MLabel label;
     private MPanel element;
 
+    @Getter @Setter
+    private Color hover;
+    @Getter @Setter
+    private Runnable onClick;
+
     public MLabelAndElement(String label, MPanel element) {
         this.add(this.label = new MLabel());
         this.label.setText(label);
@@ -16,6 +24,20 @@ public class MLabelAndElement extends MPanel {
     }
 
     @Override
+    public void render(int absMousex, int absMousey, int relMousex0, int relMousey0, float partialTicks, Rectangle scissor) {
+        if (hover != null && new Rectangle(new Point(0,0),bounds.getSize()).contains(relMousex0, relMousey0)) {
+            Gui.drawRect(0,0,bounds.width, bounds.height, hover.getRGB());
+        }
+    }
+
+    @Override
+    protected void mouseClicked(int absMouseX, int absMouseY, int relMouseX, int relMouseY, int mouseButton) {
+        if (onClick!= null && new Rectangle(new Point(0,0),bounds.getSize()).contains(relMouseX, relMouseY)) {
+            onClick.run();
+        }
+    }
+
+    @Override
     public void resize(int parentWidth, int parentHeight) {
         this.setSize(new Dimension(parentWidth, bounds.height));
         label.setBounds(new Rectangle(0,0,parentHeight / 3, bounds.height));
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MParameter.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MParameter.java
new file mode 100644
index 00000000..9a599075
--- /dev/null
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MParameter.java
@@ -0,0 +1,68 @@
+package kr.syeyoung.dungeonsguide.roomedit.elements;
+
+import kr.syeyoung.dungeonsguide.roomedit.EditingContext;
+import kr.syeyoung.dungeonsguide.roomedit.MPanel;
+import kr.syeyoung.dungeonsguide.roomedit.Parameter;
+import lombok.Getter;
+import lombok.Setter;
+import net.minecraft.client.gui.Gui;
+
+import java.awt.*;
+
+public class MParameter extends MPanel {
+    private MLabel label;
+    private MLabel data;
+
+    @Getter @Setter
+    private Color hover = Color.gray;
+
+    @Getter @Setter
+    private Parameter parameter;
+
+    public MParameter(final Parameter parameter) {
+        this.add(this.label = new MLabel() {
+            @Override
+            public String getText() {
+                return parameter.getName();
+            }
+        });
+        this.add(this.data = new MLabel() {
+            @Override
+            public String getText() {
+                return parameter.getData() != null ?parameter.getData().toString() :"-empty-";
+            }
+        });
+        this.label.setAlignment(MLabel.Alignment.LEFT);
+        this.data.setAlignment(MLabel.Alignment.RIGHT);
+
+        this.parameter = parameter;
+    }
+
+    @Override
+    public void render(int absMousex, int absMousey, int relMousex0, int relMousey0, float partialTicks, Rectangle scissor) {
+        if (hover != null && new Rectangle(new Point(0,0),bounds.getSize()).contains(relMousex0, relMousey0)) {
+            Gui.drawRect(0,0,bounds.width, bounds.height, hover.getRGB());
+        }
+    }
+
+    @Override
+    protected void mouseClicked(int absMouseX, int absMouseY, int relMouseX, int relMouseY, int mouseButton) {
+        if (this.bounds.x > -20 && new Rectangle(new Point(0,0),bounds.getSize()).contains(relMouseX, relMouseY)) {
+            // open new gui;
+            System.out.println("hey I'm "+parameter.getName()+", i'ma open gui");
+        }
+    }
+
+    @Override
+    public void resize(int parentWidth, int parentHeight) {
+        this.setSize(new Dimension(parentWidth, bounds.height));
+        label.setBounds(new Rectangle(0,0,parentHeight / 3, bounds.height));
+        data.setBounds(new Rectangle(parentWidth / 3,0,parentWidth / 3 * 2, bounds.height));
+    }
+
+    @Override
+    public void onBoundsUpdate() {
+        label.setBounds(new Rectangle(0,0,bounds.width / 3, bounds.height));
+        data.setBounds(new Rectangle(bounds.width / 3,0,bounds.width / 3 * 2, bounds.height));
+    }
+}