- Waypoints? and new JPS Pathfinding Algorithm

2 files changed, 5 insertions, 7 deletions

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/secret/FeatureActions.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/secret/FeatureActions.java
index b62a168f..0ae1e668 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/secret/FeatureActions.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/secret/FeatureActions.java
@@ -115,9 +115,7 @@ public class FeatureActions extends TextHUDFeature {
         Point roomPt = context.getMapProcessor().worldPointToRoomPoint(thePlayer.getPosition());
         DungeonRoom dungeonRoom = context.getRoomMapper().get(roomPt);
 
-        ActionRoute path = ((GeneralRoomProcessor)dungeonRoom.getRoomProcessor()).getPath();
-
-        if (path != null) {
+        for (ActionRoute path : ((GeneralRoomProcessor) dungeonRoom.getRoomProcessor()).getPath().values()) {
             actualBit.add(new StyledText("Pathfinding ","pathfinding"));
             actualBit.add(new StyledText(path.getMechanic()+" ","mechanic"));
             actualBit.add(new StyledText("-> ","separator"));
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/secret/mechanicbrowser/PanelMechanicBrowser.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/secret/mechanicbrowser/PanelMechanicBrowser.java
index 72ce5e01..5a558a1e 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/secret/mechanicbrowser/PanelMechanicBrowser.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/secret/mechanicbrowser/PanelMechanicBrowser.java
@@ -93,10 +93,10 @@ public class PanelMechanicBrowser extends MPanelScaledGUI {
         GL14.glBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
         GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
         fr.drawString("Selected: ", 2,2, 0xFFAAAAAA);
-        if (grp.getPath() == null)
+        if (grp.getPath("MECH-BROWSER") == null)
             fr.drawString("Nothing", fr.getStringWidth("Selected: ") + 2,2, 0xFFAA0000);
         else {
-            ActionRoute route = grp.getPath();
+            ActionRoute route = grp.getPath("MECH-BROWSER");
             fr.drawString(route.getMechanic()+" -> "+route.getState(), fr.getStringWidth("Selected: ") + 2,2, 0xFFFFFF00);
         }
         fr.drawString("Open Chat to Select Secrets", 2, fr.FONT_HEIGHT + 5, 0xFFAAAAAA);
@@ -256,7 +256,7 @@ public class PanelMechanicBrowser extends MPanelScaledGUI {
         for (String state : states) {
             mechanicBrowserTooltip.getMList().add(new MechanicBrowserElement(() -> state, false, (m2, pt2) -> {
                 if (dungeonRoom.getRoomProcessor() instanceof GeneralRoomProcessor)
-                    ((GeneralRoomProcessor)dungeonRoom.getRoomProcessor()).pathfind(id, state);
+                    ((GeneralRoomProcessor)dungeonRoom.getRoomProcessor()).pathfind("MECH-BROWSER", id, state);
                 mechanicBrowserTooltip.close();
                 mechanicBrowserTooltip = null;
             }));
@@ -276,7 +276,7 @@ public class PanelMechanicBrowser extends MPanelScaledGUI {
         if (!dungeonRoomOpt.isPresent()) return;
         DungeonRoom dungeonRoom = dungeonRoomOpt.get();
         if (!(dungeonRoom.getRoomProcessor() instanceof GeneralRoomProcessor)) return;
-        ((GeneralRoomProcessor) dungeonRoom.getRoomProcessor()).cancel();
+        ((GeneralRoomProcessor) dungeonRoom.getRoomProcessor()).cancel("MECH-BROWSER");
     }
 
     public void toggleTooltip(boolean open) {