From da321c5983397b8ef37b8fc9b9b5662d418cfc49 Mon Sep 17 00:00:00 2001 From: Lucas Date: Tue, 21 May 2019 05:12:57 +0200 Subject: [PATCH] Use custom script to join cc, so 437 is still there for minigames --- .../main/java/net/runelite/api/ScriptID.java | 12 +++--- .../plugins/clanchat/ClanChatPlugin.java | 2 +- runelite-client/src/main/scripts/437.hash | 1 - runelite-client/src/main/scripts/437.rs2asm | 11 ------ .../src/main/scripts/CustomJoinClan.rs2asm | 38 +++++++++++++++++++ 5 files changed, 46 insertions(+), 18 deletions(-) delete mode 100644 runelite-client/src/main/scripts/437.hash delete mode 100644 runelite-client/src/main/scripts/437.rs2asm create mode 100644 runelite-client/src/main/scripts/CustomJoinClan.rs2asm diff --git a/runelite-api/src/main/java/net/runelite/api/ScriptID.java b/runelite-api/src/main/java/net/runelite/api/ScriptID.java index 24340aab4e..a5750481c0 100644 --- a/runelite-api/src/main/java/net/runelite/api/ScriptID.java +++ b/runelite-api/src/main/java/net/runelite/api/ScriptID.java @@ -96,11 +96,7 @@ public final class ScriptID public static final int CHAT_PROMPT_INIT = 223; /** - * Joins a clan chat - * - * + * Joins the corresponding minigame chat */ public static final int FORCE_JOIN_CC = 437; @@ -175,4 +171,10 @@ public final class ScriptID * */ public static final int XPDROP_DISABLED = 2091; + + + /** + * Join a clan, duh + */ + public static final int CUSTOM_JOIN_CLAN = 10690; } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java index a8403c65d5..033ea8c1e5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java @@ -568,7 +568,7 @@ public class ClanChatPlugin extends Plugin widget.setTextShadowed(true); widget.setBorderType(1); widget.setAction(0, "Join"); - widget.setOnOpListener(ScriptID.FORCE_JOIN_CC, widget.getText()); + widget.setOnOpListener(ScriptID.CUSTOM_JOIN_CLAN, widget.getText()); widget.setOriginalHeight(14); widget.setOriginalWidth(142); widget.setOriginalY(y); diff --git a/runelite-client/src/main/scripts/437.hash b/runelite-client/src/main/scripts/437.hash deleted file mode 100644 index 22831dda47..0000000000 --- a/runelite-client/src/main/scripts/437.hash +++ /dev/null @@ -1 +0,0 @@ -3A111DACE3611F4C4FB53F60FC180F863D5FC222D24EE301B08D49496658F802 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/437.rs2asm b/runelite-client/src/main/scripts/437.rs2asm deleted file mode 100644 index d5cf4b8ae3..0000000000 --- a/runelite-client/src/main/scripts/437.rs2asm +++ /dev/null @@ -1,11 +0,0 @@ -.id 437 -.int_stack_count 1 -.string_stack_count 0 -.int_var_count 1 -.string_var_count 1 - sload 0 - clan_joinchat - sconst "joinCC" - runelite_callback - return - diff --git a/runelite-client/src/main/scripts/CustomJoinClan.rs2asm b/runelite-client/src/main/scripts/CustomJoinClan.rs2asm new file mode 100644 index 0000000000..cf7438a186 --- /dev/null +++ b/runelite-client/src/main/scripts/CustomJoinClan.rs2asm @@ -0,0 +1,38 @@ +;;; +; +; Copyright (c) 2019, Lucas +; All rights reserved. +; +; Redistribution and use in source and binary forms, with or without +; modification, are permitted provided that the following conditions are met: +; +; 1. Redistributions of source code must retain the above copyright notice, this +; list of conditions and the following disclaimer. +; 2. Redistributions in binary form must reproduce the above copyright notice, +; this list of conditions and the following disclaimer in the documentation +; and/or other materials provided with the distribution. +; +; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +; ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +; WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +; DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +; ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +; (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +; ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +; +;;;;;;;;;;;;;;; +; ; +; Join a cc ; +; ; +;;;;;;;;;;;;;;; +.id 10690 +.int_stack_count 0 +.string_stack_count 1 +.int_var_count 0 +.string_var_count 1 + sload 0 + clan_joinchat + return \ No newline at end of file