From 62c0af064d308f54d0b6f6c9c0eed13dd4ca2507 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 29 Apr 2022 14:16:02 -0400 Subject: [PATCH 1/2] crowdsourcing: don't include menuoptionclicked event in movementdata Serializing the event no longer works as expected, but is also not a good idea in general --- .../crowdsourcing/movement/CrowdsourcingMovement.java | 4 +++- .../plugins/crowdsourcing/movement/MovementData.java | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/movement/CrowdsourcingMovement.java b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/movement/CrowdsourcingMovement.java index 7f21c2fda2..ecad37dc91 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/movement/CrowdsourcingMovement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/movement/CrowdsourcingMovement.java @@ -69,7 +69,9 @@ public class CrowdsourcingMovement int distance = nextPoint.distanceTo(lastPoint); if (distance > 2 || nextIsInInstance != lastIsInInstance) { - MovementData data = new MovementData(lastPoint, nextPoint, lastIsInInstance, nextIsInInstance, ticksStill, lastClick); + MovementData data = new MovementData(lastPoint, nextPoint, lastIsInInstance, nextIsInInstance, + ticksStill, lastClick.getMenuAction(), lastClick.getId(), lastClick.getMenuOption(), + lastClick.getMenuTarget(), lastClick.getParam0(), lastClick.getParam1()); manager.storeEvent(data); } if (distance > 0) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/movement/MovementData.java b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/movement/MovementData.java index 1b9c6aef9e..0ffbb9e477 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/movement/MovementData.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/movement/MovementData.java @@ -27,8 +27,8 @@ package net.runelite.client.plugins.crowdsourcing.movement; import lombok.AllArgsConstructor; import lombok.Data; +import net.runelite.api.MenuAction; import net.runelite.api.coords.WorldPoint; -import net.runelite.api.events.MenuOptionClicked; @Data @AllArgsConstructor @@ -39,5 +39,10 @@ public class MovementData private final boolean fromInstance; private final boolean toInstance; private final int ticks; - private MenuOptionClicked lastClick; + private MenuAction menuAction; + private int menuIdentifier; + private String menuOption; + private String menuTarget; + private int param0; + private int param1; } From a7c45ae401d94ab6343263ef16435faecb41e350 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Fri, 29 Apr 2022 11:45:08 -0700 Subject: [PATCH 2/2] HotColdLocation: Add South-east of Ruins of Ullek spot --- .../plugins/cluescrolls/clues/hotcold/HotColdLocation.java | 1 + 1 file changed, 1 insertion(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java index 48201d2701..d319defcbe 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java @@ -75,6 +75,7 @@ public enum HotColdLocation DESERT_UZER(MASTER, new WorldPoint(3432, 3105, 0), DESERT, "West of Uzer.", BRASSICAN_MAGE), DESERT_POLLNIVNEACH(MASTER, new WorldPoint(3288, 2976, 0), DESERT, "West of Pollnivneach.", BRASSICAN_MAGE), DESERT_MTA(MASTER, new WorldPoint(3347, 3295, 0), DESERT, "Next to Mage Training Arena.", BRASSICAN_MAGE), + DESERT_RUINS_OF_ULLEK(MASTER, new WorldPoint(3428, 2773, 0), DESERT, "South-east of Ruins of Ullek.", BRASSICAN_MAGE), DESERT_SHANTY(MASTER, new WorldPoint(3292, 3107, 0), DESERT, "South-west of Shantay Pass.", BRASSICAN_MAGE), DRAYNOR_MANOR_MUSHROOMS(BEGINNER, new WorldPoint(3096, 3379, 0), MISTHALIN, "Patch of mushrooms just northwest of Draynor Manor"), DRAYNOR_WHEAT_FIELD(BEGINNER, new WorldPoint(3120, 3282, 0), MISTHALIN, "Inside the wheat field next to Draynor Village"),