From d533285a32b99b29930698cbee5c0a4059a24194 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 21 Apr 2022 08:50:09 -0400 Subject: [PATCH 1/5] timers: update for if3 inv --- .../client/plugins/timers/TimersPlugin.java | 110 +++++++++--------- 1 file changed, 56 insertions(+), 54 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index 528aeadf6e..4b4be20c74 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -45,6 +45,7 @@ import net.runelite.api.ItemContainer; import net.runelite.api.ItemID; import static net.runelite.api.ItemID.FIRE_CAPE; import static net.runelite.api.ItemID.INFERNAL_CAPE; +import net.runelite.api.MenuAction; import net.runelite.api.NPC; import net.runelite.api.NpcID; import net.runelite.api.Player; @@ -439,64 +440,65 @@ public class TimersPlugin extends Plugin @Subscribe public void onMenuOptionClicked(MenuOptionClicked event) { - if (config.showStamina() - && event.getMenuOption().contains("Drink") - && (event.getId() == ItemID.STAMINA_MIX1 - || event.getId() == ItemID.STAMINA_MIX2 - || event.getId() == ItemID.EGNIOL_POTION_1 - || event.getId() == ItemID.EGNIOL_POTION_2 - || event.getId() == ItemID.EGNIOL_POTION_3 - || event.getId() == ItemID.EGNIOL_POTION_4)) + if (event.isItemOp() && event.getMenuOption().equals("Drink")) { - // Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages - createStaminaTimer(); - return; + if ((event.getItemId() == ItemID.STAMINA_MIX1 + || event.getItemId() == ItemID.STAMINA_MIX2 + || event.getItemId() == ItemID.EGNIOL_POTION_1 + || event.getItemId() == ItemID.EGNIOL_POTION_2 + || event.getItemId() == ItemID.EGNIOL_POTION_3 + || event.getItemId() == ItemID.EGNIOL_POTION_4) + && config.showStamina()) + { + // Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages + createStaminaTimer(); + return; + } + + if ((event.getItemId() == ItemID.ANTIFIRE_MIX1 + || event.getItemId() == ItemID.ANTIFIRE_MIX2) + && config.showAntiFire()) + { + // Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages + createGameTimer(ANTIFIRE); + return; + } + + if ((event.getItemId() == ItemID.EXTENDED_ANTIFIRE_MIX1 + || event.getItemId() == ItemID.EXTENDED_ANTIFIRE_MIX2) + && config.showAntiFire()) + { + // Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages + createGameTimer(EXANTIFIRE); + return; + } + + if ((event.getItemId() == ItemID.SUPER_ANTIFIRE_MIX1 + || event.getItemId() == ItemID.SUPER_ANTIFIRE_MIX2) + && config.showAntiFire()) + { + // Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages + createGameTimer(SUPERANTIFIRE); + return; + } + + if ((event.getItemId() == ItemID.EXTENDED_SUPER_ANTIFIRE_MIX1 + || event.getItemId() == ItemID.EXTENDED_SUPER_ANTIFIRE_MIX2) + && config.showAntiFire()) + { + // Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages + createGameTimer(EXSUPERANTIFIRE); + return; + } } - if (config.showAntiFire() - && event.getMenuOption().contains("Drink") - && (event.getId() == ItemID.ANTIFIRE_MIX1 - || event.getId() == ItemID.ANTIFIRE_MIX2)) + if (event.getMenuAction() == MenuAction.CC_OP) { - // Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages - createGameTimer(ANTIFIRE); - return; - } - - if (config.showAntiFire() - && event.getMenuOption().contains("Drink") - && (event.getId() == ItemID.EXTENDED_ANTIFIRE_MIX1 - || event.getId() == ItemID.EXTENDED_ANTIFIRE_MIX2)) - { - // Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages - createGameTimer(EXANTIFIRE); - return; - } - - if (config.showAntiFire() - && event.getMenuOption().contains("Drink") - && (event.getId() == ItemID.SUPER_ANTIFIRE_MIX1 - || event.getId() == ItemID.SUPER_ANTIFIRE_MIX2)) - { - // Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages - createGameTimer(SUPERANTIFIRE); - return; - } - - if (config.showAntiFire() - && event.getMenuOption().contains("Drink") - && (event.getId() == ItemID.EXTENDED_SUPER_ANTIFIRE_MIX1 - || event.getId() == ItemID.EXTENDED_SUPER_ANTIFIRE_MIX2)) - { - // Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages - createGameTimer(EXSUPERANTIFIRE); - return; - } - - TeleportWidget teleportWidget = TeleportWidget.of(event.getParam1()); - if (teleportWidget != null) - { - lastTeleportClicked = teleportWidget; + TeleportWidget teleportWidget = TeleportWidget.of(event.getParam1()); + if (teleportWidget != null) + { + lastTeleportClicked = teleportWidget; + } } } From f8e754b62f561b5718808de679c26d94c1ccdc71 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 21 Apr 2022 09:24:31 -0400 Subject: [PATCH 2/5] examine: fix item examine message recolor --- .../client/plugins/examine/ExaminePlugin.java | 4 +- .../src/main/scripts/ExamineItem.hash | 1 + .../src/main/scripts/ExamineItem.rs2asm | 49 +++++++++++++++++++ 3 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 runelite-client/src/main/scripts/ExamineItem.hash create mode 100644 runelite-client/src/main/scripts/ExamineItem.rs2asm diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java index eaddfaf4a0..66323a1ca5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java @@ -162,9 +162,6 @@ public class ExaminePlugin extends Plugin ExamineType type; switch (event.getType()) { - case ITEM_EXAMINE: - type = ExamineType.ITEM; - break; case OBJECT_EXAMINE: type = ExamineType.OBJECT; break; @@ -172,6 +169,7 @@ public class ExaminePlugin extends Plugin type = ExamineType.NPC; break; case GAMEMESSAGE: + case ITEM_EXAMINE: // these are spoofed by us from a [proc,examine_item] script edit type = ExamineType.IF3_ITEM; break; default: diff --git a/runelite-client/src/main/scripts/ExamineItem.hash b/runelite-client/src/main/scripts/ExamineItem.hash new file mode 100644 index 0000000000..d85bef7f59 --- /dev/null +++ b/runelite-client/src/main/scripts/ExamineItem.hash @@ -0,0 +1 @@ +DEC91CFC6FBA0B927EE291A372CFE618232170A27CF96EEADAD29D1D4B761A82 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ExamineItem.rs2asm b/runelite-client/src/main/scripts/ExamineItem.rs2asm new file mode 100644 index 0000000000..f058652d00 --- /dev/null +++ b/runelite-client/src/main/scripts/ExamineItem.rs2asm @@ -0,0 +1,49 @@ +.id 6004 +.int_stack_count 7 +.string_stack_count 1 +.int_var_count 7 +.string_var_count 1 + iload 1 + iconst 100000 + if_icmpge LABEL4 + jump LABEL23 +LABEL4: + iload 1 + sconst "," + invoke 46 + sconst " x " + iload 0 + oc_name + sconst "." + join_string 4 + iconst 27 ; ITEM_EXAMINE + sconst "mes" + runelite_callback + ; ehc examine info + ;iload 0 + ;iload 1 + ;iconst 0 + ;iload 2 + ;iload 3 + ;iload 4 + ;iload 5 + ;iload 6 + ;invoke 6005 + jump LABEL34 +LABEL23: + sload 0 + iconst 27 ; ITEM_EXAMINE + sconst "mes" + runelite_callback + ; ehc examine info + ;iload 0 + ;iload 1 + ;iconst 1 + ;iload 2 + ;iload 3 + ;iload 4 + ;iload 5 + ;iload 6 + ;invoke 6005 +LABEL34: + return From 20d256647127de6cbe533588cdcdb2c45adb0be2 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 21 Apr 2022 10:27:58 -0400 Subject: [PATCH 3/5] interact highlight: fix using npc attack color on item use --- .../plugins/interacthighlight/InteractHighlightOverlay.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interacthighlight/InteractHighlightOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/interacthighlight/InteractHighlightOverlay.java index e356939801..aa38a95ab6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/interacthighlight/InteractHighlightOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/interacthighlight/InteractHighlightOverlay.java @@ -35,6 +35,8 @@ import net.runelite.api.MenuEntry; import net.runelite.api.NPC; import net.runelite.api.Point; import net.runelite.api.TileObject; +import net.runelite.api.widgets.WidgetID; +import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; @@ -116,7 +118,8 @@ class InteractHighlightOverlay extends Overlay NPC npc = plugin.findNpc(id); if (npc != null && config.npcShowHover() && (npc != plugin.getInteractedTarget() || !config.npcShowInteract())) { - Color highlightColor = menuAction == MenuAction.NPC_SECOND_OPTION || menuAction == MenuAction.WIDGET_TARGET_ON_NPC + Color highlightColor = menuAction == MenuAction.NPC_SECOND_OPTION + || menuAction == MenuAction.WIDGET_TARGET_ON_NPC && WidgetInfo.TO_GROUP(client.getSelectedWidget().getId()) == WidgetID.SPELLBOOK_GROUP_ID ? config.npcAttackHoverHighlightColor() : config.npcHoverHighlightColor(); modelOutlineRenderer.drawOutline(npc, config.borderWidth(), highlightColor, config.outlineFeather()); } From c9734026bdbf70ba46c432696406563cd0587ce1 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Fri, 22 Apr 2022 09:16:03 +0000 Subject: [PATCH 4/5] Update 204.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c32b9cc8dc..caa8603b00 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ true - 204 + 204.6 From a299ea1d3ad3ca7b6dbb416f9fd697143391bf58 Mon Sep 17 00:00:00 2001 From: JumpIfZero Date: Fri, 22 Apr 2022 13:04:54 +0300 Subject: [PATCH 5/5] project: bump RL version --- buildSrc/src/main/kotlin/Dependencies.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index ea23768b4d..026aebf965 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -25,7 +25,7 @@ object ProjectVersions { const val launcherVersion = "2.2.0" - const val rlVersion = "1.8.18.1" + const val rlVersion = "1.8.18.2" const val openosrsVersion = "4.25.0"