From cb20644145e9ecb507f6f9a8a3d6a8112a4242c8 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 29 Apr 2022 22:02:33 -0400 Subject: [PATCH 1/4] script assembler: remove runelite-api dependency --- runelite-script-assembler-plugin/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index b8b62e2855..82e41a0588 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -42,11 +42,6 @@ cache ${project.version} - - net.runelite - runelite-api - ${project.version} - org.apache.maven From d04a2616300ae3503476454b080df3821bb180b9 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 30 Apr 2022 10:03:43 -0400 Subject: [PATCH 2/4] maven: update surefire plugin to 2.22.2 --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index caa8603b00..1f9c442a4f 100644 --- a/pom.xml +++ b/pom.xml @@ -201,8 +201,7 @@ org.apache.maven.plugins maven-surefire-plugin - - 2.18 + 2.22.2 true -Xmx512m From 1c99cce336fa07452d60d90fa1f91db1e2932326 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 30 Apr 2022 12:16:28 -0400 Subject: [PATCH 3/4] loottracker: fix tracking imp jars event.getItemId() is not valid after the next tick, so can't be called in the inv change callback --- .../client/plugins/loottracker/LootTrackerPlugin.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java index 0ad15a2493..e518d189b1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java @@ -1016,12 +1016,13 @@ public class LootTrackerPlugin extends Plugin } else if (event.getMenuOption().equals("Loot") && IMPLING_JARS.contains(event.getItemId())) { + final int itemId = event.getItemId(); onInvChange(((invItems, groundItems, removedItems) -> { - int cnt = removedItems.count(event.getItemId()); + int cnt = removedItems.count(itemId); if (cnt > 0) { - String name = itemManager.getItemComposition(event.getItemId()).getName(); + String name = itemManager.getItemComposition(itemId).getName(); addLoot(name, -1, LootRecordType.EVENT, null, invItems, cnt); } })); From 1f5ca21546fbc8b015e12fac620ebaa39cb66520 Mon Sep 17 00:00:00 2001 From: EliasLahham Date: Sun, 3 Apr 2022 14:35:41 -0400 Subject: [PATCH 4/4] menu entry swapper: add house teleport swap This used to use the shift-click teleport spells option, but now that there are 4 different teleport spells, a dedicated swap config is best. Co-authored-by: Adam --- .../MenuEntrySwapperConfig.java | 34 +++++++++++++++++-- .../MenuEntrySwapperPlugin.java | 12 ++++++- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java index a2876384c0..b88af6f997 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.menuentryswapper; +import lombok.RequiredArgsConstructor; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; @@ -612,10 +613,38 @@ public interface MenuEntrySwapperConfig extends Config return true; } + @RequiredArgsConstructor + enum HouseTeleportMode + { + CAST("Cast"), + OUTSIDE("Outside"), + GROUP_CHOOSE("Group: Choose"), + GROUP_PREVIOUS("Group: Previous"); + + private final String name; + + @Override + public String toString() + { + return name; + } + } + + @ConfigItem( + keyName = "swapHouseTeleportSpell", + name = "House teleport", + description = "Swap house teleport spell to a different destination on shift", + section = uiSection + ) + default HouseTeleportMode swapHouseTeleportSpell() + { + return HouseTeleportMode.OUTSIDE; + } + @ConfigItem( keyName = "swapTeleportSpell", name = "Shift-click teleport spells", - description = "Swap teleport spells that have a second destination on shift", + description = "Swap teleport spells that have a second destination, except for teleport to house, on shift", section = uiSection ) default boolean swapTeleportSpell() @@ -659,8 +688,7 @@ public interface MenuEntrySwapperConfig extends Config @ConfigItem( keyName = "swapGEAbort", name = "GE Abort", - description = "Swap abort offer on Grand Exchange offers when shift-clicking" - , + description = "Swap abort offer on Grand Exchange offers when shift-clicking", section = uiSection ) default boolean swapGEAbort() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java index 032773a05b..c91cb7068f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java @@ -423,7 +423,11 @@ public class MenuEntrySwapperPlugin extends Plugin swapTeleport("varrock teleport", "grand exchange"); swapTeleport("camelot teleport", "seers'"); swapTeleport("watchtower teleport", "yanille"); - swapTeleport("teleport to house", "outside"); + + swapHouseTeleport("cast", () -> shiftModifier() && config.swapHouseTeleportSpell() == MenuEntrySwapperConfig.HouseTeleportMode.CAST); + swapHouseTeleport("outside", () -> shiftModifier() && config.swapHouseTeleportSpell() == MenuEntrySwapperConfig.HouseTeleportMode.OUTSIDE); + swapHouseTeleport("group: choose", () -> shiftModifier() && config.swapHouseTeleportSpell() == MenuEntrySwapperConfig.HouseTeleportMode.GROUP_CHOOSE); + swapHouseTeleport("group: previous", () -> shiftModifier() && config.swapHouseTeleportSpell() == MenuEntrySwapperConfig.HouseTeleportMode.GROUP_PREVIOUS); swap("eat", "guzzle", config::swapRockCake); @@ -459,6 +463,12 @@ public class MenuEntrySwapperPlugin extends Plugin swap(swappedOption, option, "cast", () -> shiftModifier() && config.swapTeleportSpell()); } + private void swapHouseTeleport(String swappedOption, Supplier enabled) + { + swap("cast", "teleport to house", swappedOption, enabled); + swap("outside", "teleport to house", swappedOption, enabled); + } + @Subscribe public void onConfigChanged(ConfigChanged event) {