value edit stuff

6 files changed, 16 insertions, 12 deletions

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MButton.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MButton.java
index e32181ed..866951ab 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MButton.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MButton.java
@@ -47,7 +47,7 @@ public class MButton extends MPanel {
     }
 
     @Override
-    protected void mouseClicked(int absMouseX, int absMouseY, int relMouseX, int relMouseY, int mouseButton) {
+    public void mouseClicked(int absMouseX, int absMouseY, int relMouseX, int relMouseY, int mouseButton) {
         if (onActionPerformed != null && new Rectangle(new Point(0,0),getSize()).contains(relMouseX, relMouseY))
             onActionPerformed.run();
     }
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 298a88e0..7a284433 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MLabelAndElement.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MLabelAndElement.java
@@ -31,7 +31,7 @@ public class MLabelAndElement extends MPanel {
     }
 
     @Override
-    protected void mouseClicked(int absMouseX, int absMouseY, int relMouseX, int relMouseY, int mouseButton) {
+    public 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();
         }
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MParameter.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MParameter.java
index 9a599075..13e1c6ed 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MParameter.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MParameter.java
@@ -3,6 +3,7 @@ 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 kr.syeyoung.dungeonsguide.roomedit.panes.ProcessorParameterEditPane;
 import lombok.Getter;
 import lombok.Setter;
 import net.minecraft.client.gui.Gui;
@@ -18,8 +19,10 @@ public class MParameter extends MPanel {
 
     @Getter @Setter
     private Parameter parameter;
+    private ProcessorParameterEditPane processorParameterEditPane;
 
-    public MParameter(final Parameter parameter) {
+    public MParameter(final Parameter parameter, ProcessorParameterEditPane processorParameterEditPane) {
+        this.processorParameterEditPane = processorParameterEditPane;
         this.add(this.label = new MLabel() {
             @Override
             public String getText() {
@@ -29,7 +32,7 @@ public class MParameter extends MPanel {
         this.add(this.data = new MLabel() {
             @Override
             public String getText() {
-                return parameter.getData() != null ?parameter.getData().toString() :"-empty-";
+                return parameter.getNewData() != null ?parameter.getNewData().toString() :"-empty-";
             }
         });
         this.label.setAlignment(MLabel.Alignment.LEFT);
@@ -46,7 +49,7 @@ public class MParameter extends MPanel {
     }
 
     @Override
-    protected void mouseClicked(int absMouseX, int absMouseY, int relMouseX, int relMouseY, int mouseButton) {
+    public 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");
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MStringSelectionButton.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MStringSelectionButton.java
index 7e9e42cb..94f79f7d 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MStringSelectionButton.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MStringSelectionButton.java
@@ -22,9 +22,10 @@ public class MStringSelectionButton extends MPanel {
     @Setter
     private Runnable onUpdate;
 
-    public MStringSelectionButton(final List<String> possible) {
+    public MStringSelectionButton(final List<String> possible, String defaultValue) {
         this.possible = possible;
-        selectedIndex = 0;
+        selectedIndex = possible.indexOf(defaultValue);
+        if (selectedIndex == -1) selectedIndex = 0;
 
         dec = new MButton(); dec.setText("<"); add(dec);
         inc = new MButton(); inc.setText(">"); add(inc);
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MTabButton.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MTabButton.java
index 96f8d4db..eee366cc 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MTabButton.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MTabButton.java
@@ -53,7 +53,7 @@ public class MTabButton extends MPanel {
     }
 
     @Override
-    protected void mouseClicked(int absMouseX, int absMouseY, int relMouseX, int relMouseY, int mouseButton) {
+    public void mouseClicked(int absMouseX, int absMouseY, int relMouseX, int relMouseY, int mouseButton) {
         if (new Rectangle(new Point(0,0),getSize()).contains(relMouseX, relMouseY)) {
             tabbedPane.setSelectedKey(text);
         }
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MTextField.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MTextField.java
index 083bb356..d571384f 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MTextField.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/elements/MTextField.java
@@ -71,7 +71,7 @@ public class MTextField extends MPanel {
     }
 
     @Override
-    protected void mouseClicked(int absMouseX, int absMouseY, int relMouseX, int relMouseY, int mouseButton) {
+    public void mouseClicked(int absMouseX, int absMouseY, int relMouseX, int relMouseY, int mouseButton) {
         Rectangle actualField = new Rectangle(1, 3,bounds.width - 2, bounds.height - 6);
         if (!actualField.contains(relMouseX, relMouseY)) return;
 
@@ -96,7 +96,7 @@ public class MTextField extends MPanel {
     }
 
     @Override
-    protected void mouseClickMove(int absMouseX, int absMouseY, int relMouseX, int relMouseY, int clickedMouseButton, long timeSinceLastClick) {
+    public void mouseClickMove(int absMouseX, int absMouseY, int relMouseX, int relMouseY, int clickedMouseButton, long timeSinceLastClick) {
         if (!isFocused) return;
         selectionStart = cursor;
         selectionEnd = cursor;
@@ -127,7 +127,7 @@ public class MTextField extends MPanel {
     }
 
     @Override
-    protected void mouseScrolled(int absMouseX, int absMouseY, int relMouseX0, int relMouseY0, int scrollAmount) {
+    public void mouseScrolled(int absMouseX, int absMouseY, int relMouseX0, int relMouseY0, int scrollAmount) {
         if (!isFocused) return;
         if (scrollAmount > 0) {
             xOffset += 5;
@@ -147,7 +147,7 @@ public class MTextField extends MPanel {
     }
 
     @Override
-    protected void keyTyped(char typedChar, int keycode) {
+    public void keyTyped(char typedChar, int keycode) {
         if (!isFocused) return;