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

Merge pull request #2996 from Owain94/upstream-0306

Browse Source
This commit is contained in:
Owain van Brakel
2021-06-03 16:16:41 +02:00
committed by GitHub
parent 5410da4bd9 51598df279
commit 76b48e2771
14 changed files with 885 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/Dependencies.kt
+2 -2
View File
@@ -25,9 +25,9 @@
object ProjectVersions {
const val launcherVersion = "2.2.0"
const val rlVersion = "1.7.10"
const val rlVersion = "1.7.11"
const val openosrsVersion = "4.8.0"
const val openosrsVersion = "4.8.1"
const val rsversion = 196.2
const val cacheversion = 165
runelite-api/src/main/java/net/runelite/api/ItemID.java
+17
View File
@@ -11878,5 +11878,22 @@ public final class ItemID
public static final int CLAN_VEXILLUM_25727 = 25727;
public static final int CLAN_VEXILLUM_25728 = 25728;
public static final int CLAN_VEXILLUM_25729 = 25729;
public static final int BANDAGES_25730 = 25730;
public static final int HOLY_SANGUINESTI_STAFF = 25731;
public static final int HOLY_SANGUINESTI_STAFF_UNCHARGED = 25733;
public static final int HOLY_GHRAZI_RAPIER = 25734;
public static final int HOLY_SCYTHE_OF_VITUR = 25736;
public static final int HOLY_SCYTHE_OF_VITUR_UNCHARGED = 25738;
public static final int SANGUINE_SCYTHE_OF_VITUR = 25739;
public static final int SANGUINE_SCYTHE_OF_VITUR_UNCHARGED = 25741;
public static final int HOLY_ORNAMENT_KIT = 25742;
public static final int SANGUINE_ORNAMENT_KIT = 25744;
public static final int SANGUINE_DUST = 25746;
public static final int LIL_MAIDEN = 25748;
public static final int LIL_BLOAT = 25749;
public static final int LIL_NYLO = 25750;
public static final int LIL_SOT = 25751;
public static final int LIL_XARP = 25752;
public static final int ANTIQUE_LAMP_25753 = 25753;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NpcID.java
+111 -1
View File
@@ -7481,7 +7481,6 @@ public final class NpcID
public static final int BANKER_8322 = 8322;
public static final int VYRE_ORATOR = 8323;
public static final int VYRE_ORATOR_8324 = 8324;
public static final int MYSTERIOUS_STRANGER_8325 = 8325;
public static final int VAMPYRE_JUVENILE_8326 = 8326;
public static final int VAMPYRE_JUVENILE_8327 = 8327;
public static final int MEIYERDITCH_CITIZEN_8328 = 8328;
@@ -9095,5 +9094,116 @@ public final class NpcID
public static final int GARDENER_JAY_JR_10758 = 10758;
public static final int CLERK_10759 = 10759;
public static final int STRAY_DOG_10760 = 10760;
public static final int LIL_MAIDEN = 10761;
public static final int LIL_BLOAT = 10762;
public static final int LIL_NYLO = 10763;
public static final int LIL_SOT = 10764;
public static final int LIL_XARP = 10765;
public static final int XARPUS_10766 = 10766;
public static final int XARPUS_10767 = 10767;
public static final int XARPUS_10768 = 10768;
public static final int XARPUS_10769 = 10769;
public static final int XARPUS_10770 = 10770;
public static final int XARPUS_10771 = 10771;
public static final int XARPUS_10772 = 10772;
public static final int XARPUS_10773 = 10773;
public static final int NYLOCAS_ISCHYROS_10774 = 10774;
public static final int NYLOCAS_TOXOBOLOS_10775 = 10775;
public static final int NYLOCAS_HAGIOS_10776 = 10776;
public static final int NYLOCAS_ISCHYROS_10777 = 10777;
public static final int NYLOCAS_TOXOBOLOS_10778 = 10778;
public static final int NYLOCAS_HAGIOS_10779 = 10779;
public static final int NYLOCAS_ISCHYROS_10780 = 10780;
public static final int NYLOCAS_TOXOBOLOS_10781 = 10781;
public static final int NYLOCAS_HAGIOS_10782 = 10782;
public static final int NYLOCAS_ISCHYROS_10783 = 10783;
public static final int NYLOCAS_TOXOBOLOS_10784 = 10784;
public static final int NYLOCAS_HAGIOS_10785 = 10785;
public static final int NYLOCAS_VASILIAS_10786 = 10786;
public static final int NYLOCAS_VASILIAS_10787 = 10787;
public static final int NYLOCAS_VASILIAS_10788 = 10788;
public static final int NYLOCAS_VASILIAS_10789 = 10789;
public static final int NYLOCAS_ISCHYROS_10791 = 10791;
public static final int NYLOCAS_TOXOBOLOS_10792 = 10792;
public static final int NYLOCAS_HAGIOS_10793 = 10793;
public static final int NYLOCAS_ISCHYROS_10794 = 10794;
public static final int NYLOCAS_TOXOBOLOS_10795 = 10795;
public static final int NYLOCAS_HAGIOS_10796 = 10796;
public static final int NYLOCAS_ISCHYROS_10797 = 10797;
public static final int NYLOCAS_TOXOBOLOS_10798 = 10798;
public static final int NYLOCAS_HAGIOS_10799 = 10799;
public static final int NYLOCAS_ISCHYROS_10800 = 10800;
public static final int NYLOCAS_TOXOBOLOS_10801 = 10801;
public static final int NYLOCAS_HAGIOS_10802 = 10802;
public static final int NYLOCAS_PRINKIPAS = 10803;
public static final int NYLOCAS_PRINKIPAS_10804 = 10804;
public static final int NYLOCAS_PRINKIPAS_10805 = 10805;
public static final int NYLOCAS_PRINKIPAS_10806 = 10806;
public static final int NYLOCAS_VASILIAS_10807 = 10807;
public static final int NYLOCAS_VASILIAS_10808 = 10808;
public static final int NYLOCAS_VASILIAS_10809 = 10809;
public static final int NYLOCAS_VASILIAS_10810 = 10810;
public static final int PESTILENT_BLOAT_10812 = 10812;
public static final int PESTILENT_BLOAT_10813 = 10813;
public static final int THE_MAIDEN_OF_SUGADINTI_10814 = 10814;
public static final int THE_MAIDEN_OF_SUGADINTI_10815 = 10815;
public static final int THE_MAIDEN_OF_SUGADINTI_10816 = 10816;
public static final int THE_MAIDEN_OF_SUGADINTI_10817 = 10817;
public static final int THE_MAIDEN_OF_SUGADINTI_10818 = 10818;
public static final int THE_MAIDEN_OF_SUGADINTI_10819 = 10819;
public static final int NYLOCAS_MATOMENOS_10820 = 10820;
public static final int BLOOD_SPAWN_10821 = 10821;
public static final int THE_MAIDEN_OF_SUGADINTI_10822 = 10822;
public static final int THE_MAIDEN_OF_SUGADINTI_10823 = 10823;
public static final int THE_MAIDEN_OF_SUGADINTI_10824 = 10824;
public static final int THE_MAIDEN_OF_SUGADINTI_10825 = 10825;
public static final int THE_MAIDEN_OF_SUGADINTI_10826 = 10826;
public static final int THE_MAIDEN_OF_SUGADINTI_10827 = 10827;
public static final int NYLOCAS_MATOMENOS_10828 = 10828;
public static final int BLOOD_SPAWN_10829 = 10829;
public static final int VERZIK_VITUR_10830 = 10830;
public static final int VERZIK_VITUR_10831 = 10831;
public static final int VERZIK_VITUR_10832 = 10832;
public static final int VERZIK_VITUR_10833 = 10833;
public static final int VERZIK_VITUR_10834 = 10834;
public static final int VERZIK_VITUR_10835 = 10835;
public static final int VERZIK_VITUR_10836 = 10836;
public static final int WEB_10837 = 10837;
public static final int COLLAPSING_PILLAR_10838 = 10838;
public static final int COLLAPSING_PILLAR_10839 = 10839;
public static final int SUPPORTING_PILLAR_10840 = 10840;
public static final int NYLOCAS_ISCHYROS_10841 = 10841;
public static final int NYLOCAS_TOXOBOLOS_10842 = 10842;
public static final int NYLOCAS_HAGIOS_10843 = 10843;
public static final int NYLOCAS_ATHANATOS_10844 = 10844;
public static final int NYLOCAS_MATOMENOS_10845 = 10845;
public static final int VERZIK_VITUR_10847 = 10847;
public static final int VERZIK_VITUR_10848 = 10848;
public static final int VERZIK_VITUR_10849 = 10849;
public static final int VERZIK_VITUR_10850 = 10850;
public static final int VERZIK_VITUR_10851 = 10851;
public static final int VERZIK_VITUR_10852 = 10852;
public static final int VERZIK_VITUR_10853 = 10853;
public static final int WEB_10854 = 10854;
public static final int COLLAPSING_PILLAR_10855 = 10855;
public static final int COLLAPSING_PILLAR_10856 = 10856;
public static final int SUPPORTING_PILLAR_10857 = 10857;
public static final int NYLOCAS_ISCHYROS_10858 = 10858;
public static final int NYLOCAS_TOXOBOLOS_10859 = 10859;
public static final int NYLOCAS_HAGIOS_10860 = 10860;
public static final int NYLOCAS_ATHANATOS_10861 = 10861;
public static final int NYLOCAS_MATOMENOS_10862 = 10862;
public static final int SOTETSEG_10864 = 10864;
public static final int SOTETSEG_10865 = 10865;
public static final int SOTETSEG_10867 = 10867;
public static final int SOTETSEG_10868 = 10868;
public static final int LIL_MAIDEN_10870 = 10870;
public static final int LIL_BLOAT_10871 = 10871;
public static final int LIL_NYLO_10872 = 10872;
public static final int LIL_SOT_10873 = 10873;
public static final int LIL_XARP_10874 = 10874;
public static final int MYSTERIOUS_STRANGER_10875 = 10875;
public static final int MYSTERIOUS_STRANGER_10876 = 10876;
public static final int MYSTERIOUS_STRANGER_10877 = 10877;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+7
View File
@@ -13641,5 +13641,12 @@ public final class NullItemID
public static final int NULL_25709 = 25709;
public static final int NULL_25713 = 25713;
public static final int NULL_25722 = 25722;
public static final int NULL_25732 = 25732;
public static final int NULL_25735 = 25735;
public static final int NULL_25737 = 25737;
public static final int NULL_25740 = 25740;
public static final int NULL_25743 = 25743;
public static final int NULL_25745 = 25745;
public static final int NULL_25747 = 25747;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullNpcID.java
+7
View File
@@ -828,6 +828,7 @@ public final class NullNpcID
public static final int NULL_8317 = 8317;
public static final int NULL_8318 = 8318;
public static final int NULL_8319 = 8319;
public static final int NULL_8325 = 8325;
public static final int NULL_8358 = 8358;
public static final int NULL_8380 = 8380;
public static final int NULL_8386 = 8386;
@@ -1649,5 +1650,11 @@ public final class NullNpcID
public static final int NULL_10713 = 10713;
public static final int NULL_10738 = 10738;
public static final int NULL_10747 = 10747;
public static final int NULL_10790 = 10790;
public static final int NULL_10811 = 10811;
public static final int NULL_10846 = 10846;
public static final int NULL_10863 = 10863;
public static final int NULL_10866 = 10866;
public static final int NULL_10869 = 10869;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
+5
View File
@@ -20360,5 +20360,10 @@ public final class NullObjectID
public static final int NULL_41740 = 41740;
public static final int NULL_41741 = 41741;
public static final int NULL_41742 = 41742;
public static final int NULL_41743 = 41743;
public static final int NULL_41750 = 41750;
public static final int NULL_41751 = 41751;
public static final int NULL_41752 = 41752;
public static final int NULL_41753 = 41753;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/ObjectID.java
+6
View File
@@ -21368,5 +21368,11 @@ public final class ObjectID
public static final int CLAN_RECRUITMENT_BOARD_41730 = 41730;
public static final int STOOL_41733 = 41733;
public static final int WOODEN_BENCH_41734 = 41734;
public static final int REWARDS_CHEST_41744 = 41744;
public static final int REWARDS_CHEST_41745 = 41745;
public static final int MONUMENTAL_CHEST_41746 = 41746;
public static final int ACID_POOL_41747 = 41747;
public static final int TILE_41748 = 41748;
public static final int TILE_41749 = 41749;
/* This file is automatically generated. Do not edit. */
}
runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/ChatChannelConfig.java
+11
View File
@@ -68,6 +68,17 @@ public interface ChatChannelConfig extends Config
return 20;
}
@ConfigItem(
keyName = "targetMode",
name = "Target mode",
description = "Enables target changing mode via /f, /c, and /g which controls which channel messages are sent to.",
position = 1
)
default boolean targetMode()
{
return true;
}
@ConfigItem(
keyName = "clanChatIcons",
name = "Chat Icons",
runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/ChatChannelPlugin.java
+23 -1
View File
@@ -172,7 +172,15 @@ public class ChatChannelPlugin extends Plugin
chats = null;
clientThread.invoke(() -> colorIgnoredPlayers(Color.WHITE));
rebuildFriendsChat();
inputMode = null;
if (inputMode != null)
{
clientThread.invoke(() ->
{
switchTypingMode(null);
client.runScript(ScriptID.CHAT_PROMPT_INIT);
});
}
}
@Subscribe
@@ -187,6 +195,15 @@ public class ChatChannelPlugin extends Plugin
Color ignoreColor = config.showIgnores() ? config.showIgnoresColor() : Color.WHITE;
clientThread.invoke(() -> colorIgnoredPlayers(ignoreColor));
if (inputMode != null && !config.targetMode())
{
clientThread.invoke(() ->
{
switchTypingMode(null);
client.runScript(ScriptID.CHAT_PROMPT_INIT);
});
}
}
}
@@ -600,6 +617,11 @@ public class ChatChannelPlugin extends Plugin
}
case "preChatSendpublic":
{
if (!config.targetMode())
{
return;
}
final String chatboxInput = client.getVar(VarClientStr.CHATBOX_TYPED_TEXT);
switch (chatboxInput)
{
runelite-client/src/main/resources/item_variations.json
+16 -2
View File
@@ -3386,7 +3386,8 @@
],
"bandages": [
4049,
25202
25202,
25730
],
"barricade": [
4053,
@@ -3744,7 +3745,8 @@
21641,
21642,
23072,
23082
23082,
25753
],
"herb tea mix": [
4464,
@@ -9793,5 +9795,17 @@
25727,
25728,
25729
],
"holy sanguinesti staff": [
25731,
25733
],
"holy scythe of vitur": [
25736,
25738
],
"sanguine scythe of vitur": [
25739,
25741
]
}
runelite-client/src/main/scripts/ChatBuilder.hash
+1 -1
View File
@@ -1 +1 @@
4AEE5325C78CB639C5CB3DC6838082DBD926696CEBDE6DEE0D84D7CD929B8197
28D9B0BC06E4C832129BE800E1F53A8DD6C6C5F1277EF038C49E92C8648E9F44
runelite-client/src/main/scripts/ChatBuilder.rs2asm
+598 -508
View File
File diff suppressed because it is too large Load Diff
runelite-client/src/main/scripts/ChatSplitBuilder.hash
+1 -1
View File
@@ -1 +1 @@
574EDB2E12BB45156BFCF57D301C12AD82DF34648A95478E666FA97F09065C22
4B4BC80A1E1C22193721F88794D320A50B87ED1351BD56F9C01D4D8355EA91F4
runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm
+80 -78
View File
@@ -1,7 +1,7 @@
.id 89
.int_stack_count 1
.string_stack_count 0
.int_var_count 18
.int_var_count 19
.string_var_count 6
iconst 0
istore 1
@@ -340,36 +340,38 @@ LABEL311:
istore 12
iconst 0
istore 17
invoke 4487
istore 18
get_varp 287
iconst 1
if_icmpeq LABEL319
jump LABEL534
LABEL319:
if_icmpeq LABEL321
jump LABEL536
LABEL321:
get_varc_int 41
iconst 1337
if_icmpne LABEL326
if_icmpne LABEL328
get_varbit 4089
iconst 0
if_icmpeq LABEL326
jump LABEL534
LABEL326:
if_icmpeq LABEL328
jump LABEL536
LABEL328:
iload 12
iconst -1
if_icmpne LABEL330
jump LABEL534
LABEL330:
if_icmpne LABEL332
jump LABEL536
LABEL332:
iload 10
iconst -1
if_icmpne LABEL334
jump LABEL534
LABEL334:
if_icmpne LABEL336
jump LABEL536
LABEL336:
iload 7
iload 4
sub
iconst 57
if_icmplt LABEL340
jump LABEL534
LABEL340:
if_icmplt LABEL342
jump LABEL536
LABEL342:
iload 12
chat_gethistory_byuid
istore 14
@@ -385,7 +387,7 @@ LABEL340:
invoke 91
iconst 1
if_icmpeq CHAT_FILTER ; Jump to our new label instead
jump LABEL530
jump LABEL532
CHAT_FILTER:
sload 0 ; Load the message
iconst 1 ; Gets changed to 0 if message is blocked
@@ -397,21 +399,21 @@ CHAT_FILTER:
pop_int ; Pop the messageType
iconst 1 ; 2nd half of conditional
sstore 0 ; Override the message with our filtered message
if_icmpeq LABEL356 ; Check if we are building this message
jump LABEL530
LABEL356:
if_icmpeq LABEL358 ; Check if we are building this message
jump LABEL532
LABEL358:
iload 12 ; message uid
sconst "chatMessageBuilding"
runelite_callback
pop_int
pop_int
iload 17
switch
3: LABEL359
5: LABEL411
6: LABEL385
7: LABEL359
jump LABEL446
LABEL359:
3: LABEL361
5: LABEL413
6: LABEL387
7: LABEL361
jump LABEL448
LABEL361:
iload 7
sload 4
sconst "splitPrivChatUsernameColor"
@@ -439,8 +441,8 @@ LABEL359:
invoke 203
add
istore 7
jump LABEL462
LABEL385:
jump LABEL464
LABEL387:
iload 7
sload 4
sconst "splitPrivChatUsernameColor"
@@ -468,8 +470,8 @@ LABEL385:
invoke 203
add
istore 7
jump LABEL462
LABEL411:
jump LABEL464
LABEL413:
iload 7
sload 4
sload 0
@@ -489,11 +491,11 @@ LABEL411:
invoke 199
add
istore 7
get_varbit 1627
iload 18
iconst 0
if_icmpeq LABEL434
jump LABEL445
LABEL434:
if_icmpeq LABEL436
jump LABEL447
LABEL436:
iload 13
iconst 500
add
@@ -505,9 +507,9 @@ LABEL434:
sconst "1"
iconst 10616832
if_setontimer
LABEL445:
jump LABEL462
LABEL446:
LABEL447:
jump LABEL464
LABEL448:
iload 7
sload 0
iload 9
@@ -524,31 +526,31 @@ LABEL446:
invoke 199
add
istore 7
LABEL462:
LABEL464:
iload 10
if_clearops
iload 17
iconst 3
if_icmpeq LABEL474
if_icmpeq LABEL476
iload 17
iconst 6
if_icmpeq LABEL474
if_icmpeq LABEL476
iload 17
iconst 7
if_icmpeq LABEL474
jump LABEL508
LABEL474:
if_icmpeq LABEL476
jump LABEL510
LABEL476:
iload 14
iconst 1
if_icmpeq LABEL478
jump LABEL483
LABEL478:
if_icmpeq LABEL480
jump LABEL485
LABEL480:
iconst 8
sconst "Message"
iload 10
if_setop
jump LABEL491
LABEL483:
jump LABEL493
LABEL485:
iconst 8
sconst "Add friend"
iload 10
@@ -557,7 +559,7 @@ LABEL483:
sconst "Add ignore"
iload 10
if_setop
LABEL491:
LABEL493:
iconst 10
sconst "Report"
iload 10
@@ -574,13 +576,13 @@ LABEL491:
sconst "is"
iload 10
if_setonop
jump LABEL512
LABEL508:
jump LABEL514
LABEL510:
iconst -1
sconst ""
iload 10
if_setonop
LABEL512:
LABEL514:
iconst -1
sconst ""
iload 10
@@ -599,17 +601,17 @@ LABEL512:
iload 9
enum
istore 10
LABEL530:
LABEL532:
iload 12
chat_getprevuid
istore 12
jump LABEL326
LABEL534:
jump LABEL328
LABEL536:
iload 10
iconst -1
if_icmpne LABEL538
jump LABEL621
LABEL538:
if_icmpne LABEL540
jump LABEL623
LABEL540:
iload 10
if_clearops
iconst -1
@@ -636,14 +638,14 @@ LABEL538:
multiply
cc_find
iconst 1
if_icmpeq LABEL566
jump LABEL570
LABEL566:
if_icmpeq LABEL568
jump LABEL572
LABEL568:
sconst ""
cc_settext
iconst 1
cc_sethide
LABEL570:
LABEL572:
iconst 10682368
iload 9
iconst 4
@@ -652,14 +654,14 @@ LABEL570:
add
cc_find
iconst 1
if_icmpeq LABEL580
jump LABEL584
LABEL580:
if_icmpeq LABEL582
jump LABEL586
LABEL582:
sconst ""
cc_settext
iconst 1
cc_sethide
LABEL584:
LABEL586:
iconst 10682368
iload 9
iconst 4
@@ -668,14 +670,14 @@ LABEL584:
add
cc_find
iconst 1
if_icmpeq LABEL594
jump LABEL598
LABEL594:
if_icmpeq LABEL596
jump LABEL600
LABEL596:
sconst ""
cc_settext
iconst 1
cc_sethide
LABEL598:
LABEL600:
iconst 10682368
iload 9
iconst 4
@@ -684,12 +686,12 @@ LABEL598:
add
cc_find
iconst 1
if_icmpeq LABEL608
jump LABEL610
LABEL608:
if_icmpeq LABEL610
jump LABEL612
LABEL610:
iconst 1
cc_sethide
LABEL610:
LABEL612:
iload 9
iconst 1
add
@@ -700,6 +702,6 @@ LABEL610:
iload 9
enum
istore 10
jump LABEL534
LABEL621:
jump LABEL536
LABEL623:
return