secretz

4 files changed, 29 insertions, 15 deletions

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ActuallyClonable.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ActuallyClonable.java
deleted file mode 100644
index 4473954e..00000000
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ActuallyClonable.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package kr.syeyoung.dungeonsguide.roomedit.valueedit;
-
-public interface ActuallyClonable extends Cloneable {
-    public ActuallyClonable clone();
-}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditNull.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditNull.java
index d71ebc88..5caf8af9 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditNull.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditNull.java
@@ -9,7 +9,7 @@ public class ValueEditNull implements ValueEditCreator {
     }
 
     @Override
-    public ActuallyClonable createDefaultValue(Parameter parameter) {
+    public Cloneable createDefaultValue(Parameter parameter) {
         return null;
     }
 
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditOffsetPointSet.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditOffsetPointSet.java
index 6eadbff7..df6c3f1f 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditOffsetPointSet.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditOffsetPointSet.java
@@ -6,8 +6,7 @@ import kr.syeyoung.dungeonsguide.roomedit.EditingContext;
 import kr.syeyoung.dungeonsguide.roomedit.MPanel;
 import kr.syeyoung.dungeonsguide.roomedit.Parameter;
 import kr.syeyoung.dungeonsguide.roomedit.elements.MButton;
-import kr.syeyoung.dungeonsguide.roomedit.elements.MOffsetPoint;
-import kr.syeyoung.dungeonsguide.roomedit.elements.MParameter;
+import kr.syeyoung.dungeonsguide.roomedit.elements.MValue;
 import kr.syeyoung.dungeonsguide.roomedit.gui.GuiDungeonAddSet;
 import kr.syeyoung.dungeonsguide.utils.RenderUtils;
 import lombok.Getter;
@@ -17,7 +16,6 @@ import java.awt.*;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.UUID;
 
 public class ValueEditOffsetPointSet extends MPanel implements ValueEdit<OffsetPointSet> {
     private Parameter parameter;
@@ -36,7 +34,7 @@ public class ValueEditOffsetPointSet extends MPanel implements ValueEdit<OffsetP
         ((OffsetPointSet)parameter.getNewData()).getOffsetPointList().remove(offsetPoint);
         Iterator<MPanel> iterator = MParameters.iterator();
         while (iterator.hasNext()) {
-            MOffsetPoint panel = (MOffsetPoint) iterator.next();
+            MValue panel = (MValue) iterator.next();
             if (panel.getData() == offsetPoint) {
                 iterator.remove();
                 break;
@@ -131,10 +129,10 @@ public class ValueEditOffsetPointSet extends MPanel implements ValueEdit<OffsetP
                 @Override
                 public void run() {
                     OffsetPoint offsetPoint = new OffsetPoint(EditingContext.getEditingContext().getRoom(), Minecraft.getMinecraft().thePlayer.getPosition());
-                    MOffsetPoint mOffsetPoint;
-                    MParameters.add(mOffsetPoint = new MOffsetPoint(ValueEditOffsetPointSet.this, offsetPoint));
+                    MValue mValue;
+                    MParameters.add(mValue = new MValue(offsetPoint, buildAddonsFor(offsetPoint)));
                     ((OffsetPointSet)parameter.getNewData()).getOffsetPointList().add(offsetPoint);
-                    mOffsetPoint.setSize(new Dimension(bounds.width, 20));
+                    mValue.setSize(new Dimension(bounds.width, 20));
                 }
             });
 
@@ -156,10 +154,26 @@ public class ValueEditOffsetPointSet extends MPanel implements ValueEdit<OffsetP
             add(addSet);
         }
         for (OffsetPoint offsetPoint : ((OffsetPointSet)parameter.getNewData()).getOffsetPointList()) {
-            MParameters.add(new MOffsetPoint(this, offsetPoint));
+            MParameters.add(new MValue(offsetPoint, buildAddonsFor(offsetPoint)));
         }
     }
 
+    public List<MPanel> buildAddonsFor(final OffsetPoint offsetPoint) {
+        ArrayList<MPanel> panels = new ArrayList<MPanel>();
+        MButton mButton = new MButton();
+        mButton.setText("Delete");
+        mButton.setForeground(Color.white);
+        mButton.setBackgroundColor(Color.red);
+        mButton.setOnActionPerformed(new Runnable() {
+            @Override
+            public void run() {
+                delete(offsetPoint);
+            }
+        });
+        panels.add(mButton);
+        return panels;
+    }
+
     @Override
     public void onBoundsUpdate() {
         scroll.setBounds(new Rectangle(0,0,bounds.width, bounds.height-20));
@@ -187,7 +201,7 @@ public class ValueEditOffsetPointSet extends MPanel implements ValueEdit<OffsetP
     public void addAll(List<OffsetPoint> blockPoses) {
         ((OffsetPointSet)parameter.getNewData()).getOffsetPointList().addAll(blockPoses);
         for (OffsetPoint blockPose : blockPoses) {
-            MParameters.add(new MOffsetPoint(this, blockPose));
+            MParameters.add(new MValue(blockPose, buildAddonsFor(blockPose)));
         }
     }
 
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditRegistry.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditRegistry.java
index 9ceef61e..ef2a7b0d 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditRegistry.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditRegistry.java
@@ -2,6 +2,8 @@ package kr.syeyoung.dungeonsguide.roomedit.valueedit;
 
 import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint;
 import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPointSet;
+import kr.syeyoung.dungeonsguide.dungeon.mechanics.DungeonSecret;
+import kr.syeyoung.dungeonsguide.roomedit.mechanicedit.ValueEditSecret;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -26,5 +28,8 @@ public class ValueEditRegistry {
         valueEditMap.put(Integer.class.getName(), new ValueEditInteger.Generator());
         valueEditMap.put(OffsetPoint.class.getName(), new ValueEditOffsetPoint.Generator());
         valueEditMap.put(OffsetPointSet.class.getName(), new ValueEditOffsetPointSet.Generator());
+
+
+        valueEditMap.put(DungeonSecret.class.getName(), new ValueEditSecret.Generator());
     }
 }