ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Update Scripts to 2021-11-24

Browse Source
This commit is contained in:
RuneLite Cache-Code Autoupdater
2021-11-23 07:50:23 -07:00
committed by Max Weber
parent 0b4976b87b
commit 084edbffb6
19 changed files with 1549 additions and 917 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
runelite-api/src/main/java/net/runelite/api/ScriptID.java
View File

@@ -40,12 +40,15 @@ public final class ScriptID
/** /**
* Sends a chat message * Sends a chat message
* <ul> * <ul>
* <li> int (byte) Flags </li>
* <li> String Message to send </li> * <li> String Message to send </li>
* <li> int modes </li>
* <li> int (clan type) </li>
* <li> int (boolean) use target</li>
* <li> int set target </li>
* </ul> * </ul>
*/ */
@ScriptArguments(integer = 1, string = 1) @ScriptArguments(integer = 4, string = 1)
public static final int CHATBOX_INPUT = 96; public static final int CHAT_SEND = 5517;
/** /**
* Rebuilds the chatbox and the pmbox * Rebuilds the chatbox and the pmbox

9
runelite-client/src/main/java/net/runelite/client/chat/CommandManager.java
View File

@@ -127,7 +127,8 @@ public class CommandManager
int intStackCount = client.getIntStackSize(); int intStackCount = client.getIntStackSize();
final String typedText = stringStack[stringStackCount - 1]; final String typedText = stringStack[stringStackCount - 1];
final int chatType = intStack[intStackCount - 1]; final int chatType = intStack[intStackCount - 2];
final int clanTarget = intStack[intStackCount - 1];
ChatboxInput chatboxInput = new ChatboxInput(typedText, chatType) ChatboxInput chatboxInput = new ChatboxInput(typedText, chatType)
{ {
@@ -142,7 +143,7 @@ public class CommandManager
} }
resumed = true; resumed = true;
clientThread.invoke(() -> sendChatboxInput(chatType, typedText)); clientThread.invoke(() -> sendChatboxInput(typedText, chatType, clanTarget));
} }
}; };
boolean stop = false; boolean stop = false;
@@ -198,12 +199,12 @@ public class CommandManager
} }
} }
private void sendChatboxInput(int chatType, String input) private void sendChatboxInput(String input, int chatType, int clanTarget)
{ {
sending = true; sending = true;
try try
{ {
client.runScript(ScriptID.CHATBOX_INPUT, chatType, input); client.runScript(ScriptID.CHAT_SEND, input, chatType, clanTarget, 0, -1);
} }
finally finally
{ {

6
runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java
View File

@@ -57,8 +57,6 @@ import net.runelite.client.util.ColorUtil;
public class KeyRemappingPlugin extends Plugin public class KeyRemappingPlugin extends Plugin
{ {
private static final String PRESS_ENTER_TO_CHAT = "Press Enter to Chat..."; private static final String PRESS_ENTER_TO_CHAT = "Press Enter to Chat...";
private static final String SCRIPT_EVENT_SET_CHATBOX_INPUT = "setChatboxInput";
private static final String SCRIPT_EVENT_BLOCK_CHAT_INPUT = "blockChatInput";
@Inject @Inject
private Client client; private Client client;
@@ -160,14 +158,14 @@ public class KeyRemappingPlugin extends Plugin
{ {
switch (scriptCallbackEvent.getEventName()) switch (scriptCallbackEvent.getEventName())
{ {
case SCRIPT_EVENT_SET_CHATBOX_INPUT: case "setChatboxInput":
Widget chatboxInput = client.getWidget(WidgetInfo.CHATBOX_INPUT); Widget chatboxInput = client.getWidget(WidgetInfo.CHATBOX_INPUT);
if (chatboxInput != null && !typing) if (chatboxInput != null && !typing)
{ {
setChatboxWidgetInput(chatboxInput, PRESS_ENTER_TO_CHAT); setChatboxWidgetInput(chatboxInput, PRESS_ENTER_TO_CHAT);
} }
break; break;
case SCRIPT_EVENT_BLOCK_CHAT_INPUT: case "blockChatInput":
if (!typing) if (!typing)
{ {
int[] intStack = client.getIntStack(); int[] intStack = client.getIntStack();

1
runelite-client/src/main/scripts/BankMainBuild.hash Normal file
View File

@@ -0,0 +1 @@
BEE152DE7559AA8A3BDBEEBAF06D800806DCC8A8936F86B18480CE4200010BF5

12
runelite-client/src/main/scripts/BankSearchLayout.rs2asm → runelite-client/src/main/scripts/BankMainBuild.rs2asm
View File

@@ -1,4 +1,4 @@
.id 277 ; [proc,bankmain_build] .id 277
.int_stack_count 17 .int_stack_count 17
.string_stack_count 0 .string_stack_count 0
.int_var_count 36 .int_var_count 36
@@ -265,9 +265,9 @@ LABEL225:
iload 3 iload 3
iload 2 iload 2
invoke 231 invoke 231
iconst 816 iconst 1200
istore 20 istore 20
iconst 816 iconst 1200
iconst 9 iconst 9
iconst 3 iconst 3
multiply multiply
@@ -341,7 +341,7 @@ LABEL253:
jump LABEL750 jump LABEL750
LABEL297: LABEL297:
iload 20 iload 20
iconst 816 iconst 1200
if_icmplt LABEL301 if_icmplt LABEL301
jump LABEL326 jump LABEL326
LABEL301: LABEL301:
@@ -398,7 +398,7 @@ LABEL326:
if_icmple LABEL348 if_icmple LABEL348
jump LABEL352 jump LABEL352
LABEL348: LABEL348:
iconst 816 iconst 1200
iconst 1 iconst 1
sub sub
istore 30 istore 30
@@ -868,7 +868,7 @@ LABEL758:
istore 35 istore 35
LABEL770: LABEL770:
iload 20 iload 20
iconst 816 iconst 1200
if_icmplt LABEL774 if_icmplt LABEL774
jump LABEL854 jump LABEL854
LABEL774: LABEL774:

1
runelite-client/src/main/scripts/BankSearchLayout.hash
View File

@@ -1 +0,0 @@
8F6EC040714CB55346C243DA8126FC74122F8300D808E5616CCC37FC767B38DF

2
runelite-client/src/main/scripts/ChatBuilder.hash
View File

@@ -1 +1 @@
09B4102BE45BA918A3B5D24F9DC1BF92925B15BEC9FAA67638AFB26DF13D8F88 7D5A3CB415DC8A5BA0477F0587693A394E13C7144DCA3E2F9AEEE559A40210E2

1203
runelite-client/src/main/scripts/ChatBuilder.rs2asm
View File

File diff suppressed because it is too large Load Diff

1
runelite-client/src/main/scripts/ChatSend.hash Normal file
View File

@@ -0,0 +1 @@
BF6EEA4353A596E6389BC0CCDB654CC28D11E809F92A59C0301557F6185690CD

159
runelite-client/src/main/scripts/ChatSend.rs2asm Normal file
View File

@@ -0,0 +1,159 @@
.id 5517
.int_stack_count 4
.string_stack_count 1
.int_var_count 4
.string_var_count 2
get_varbit 4394
iconst 1
if_icmpeq LABEL4
jump LABEL23
LABEL4:
iload 0
iconst 1
if_icmpeq LABEL8
jump LABEL16
LABEL8:
chat_playername
sconst ": "
sconst "<col=2020ef>"
sload 0
sconst "</col>"
join_string 5
mes
jump LABEL23
LABEL16:
chat_playername
sconst ": "
sconst "<col=0000ff>"
sload 0
sconst "</col>"
join_string 5
mes
LABEL23:
iload 3
iconst -1
if_icmpne LABEL27
jump LABEL33
LABEL27:
iload 3
iconst 4
if_icmple LABEL31
jump LABEL33
LABEL31:
iload 3
set_varc_int 945
LABEL33:
iload 2
iconst 1
if_icmpeq LABEL37
jump LABEL75
LABEL37:
get_varc_int 945
switch
1: LABEL40
2: LABEL61
3: LABEL66
4: LABEL71
jump LABEL75
LABEL40:
iconst 2
istore 0
sload 0
string_length
iconst 0
if_icmpgt LABEL47
jump LABEL60
LABEL47:
sload 0
iconst 0
iconst 1
substring
sconst "/"
compare
iconst 1
if_icmpeq LABEL56
jump LABEL60
LABEL56:
sconst "/"
sload 0
append
sstore 0
LABEL60:
jump LABEL75
LABEL61:
iconst 3
iconst 0
istore 1
istore 0
jump LABEL75
LABEL66:
iconst 4
iconst 0
istore 1
istore 0
jump LABEL75
LABEL71:
iconst 3
iconst 1
istore 1
istore 0
LABEL75:
sload 0 ; load input
iload 0 ; load chat type
iload 1 ; load clan target
sconst "chatboxInput" ; event name
runelite_callback ; invoke callback
pop_int ; pop clan target
pop_int ; pop chat type
string_length ; get string length of chat message
iconst 0 ; load 0
if_icmpne CONTINUE ; if length is not 0, continue
return
CONTINUE:
sconst ""
sstore 1
iload 0
iconst 2
if_icmpeq LABEL87
iload 0
iconst 3
if_icmpeq LABEL87
iload 0
iconst 4
if_icmpeq LABEL87
jump LABEL109
LABEL87:
sload 0
invoke 5501
iconst 1
if_icmpeq LABEL92
jump LABEL96
LABEL92:
sload 0
invoke 632
sstore 0
sstore 1
LABEL96:
iload 1
iconst 1
if_icmpeq LABEL100
jump LABEL104
LABEL100:
sconst "|"
sload 0
append
sstore 0
LABEL104:
sload 0
iload 0
iload 1
chat_sendclan
jump LABEL112
LABEL109:
sload 0
iload 0
chat_sendpublic
LABEL112:
clientclock
set_varc_int 61
return

6
runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm
View File

@@ -381,7 +381,7 @@ LABEL344:
jump LABEL566 jump LABEL566
LABEL350: LABEL350:
iload 12 iload 12
chat_gethistoryex_byuid 5031
istore 15 istore 15
sstore 2 ; timestamp sstore 2 ; timestamp
istore 14 istore 14
@@ -413,11 +413,11 @@ CHAT_FILTER:
jump LABEL562 jump LABEL562
LABEL368: LABEL368:
iload 12 ; message uid iload 12 ; message uid
sload 2 ; message timestamp sload 2 ; message timestamp
sconst "chatMessageBuilding" sconst "chatMessageBuilding"
runelite_callback runelite_callback
pop_int pop_int
sstore 2 ; message timestamp sstore 2 ; message timestamp
iload 18 iload 18
switch switch
3: LABEL371 3: LABEL371

1
runelite-client/src/main/scripts/ChatboxInput.hash
View File

@@ -1 +0,0 @@
F7D45F13B835E5F5B889D4ECF3A4A61829794BAB447B7FFE676B19659238DAA9

65
runelite-client/src/main/scripts/ChatboxInput.rs2asm
View File

@@ -1,65 +0,0 @@
.id 96
.int_stack_count 1
.string_stack_count 1
.int_var_count 1
.string_var_count 1
sload 0 ; load input
iload 0 ; load chat type
sconst "chatboxInput" ; event name
runelite_callback ; invoke callback
pop_int ; pop chat type
string_length ; get string length of chat message
iconst 0 ; load 0
if_icmpne CONTINUE ; if length is not 0, continue
return
CONTINUE:
get_varbit 4394
iconst 1
if_icmpeq LABEL4
jump LABEL24
LABEL4:
iload 0
iconst 1
if_icmpeq LABEL8
jump LABEL16
LABEL8:
chat_playername
sconst ": "
sconst "<col=2020ef>"
sload 0
sconst "</col>"
join_string 5
mes
jump LABEL23
LABEL16:
chat_playername
sconst ": "
sconst "<col=0000ff>"
sload 0
sconst "</col>"
join_string 5
mes
LABEL23:
jump LABEL39
LABEL24:
iload 0
iconst 3
if_icmpeq LABEL31
iload 0
iconst 4
if_icmpeq LABEL31
jump LABEL36
LABEL31:
sload 0
iload 0
iconst 0
chat_sendclan
jump LABEL39
LABEL36:
sload 0
iload 0
chat_sendpublic
LABEL39:
clientclock
set_varc_int 61
return

2
runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash
View File

@@ -1 +1 @@
F62AC1D5CB6A0C94DFCAEB8E4DC62E3513D0A757CADFDE2B1FF4418AF18AE841 E4001956B7EAAB914D97C392358D20A95B1EFD929278D8CBC380C7354418D345

100
runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm
View File

@@ -47,7 +47,7 @@ LABEL23:
get_varbit 8119 get_varbit 8119
iconst 1 iconst 1
if_icmpeq LABEL42 if_icmpeq LABEL42
jump LABEL155 jump LABEL184
LABEL42: LABEL42:
invoke 3160 invoke 3160
iconst 1 iconst 1
@@ -69,16 +69,56 @@ LABEL51:
join_string 2 join_string 2
sstore 2 sstore 2
LABEL59: LABEL59:
get_varc_int 945
switch
1: LABEL62
2: LABEL67
3: LABEL72
4: LABEL77
jump LABEL88
LABEL62:
sload 2
sconst " (channel)"
append
sstore 2
jump LABEL88
LABEL67:
sload 2
sconst " (clan)"
append
sstore 2
jump LABEL88
LABEL72:
sload 2
sconst " (guest clan)"
append
sstore 2
jump LABEL88
LABEL77:
invoke 5262
iconst 1
if_icmpeq LABEL81
jump LABEL86
LABEL81:
sload 2
sconst " (group)"
append
sstore 2
jump LABEL88
LABEL86:
iconst 0
set_varc_int 945
LABEL88:
iload 4 iload 4
iconst 1 iconst 1
if_icmpeq LABEL63 if_icmpeq LABEL92
jump LABEL67 jump LABEL96
LABEL63: LABEL92:
sload 2 sload 2
sconst "<img=19>" sconst "<img=19>"
append append
sstore 2 sstore 2
LABEL67: LABEL96:
sload 2 sload 2
sconst ": " sconst ": "
sload 0 sload 0
@@ -89,9 +129,9 @@ LABEL67:
sstore 2 sstore 2
iload 2 iload 2
iconst 80 iconst 80
if_icmplt LABEL79 if_icmplt LABEL108
jump LABEL86 jump LABEL115
LABEL79: LABEL108:
sload 2 sload 2
sload 0 sload 0
sconst "*" sconst "*"
@@ -99,7 +139,7 @@ LABEL79:
join_string 3 join_string 3
append append
sstore 2 sstore 2
LABEL86: LABEL115:
sload 2 sload 2
iconst 2147483647 iconst 2147483647
iconst 495 iconst 495
@@ -107,9 +147,9 @@ LABEL86:
istore 3 istore 3
iload 4 iload 4
iconst 1 iconst 1
if_icmpeq LABEL95 if_icmpeq LABEL124
jump LABEL112 jump LABEL141
LABEL95: LABEL124:
iconst 60 iconst 60
iconst 5 iconst 5
iload 3 iload 3
@@ -126,8 +166,8 @@ LABEL95:
iconst 2 iconst 2
iconst 10616868 iconst 10616868
if_setposition if_setposition
jump LABEL124 jump LABEL153
LABEL112: LABEL141:
iconst 0 iconst 0
iconst 30 iconst 30
iconst 0 iconst 0
@@ -140,26 +180,26 @@ LABEL112:
iconst 2 iconst 2
iconst 10616868 iconst 10616868
if_setposition if_setposition
LABEL124: LABEL153:
iload 3 iload 3
iconst 10616887 iconst 10616887
if_getwidth if_getwidth
if_icmpgt LABEL129 if_icmpgt LABEL158
jump LABEL135 jump LABEL164
LABEL129: LABEL158:
iconst 2 iconst 2
iconst 2 iconst 2
iconst 0 iconst 0
iconst 10616887 iconst 10616887
if_settextalign if_settextalign
jump LABEL140 jump LABEL169
LABEL135: LABEL164:
iconst 0 iconst 0
iconst 2 iconst 2
iconst 0 iconst 0
iconst 10616887 iconst 10616887
if_settextalign if_settextalign
LABEL140: LABEL169:
iconst 10616887 iconst 10616887
if_clearops if_clearops
iconst -1 iconst -1
@@ -174,19 +214,19 @@ LABEL140:
sconst "" sconst ""
iconst 10616887 iconst 10616887
if_setonop if_setonop
jump LABEL205 jump LABEL234
LABEL155: LABEL184:
invoke 3160 invoke 3160
iconst 1 iconst 1
if_icmpeq LABEL159 if_icmpeq LABEL188
jump LABEL164 jump LABEL193
LABEL159: LABEL188:
sconst "<img=22>" sconst "<img=22>"
sconst " You must set a name before you can chat." sconst " You must set a name before you can chat."
join_string 2 join_string 2
sstore 2 sstore 2
jump LABEL172 jump LABEL201
LABEL164: LABEL193:
iconst 105 iconst 105
iconst 115 iconst 115
iconst 1894 iconst 1894
@@ -195,7 +235,7 @@ LABEL164:
sconst " You must set a name before you can chat." sconst " You must set a name before you can chat."
join_string 2 join_string 2
sstore 2 sstore 2
LABEL172: LABEL201:
iconst 1 iconst 1
iconst 2 iconst 2
iconst 0 iconst 0
@@ -229,7 +269,7 @@ LABEL172:
sconst "ii" sconst "ii"
iconst 10616887 iconst 10616887
if_setonop if_setonop
LABEL205: LABEL234:
sload 2 sload 2
iconst 10616887 iconst 10616887
if_settext if_settext

2
runelite-client/src/main/scripts/CommandScript.hash
View File

@@ -1 +1 @@
9D5F23C8B25B79FF2B23F6AE449EDF74645E808B67ECF0E389B626966E86B1BD 725BA34A3D0891309D6CC3A6E7AD9AEAB331BC08E1E312606E846C607F820519

878
runelite-client/src/main/scripts/CommandScript.rs2asm
View File

File diff suppressed because it is too large Load Diff

2
runelite-client/src/main/scripts/FriendsChatSendKick.hash
View File

@@ -1 +1 @@
5A68D15CBC52892CD84A0961CC0D5A84B653B4320F0AA3B11E80EE0D2126B584 2B0FFE1ECCE5F46FFA036D3BD2CEC46530410E5DE7B2F688A2C22D75706A7089

5
runelite-client/src/main/scripts/FriendsChatSendKick.rs2asm
View File

@@ -18,7 +18,10 @@ LABEL4:
LABEL7: LABEL7:
sconst "-Attempting to kick player from chat-channel..." sconst "-Attempting to kick player from chat-channel..."
iconst 2 iconst 2
invoke 96 iconst -1
iconst 0
iconst -1
invoke 5517
sload 0 sload 0
clan_kickuser clan_kickuser
RETURN: RETURN: