journal and essence secrets

5 files changed, 191 insertions, 4 deletions

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonJournal.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonJournal.java
new file mode 100755
index 00000000..3993d0d7
--- /dev/null
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonJournal.java
@@ -0,0 +1,81 @@
+package kr.syeyoung.dungeonsguide.dungeon.mechanics;
+
+import com.google.common.collect.Sets;
+import kr.syeyoung.dungeonsguide.dungeon.actions.Action;
+import kr.syeyoung.dungeonsguide.dungeon.actions.ActionChangeState;
+import kr.syeyoung.dungeonsguide.dungeon.actions.ActionInteract;
+import kr.syeyoung.dungeonsguide.dungeon.actions.ActionMove;
+import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint;
+import kr.syeyoung.dungeonsguide.dungeon.mechanics.predicates.PredicateArmorStand;
+import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoom;
+import kr.syeyoung.dungeonsguide.utils.RenderUtils;
+import lombok.Data;
+import net.minecraft.util.BlockPos;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+@Data
+public class DungeonJournal implements DungeonMechanic {
+    private OffsetPoint secretPoint = new OffsetPoint(0,0,0);
+    private List<String> preRequisite = new ArrayList<String>();
+
+
+    @Override
+    public Set<Action> getAction(String state, DungeonRoom dungeonRoom) {
+        if (!"navigate".equalsIgnoreCase(state)) throw new IllegalArgumentException(state+" is not valid state for secret");
+        Set<Action> base;
+        Set<Action> preRequisites = base = new HashSet<Action>();
+        {
+            ActionMove actionMove = new ActionMove(secretPoint);
+            preRequisites.add(actionMove);
+            preRequisites = actionMove.getPreRequisite();
+        }
+        {
+            for (String str : preRequisite) {
+                if (str.isEmpty()) continue;
+                ActionChangeState actionChangeState = new ActionChangeState(str.split(":")[0], str.split(":")[1]);
+                preRequisites.add(actionChangeState);
+            }
+        }
+        return base;
+    }
+
+    @Override
+    public void highlight(Color color, String name, DungeonRoom dungeonRoom, float partialTicks) {
+        BlockPos pos = getSecretPoint().getBlockPos(dungeonRoom);
+        RenderUtils.highlightBlock(pos, color,partialTicks);
+        RenderUtils.drawTextAtWorld("J-"+name, pos.getX() +0.5f, pos.getY()+0.375f, pos.getZ()+0.5f, 0xFFFFFFFF, 0.03f, false, true, partialTicks);
+        RenderUtils.drawTextAtWorld(getCurrentState(dungeonRoom), pos.getX() +0.5f, pos.getY()+0f, pos.getZ()+0.5f, 0xFFFFFFFF, 0.03f, false, true, partialTicks);
+    }
+
+
+    public DungeonJournal clone() throws CloneNotSupportedException {
+        DungeonJournal dungeonSecret = new DungeonJournal();
+        dungeonSecret.secretPoint = (OffsetPoint) secretPoint.clone();
+        dungeonSecret.preRequisite = new ArrayList<String>(preRequisite);
+        return dungeonSecret;
+    }
+
+
+    @Override
+    public String getCurrentState(DungeonRoom dungeonRoom) {
+        return "no-state";
+    }
+
+    @Override
+    public Set<String> getPossibleStates(DungeonRoom dungeonRoom) {
+        return Sets.newHashSet("navigate");
+    }
+    @Override
+    public Set<String> getTotalPossibleStates(DungeonRoom dungeonRoom) {
+        return Sets.newHashSet("no-state","navigate");
+    }
+    @Override
+    public OffsetPoint getRepresentingPoint() {
+        return secretPoint;
+    }
+}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonSecret.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonSecret.java
index 958cd286..182e0201 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonSecret.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonSecret.java
@@ -63,7 +63,7 @@ public class DungeonSecret implements DungeonMechanic {
         if (!"found".equalsIgnoreCase(state)) throw new IllegalArgumentException(state+" is not valid state for secret");
         Set<Action> base;
         Set<Action> preRequisites = base = new HashSet<Action>();
-        if (secretType == SecretType.CHEST) {
+        if (secretType == SecretType.CHEST || secretType == SecretType.ESSENCE) {
             ActionClick actionClick;
             preRequisites.add(actionClick = new ActionClick(secretPoint));
             preRequisites = actionClick.getPreRequisite();
@@ -99,7 +99,7 @@ public class DungeonSecret implements DungeonMechanic {
     }
 
     public static enum SecretType {
-        BAT, CHEST, ITEM_DROP
+        BAT, CHEST, ITEM_DROP, ESSENCE
     }
 
     @AllArgsConstructor
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditJournal.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditJournal.java
new file mode 100755
index 00000000..cc94278f
--- /dev/null
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditJournal.java
@@ -0,0 +1,105 @@
+package kr.syeyoung.dungeonsguide.roomedit.mechanicedit;
+
+import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint;
+import kr.syeyoung.dungeonsguide.dungeon.mechanics.DungeonFairySoul;
+import kr.syeyoung.dungeonsguide.dungeon.mechanics.DungeonJournal;
+import kr.syeyoung.dungeonsguide.gui.MPanel;
+import kr.syeyoung.dungeonsguide.gui.elements.MLabel;
+import kr.syeyoung.dungeonsguide.gui.elements.MLabelAndElement;
+import kr.syeyoung.dungeonsguide.gui.elements.MTextField;
+import kr.syeyoung.dungeonsguide.gui.elements.MValue;
+import kr.syeyoung.dungeonsguide.roomedit.EditingContext;
+import kr.syeyoung.dungeonsguide.roomedit.Parameter;
+import kr.syeyoung.dungeonsguide.roomedit.valueedit.ValueEdit;
+import kr.syeyoung.dungeonsguide.roomedit.valueedit.ValueEditCreator;
+import kr.syeyoung.dungeonsguide.utils.TextUtils;
+
+import java.awt.*;
+import java.util.Arrays;
+import java.util.Collections;
+
+
+public class ValueEditJournal extends MPanel implements ValueEdit<DungeonJournal> {
+    private Parameter parameter;
+
+    // scroll pane
+    // just create
+    // add set
+    private DungeonJournal dungeonSecret;
+
+    private MLabel label;
+    private MValue<OffsetPoint> value;
+    private MTextField preRequisite;
+    private MLabelAndElement preRequisite2;
+
+    public ValueEditJournal(final Parameter parameter2) {
+        this.parameter = parameter2;
+        this.dungeonSecret = (DungeonJournal) parameter2.getNewData();
+
+
+        label = new MLabel();
+        label.setText("Journal Point");
+        label.setAlignment(MLabel.Alignment.LEFT);
+        add(label);
+
+        value = new MValue(dungeonSecret.getSecretPoint(), Collections.emptyList());
+        add(value);
+
+        preRequisite = new MTextField() {
+            @Override
+            public void edit(String str) {
+                dungeonSecret.setPreRequisite(Arrays.asList(str.split(",")));
+            }
+        };
+        preRequisite.setText(TextUtils.join(dungeonSecret.getPreRequisite(), ","));
+        preRequisite2 = new MLabelAndElement("Req.",preRequisite);
+        preRequisite2.setBounds(new Rectangle(0,40,getBounds().width,20));
+        add(preRequisite2);
+    }
+
+    @Override
+    public void onBoundsUpdate() {
+        label.setBounds(new Rectangle(0,0,getBounds().width, 20));
+        value.setBounds(new Rectangle(0,20,getBounds().width, 20));
+        preRequisite2.setBounds(new Rectangle(0,40,getBounds().width,20));
+    }
+
+    @Override
+    public void setParameter(Parameter parameter) {
+        this.parameter = parameter;
+    }
+
+    @Override
+    public void renderWorld(float partialTicks) {
+        dungeonSecret.highlight(new Color(0,255,0,50), parameter.getName(), EditingContext.getEditingContext().getRoom(), partialTicks);
+    }
+
+    @Override
+    public void resize(int parentWidth, int parentHeight) {
+        this.setBounds(new Rectangle(0,0,parentWidth, parentHeight));
+    }
+
+    public static class Generator implements ValueEditCreator<ValueEditJournal> {
+
+        @Override
+        public ValueEditJournal createValueEdit(Parameter parameter) {
+            return new ValueEditJournal(parameter);
+        }
+
+        @Override
+        public Object createDefaultValue(Parameter parameter) {
+            return new DungeonJournal();
+        }
+
+        @Override
+        public Object cloneObj(Object object) {
+            try {
+                return ((DungeonJournal)object).clone();
+            } catch (CloneNotSupportedException e) {
+                e.printStackTrace();
+            }
+            assert false;
+            return null;
+        }
+    }
+}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditSecret.java b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditSecret.java
index eb8349c4..18d1195e 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditSecret.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/mechanicedit/ValueEditSecret.java
@@ -41,7 +41,7 @@ public class ValueEditSecret extends MPanel implements ValueEdit<DungeonSecret>
         value = new MValue(dungeonSecret.getSecretPoint(), Collections.emptyList());
         add(value);
 
-        selectionButton = new MStringSelectionButton(Arrays.asList(new String[] {"CHEST", "BAT", "ITEM_DROP"}), "CHEST");
+        selectionButton = new MStringSelectionButton(Arrays.asList(new String[] {"CHEST", "BAT", "ITEM_DROP", "ESSENCE"}), "CHEST");
         selectionButton.setOnUpdate(new Runnable() {
             @Override
             public void run() {
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 beb5a10f..3186facd 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditRegistry.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomedit/valueedit/ValueEditRegistry.java
@@ -37,9 +37,10 @@ public class ValueEditRegistry {
 
         valueEditMap.put(DungeonSecret.class.getName(), new ValueEditSecret.Generator());
         valueEditMap.put(DungeonFairySoul.class.getName(), new ValueEditFairySoul.Generator());
-        valueEditMap.put(ValueEditNPC.class.getName(), new ValueEditNPC.Generator());
+        valueEditMap.put(DungeonNPC.class.getName(), new ValueEditNPC.Generator());
         valueEditMap.put(DungeonTomb.class.getName(), new ValueEditTomb.Generator());
         valueEditMap.put(DungeonBreakableWall.class.getName(), new ValueEditBreakableWall.Generator());
+        valueEditMap.put(DungeonJournal.class.getName(), new ValueEditJournal.Generator());
 
         valueEditMap.put(DungeonPressurePlate.class.getName(), new ValueEditPressurePlate.Generator());
         valueEditMap.put(DungeonOnewayLever.class.getName(), new ValueEditOnewayLever.Generator());