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

Merge remote-tracking branch 'runelite/master' into master

Browse Source
This commit is contained in:
Owain van Brakel
2020-08-28 02:11:26 +02:00
parent 7010955ae9 29e0b92590
commit 6d342d7abc
22 changed files with 909 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
runelite-client/src/main/java/net/runelite/client/Notifier.java
View File

@@ -205,14 +205,15 @@ public class Notifier
public void processFlash(final Graphics2D graphics)
{
if (flashStart == null || client.getGameState() != GameState.LOGGED_IN)
FlashNotification flashNotification = runeLiteConfig.flashNotification();
if (flashStart == null || client.getGameState() != GameState.LOGGED_IN
|| flashNotification == FlashNotification.DISABLED)
{
flashStart = null;
return;
}
FlashNotification flashNotification = runeLiteConfig.flashNotification();
if (Instant.now().minusMillis(MINIMUM_FLASH_DURATION_MILLIS).isAfter(flashStart))
{
switch (flashNotification)

11
runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java
View File

@@ -182,12 +182,15 @@ public class DiscordService implements AutoCloseable
*
* @param userId The id of the user to respond to
* @param reply The reply type
* @see DiscordRPC#DISCORD_REPLY_NO
* @see DiscordRPC#DISCORD_REPLY_YES
* @see DiscordRPC#DISCORD_REPLY_IGNORE
*/
public void respondToRequest(String userId, DiscordReplyType reply)
public void respondToRequest(String userId, int reply)
{
if (discordRPC != null)
{
discordRPC.Discord_Respond(userId, reply.ordinal());
discordRPC.Discord_Respond(userId, reply);
}
}
@@ -204,6 +207,7 @@ public class DiscordService implements AutoCloseable
private void disconnected(int errorCode, String message)
{
log.debug("Discord disconnected {}: {}", errorCode, message);
eventBus.post(DiscordDisconnected.class, new DiscordDisconnected(errorCode, message));
}
@@ -215,16 +219,19 @@ public class DiscordService implements AutoCloseable
private void joinGame(String joinSecret)
{
log.debug("Discord join game: {}", joinSecret);
eventBus.post(DiscordJoinGame.class, new DiscordJoinGame(joinSecret));
}
private void spectateGame(String spectateSecret)
{
log.debug("Discord spectate game: {}", spectateSecret);
eventBus.post(DiscordSpectateGame.class, new DiscordSpectateGame(spectateSecret));
}
private void joinRequest(DiscordUser user)
{
log.debug("Discord join request: {}", user);
eventBus.post(DiscordJoinRequest.class, new DiscordJoinRequest(
user.userId,
user.username,

2
runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java
View File

@@ -189,7 +189,7 @@ public enum ItemMapping
ITEM_VIGGORAS_CHAINMACE(VIGGORAS_CHAINMACE_U, VIGGORAS_CHAINMACE),
ITEM_THAMMARONS_SCEPTRE(THAMMARONS_SCEPTRE_U, THAMMARONS_SCEPTRE),
ITEM_BRYOPHYTAS_STAFF(BRYOPHYTAS_STAFF_UNCHARGED, BRYOPHYTAS_STAFF),
ITEM_RING_OF_ENDURANCE(RING_OF_ENDURANCE_UNCHARGED, RING_OF_ENDURANCE),
ITEM_RING_OF_ENDURANCE(RING_OF_ENDURANCE_UNCHARGED_24844, RING_OF_ENDURANCE),
// Infinity colour kits
ITEM_INFINITY_TOP(INFINITY_TOP, INFINITY_TOP_10605, INFINITY_TOP_20574, DARK_INFINITY_TOP, LIGHT_INFINITY_TOP),

3
runelite-client/src/main/java/net/runelite/client/ui/overlay/worldmap/WorldMapOverlay.java
View File

@@ -55,6 +55,7 @@ public class WorldMapOverlay extends Overlay
private static final int TOOLTIP_OFFSET_WIDTH = 5;
private static final int TOOLTIP_PADDING_HEIGHT = 1;
private static final int TOOLTIP_PADDING_WIDTH = 2;
private static final int TOOLTIP_TEXT_OFFSET_HEIGHT = -2;
private static final Splitter TOOLTIP_SPLITTER = Splitter.on("<br>").trimResults().omitEmptyStrings();
@@ -290,7 +291,7 @@ public class WorldMapOverlay extends Overlay
graphics.setColor(JagexColors.TOOLTIP_TEXT);
for (int i = 0; i < rows.size(); i++)
{
graphics.drawString(rows.get(i), drawPoint.getX(), drawPoint.getY() + (i + 1) * height);
graphics.drawString(rows.get(i), drawPoint.getX(), drawPoint.getY() + TOOLTIP_TEXT_OFFSET_HEIGHT + (i + 1) * height);
}
}

14
runelite-client/src/main/java/net/runelite/client/ws/PartyService.java
View File

@@ -65,7 +65,7 @@ public class PartyService
private UUID localPartyId = UUID.randomUUID();
@Getter
private UUID partyId = localPartyId;
private UUID partyId;
@Setter
private String username;
@@ -97,7 +97,6 @@ public class PartyService
if (partyId == null)
{
localPartyId = UUID.randomUUID(); // cycle local party id so that a new party is created now
partyId = localPartyId;
// close the websocket if the session id isn't for an account
if (sessionManager.getAccountSession() == null)
@@ -122,7 +121,7 @@ public class PartyService
wsClient.send(new Join(partyId, username));
}
private void onUserJoin(final UserJoin message)
public void onUserJoin(final UserJoin message)
{
if (!partyId.equals(message.getPartyId()))
{
@@ -206,8 +205,13 @@ public class PartyService
return Collections.unmodifiableList(members);
}
public boolean isOwner()
public boolean isInParty()
{
return partyId == null || localPartyId.equals(partyId);
return partyId != null;
}
public boolean isPartyOwner()
{
return localPartyId.equals(partyId);
}
}

116
runelite-client/src/main/resources/item_variations.json
View File

@@ -3719,37 +3719,6 @@
4253,
4254
],
"bonemeal": [
4255,
4256,
4257,
4258,
4259,
4260,
4261,
4262,
4263,
4264,
4265,
4266,
4267,
4268,
4269,
4270,
4271,
4852,
4853,
4854,
4855,
5615,
6728,
6810,
11922,
22116,
22754,
22756,
22758
],
"map scrap": [
4274,
4275,
@@ -5814,11 +5783,15 @@
],
"wooden bed": [
8031,
8576
8576,
24918,
24922
],
"oak bed": [
8032,
8578
8578,
24919,
24923
],
"large oak bed": [
8033,
@@ -5826,7 +5799,9 @@
],
"teak bed": [
8034,
8582
8582,
24920,
24924
],
"large teak bed": [
8035,
@@ -5843,7 +5818,8 @@
"oak wardrobe": [
8040,
8614,
9829
9829,
24907
],
"teak drawers": [
8041,
@@ -5852,12 +5828,14 @@
"teak wardrobe": [
8042,
8618,
9831
9831,
24908
],
"mahogany wardrobe": [
8043,
8620,
9833
9833,
24909
],
"gilded wardrobe": [
8044,
@@ -5874,11 +5852,13 @@
],
"oak dresser": [
8047,
8600
8600,
24911
],
"teak dresser": [
8048,
8602
8602,
24912
],
"fancy teak dresser": [
8049,
@@ -5886,7 +5866,8 @@
],
"mahogany dresser": [
8050,
8606
8606,
24913
],
"gilded dresser": [
8051,
@@ -5946,7 +5927,10 @@
],
"teak table": [
8118,
8554
8554,
24888,
24892,
24896
],
"carved teak table": [
8119,
@@ -5954,7 +5938,10 @@
],
"mahogany table": [
8120,
8558
8558,
24889,
24893,
24897
],
"opulent table": [
8121,
@@ -6004,15 +5991,18 @@
"wooden shelves": [
8223,
8224,
8225
8225,
24914
],
"oak shelves": [
8226,
8227
8227,
24915
],
"teak shelves": [
8228,
8229
8229,
24916
],
"beer barrel": [
8239,
@@ -6065,7 +6055,9 @@
],
"wooden chair": [
8310,
8498
8498,
20605,
24930
],
"rocking chair": [
8311,
@@ -6073,7 +6065,8 @@
],
"oak chair": [
8312,
8502
8502,
24931
],
"oak armchair": [
8313,
@@ -6087,13 +6080,19 @@
8315,
8508
],
"wooden bookcase": [
8319,
24902
],
"oak bookcase": [
8320,
8512
8512,
24903
],
"mahogany bookcase": [
8321,
8514
8514,
24905
],
"oak lectern": [
8334,
@@ -8726,6 +8725,12 @@
20536,
23416
],
"wooden table": [
20601,
24886,
24890,
24894
],
"dark altar": [
20619,
22778
@@ -8774,6 +8779,10 @@
20701,
20702
],
"supply crate": [
20703,
24884
],
"tome of fire": [
20714,
20716
@@ -9873,5 +9882,14 @@
24808,
24824,
24840
],
"oak table": [
24887,
24891,
24895
],
"mahogany bed": [
24921,
24925
]
}

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

@@ -1 +1 @@
0622D1B98983E9C4CB40422AF9C1C7E5C37978B5748B73F8E2A317D100B95E9B
E5BD8C9AD501548FDE7AA21B76E6186E5E2B30B7824959D09E517989EFE30687

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

@@ -167,12 +167,12 @@ LABEL153:
iload 9
iconst -1
if_icmpne LABEL157
jump LABEL714
jump LABEL689
LABEL157:
iload 8
iconst -1
if_icmpne LABEL161
jump LABEL714
jump LABEL689
LABEL161:
iload 9
chat_gethistory_byuid
@@ -188,7 +188,7 @@ LABEL161:
invoke 193
iconst 1
if_icmpeq CHAT_FILTER
jump LABEL710
jump LABEL685
CHAT_FILTER:
sload 11 ; Load the message
iconst 1 ; Gets changed to 0 if message is blocked
@@ -201,7 +201,7 @@ CHAT_FILTER:
iconst 1 ; 2nd half of conditional
sstore 11 ; Override the message with our filtered message
if_icmpeq LABEL176 ; Check if we are building this message
jump LABEL710 ; continue to next message, skipping this
jump LABEL685 ; continue to next message, skipping this
LABEL176:
iload 10
sload 9
@@ -213,7 +213,7 @@ LABEL176:
invoke 90
iconst 1
if_icmpeq LABEL187
jump LABEL710
jump LABEL685
LABEL187:
iload 10
switch
@@ -565,7 +565,7 @@ LABEL445:
14: LABEL599
90: LABEL450
91: LABEL450
jump LABEL684
jump LABEL659
LABEL450:
sconst "<col=ffffff>"
sload 9
@@ -639,7 +639,7 @@ LABEL510:
iload 8
if_setop
LABEL514:
jump LABEL696
jump LABEL671
LABEL515:
sconst "<col=ffffff>"
sload 9
@@ -685,7 +685,7 @@ LABEL548:
iload 8
if_setop
LABEL556:
jump LABEL696
jump LABEL671
LABEL557:
sconst "<col=ffffff>"
sload 9
@@ -731,38 +731,19 @@ LABEL590:
iload 8
if_setop
LABEL598:
jump LABEL696
jump LABEL671
LABEL599:
sload 12
string_length
iconst 0
if_icmpgt LABEL604
jump LABEL658
jump LABEL633
LABEL604:
iload 12
iconst -1
if_icmpne LABEL608
jump LABEL658
jump LABEL633
LABEL608:
iconst 105
iconst 49
iconst 2761
iload 12
enum
istore 13
clienttype
iconst 3
if_icmpne LABEL618
jump LABEL620
LABEL618:
iconst 0
istore 13
LABEL620:
iload 13
iconst 0
if_icmpeq LABEL624
jump LABEL649
LABEL624:
iconst 6
sconst "Open"
iload 8
@@ -787,8 +768,8 @@ LABEL624:
sconst "Iii"
iload 8
if_setonmouseleave
jump LABEL657
LABEL649:
jump LABEL641
LABEL633:
iconst -1
sconst ""
iload 8
@@ -797,18 +778,7 @@ LABEL649:
sconst ""
iload 8
if_setonmouseleave
LABEL657:
jump LABEL666
LABEL658:
iconst -1
sconst ""
iload 8
if_setonmouserepeat
iconst -1
sconst ""
iload 8
if_setonmouseleave
LABEL666:
LABEL641:
iconst 9
sconst "Clear history"
iload 8
@@ -826,8 +796,8 @@ LABEL666:
sconst "isi"
iload 8
if_setonop
jump LABEL696
LABEL684:
jump LABEL671
LABEL659:
iconst -1
sconst ""
iload 8
@@ -840,7 +810,7 @@ LABEL684:
sconst ""
iload 8
if_setonmouseleave
LABEL696:
LABEL671:
iload 5
iload 6
sub
@@ -855,20 +825,20 @@ LABEL696:
iload 7
enum
istore 8
LABEL710:
LABEL685:
iload 9
chat_getprevuid
istore 9
jump LABEL153
LABEL714:
LABEL689:
iload 7
istore 15
LABEL716:
LABEL691:
iload 8
iconst -1
if_icmpne LABEL720
jump LABEL777
LABEL720:
if_icmpne LABEL695
jump LABEL752
LABEL695:
iload 8
if_clearops
iconst -1
@@ -895,14 +865,14 @@ LABEL720:
multiply
cc_find
iconst 1
if_icmpeq LABEL748
jump LABEL752
LABEL748:
if_icmpeq LABEL723
jump LABEL727
LABEL723:
sconst ""
cc_settext
iconst 1
cc_sethide
LABEL752:
LABEL727:
iconst 10616891
iload 7
iconst 2
@@ -911,14 +881,14 @@ LABEL752:
add
cc_find
iconst 1
if_icmpeq LABEL762
jump LABEL766
LABEL762:
if_icmpeq LABEL737
jump LABEL741
LABEL737:
sconst ""
cc_settext
iconst 1
cc_sethide
LABEL766:
LABEL741:
iload 7
iconst 1
add
@@ -929,8 +899,8 @@ LABEL766:
iload 7
enum
istore 8
jump LABEL716
LABEL777:
jump LABEL691
LABEL752:
iload 5
iconst 2
sub
@@ -944,20 +914,20 @@ LABEL777:
istore 16
iload 5
iload 16
if_icmpgt LABEL792
jump LABEL794
LABEL792:
if_icmpgt LABEL767
jump LABEL769
LABEL767:
iload 5
istore 16
LABEL794:
LABEL769:
iload 15
istore 7
LABEL796:
LABEL771:
iload 7
iconst 0
if_icmpgt LABEL800
jump LABEL853
LABEL800:
if_icmpgt LABEL775
jump LABEL828
LABEL775:
iload 7
iconst 1
sub
@@ -988,15 +958,15 @@ LABEL800:
multiply
cc_find
iconst 1
if_icmpeq LABEL832
jump LABEL837
LABEL832:
if_icmpeq LABEL807
jump LABEL812
LABEL807:
cc_getx
iload 5
iconst 0
iconst 0
cc_setposition
LABEL837:
LABEL812:
iconst 10616891
iload 7
iconst 2
@@ -1005,17 +975,17 @@ LABEL837:
add
cc_find
iconst 1
if_icmpeq LABEL847
jump LABEL852
LABEL847:
if_icmpeq LABEL822
jump LABEL827
LABEL822:
cc_getx
iload 5
iconst 0
iconst 0
cc_setposition
LABEL852:
jump LABEL796
LABEL853:
LABEL827:
jump LABEL771
LABEL828:
iconst 0
iload 16
iconst 10616891

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

@@ -1 +1 @@
85382CB95B13EA567E72410A58D18DAD6754D3361E584DFF0A1E417989E8214C
C8549F688E1AEF9A485BFA552D7FEA8E0C9FDFAC006A879883320FFD82F5786B

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

@@ -190,20 +190,20 @@ LABEL156:
get_varc_int 55
get_varc_int 202
if_icmpge LABEL176
jump LABEL317
jump LABEL299
LABEL176:
get_varc_int 55
clientclock
iconst 3000
sub
if_icmpgt LABEL182
jump LABEL317
jump LABEL299
LABEL182:
iconst 14
chat_gethistorylength
iconst 0
if_icmpgt LABEL187
jump LABEL317
jump LABEL299
LABEL187:
iconst 14
iconst 0
@@ -217,13 +217,21 @@ LABEL187:
iload 12
iconst -1
if_icmpne LABEL200
jump LABEL317
jump LABEL299
LABEL200:
sload 0
invoke 2066
istore 15
sstore 3
sstore 0
iload 15
iconst 4
if_icmpne LABEL212
reboottimer
iconst 0
if_icmple LABEL212
jump LABEL299
LABEL212:
iload 7
sload 0
iload 9
@@ -245,33 +253,14 @@ LABEL200:
sload 3
string_length
iconst 0
if_icmpgt LABEL228
jump LABEL282
LABEL228:
if_icmpgt LABEL235
jump LABEL264
LABEL235:
iload 15
iconst -1
if_icmpne LABEL232
jump LABEL282
LABEL232:
iconst 105
iconst 49
iconst 2761
iload 15
enum
istore 16
clienttype
iconst 3
if_icmpne LABEL242
jump LABEL244
LABEL242:
iconst 0
istore 16
LABEL244:
iload 16
iconst 0
if_icmpeq LABEL248
jump LABEL273
LABEL248:
if_icmpne LABEL239
jump LABEL264
LABEL239:
iconst 6
sconst "Open"
iload 10
@@ -296,8 +285,8 @@ LABEL248:
sconst "Iii"
iload 10
if_setonmouseleave
jump LABEL281
LABEL273:
jump LABEL272
LABEL264:
iconst -1
sconst ""
iload 10
@@ -306,18 +295,7 @@ LABEL273:
sconst ""
iload 10
if_setonmouseleave
LABEL281:
jump LABEL290
LABEL282:
iconst -1
sconst ""
iload 10
if_setonmouserepeat
iconst -1
sconst ""
iload 10
if_setonmouseleave
LABEL290:
LABEL272:
iconst 9
sconst "Clear history"
iload 10
@@ -345,41 +323,41 @@ LABEL290:
iload 9
enum
istore 10
LABEL317:
LABEL299:
iload 0
istore 12
iconst 0
istore 17
get_varp 287
iconst 1
if_icmpeq LABEL325
jump LABEL514
LABEL325:
if_icmpeq LABEL307
jump LABEL496
LABEL307:
get_varc_int 41
iconst 1337
if_icmpne LABEL332
if_icmpne LABEL314
get_varbit 4089
iconst 0
if_icmpeq LABEL332
jump LABEL514
LABEL332:
if_icmpeq LABEL314
jump LABEL496
LABEL314:
iload 12
iconst -1
if_icmpne LABEL336
jump LABEL514
LABEL336:
if_icmpne LABEL318
jump LABEL496
LABEL318:
iload 10
iconst -1
if_icmpne LABEL340
jump LABEL514
LABEL340:
if_icmpne LABEL322
jump LABEL496
LABEL322:
iload 7
iload 4
sub
iconst 57
if_icmplt LABEL346
jump LABEL514
LABEL346:
if_icmplt LABEL328
jump LABEL496
LABEL328:
iload 12
chat_gethistory_byuid
istore 14
@@ -395,7 +373,7 @@ LABEL346:
invoke 91
iconst 1
if_icmpeq CHAT_FILTER ; Jump to our new label instead
jump LABEL510
jump LABEL492
CHAT_FILTER:
sload 0 ; Load the message
iconst 1 ; Gets changed to 0 if message is blocked
@@ -407,16 +385,16 @@ CHAT_FILTER:
pop_int ; Pop the messageType
iconst 1 ; 2nd half of conditional
sstore 0 ; Override the message with our filtered message
if_icmpeq LABEL362 ; Check if we are building this message
jump LABEL510
LABEL362:
if_icmpeq LABEL344 ; Check if we are building this message
jump LABEL492
LABEL344:
iload 17
switch
3: LABEL365
6: LABEL386
7: LABEL365
jump LABEL407
LABEL365:
3: LABEL347
6: LABEL368
7: LABEL347
jump LABEL389
LABEL347:
iload 7
iload 12 ; Load the id of the messageNode
sconst "" ; Push a container for the timestamp
@@ -444,8 +422,8 @@ LABEL365:
invoke 203
add
istore 7
jump LABEL442
LABEL386:
jump LABEL424
LABEL368:
iload 7
iload 12 ; Load the id of the messageNode
sconst "" ; Push container for the timestamp
@@ -473,8 +451,8 @@ LABEL386:
invoke 203
add
istore 7
jump LABEL442
LABEL407:
jump LABEL424
LABEL389:
iload 7
iload 12 ; Load the id of the messageNode
sconst "" ; Push a container for the timestamp
@@ -499,14 +477,14 @@ LABEL407:
istore 7
iload 17
iconst 5
if_icmpeq LABEL427
jump LABEL442
LABEL427:
if_icmpeq LABEL409
jump LABEL424
LABEL409:
get_varbit 1627
iconst 0
if_icmpeq LABEL431
jump LABEL442
LABEL431:
if_icmpeq LABEL413
jump LABEL424
LABEL413:
iload 13
iconst 500
add
@@ -518,31 +496,31 @@ LABEL431:
sconst "1"
iconst 10616832
if_setontimer
LABEL442:
LABEL424:
iload 10
if_clearops
iload 17
iconst 3
if_icmpeq LABEL454
if_icmpeq LABEL436
iload 17
iconst 6
if_icmpeq LABEL454
if_icmpeq LABEL436
iload 17
iconst 7
if_icmpeq LABEL454
jump LABEL488
LABEL454:
if_icmpeq LABEL436
jump LABEL470
LABEL436:
iload 14
iconst 1
if_icmpeq LABEL458
jump LABEL463
LABEL458:
if_icmpeq LABEL440
jump LABEL445
LABEL440:
iconst 8
sconst "Message"
iload 10
if_setop
jump LABEL471
LABEL463:
jump LABEL453
LABEL445:
iconst 8
sconst "Add friend"
iload 10
@@ -551,7 +529,7 @@ LABEL463:
sconst "Add ignore"
iload 10
if_setop
LABEL471:
LABEL453:
iconst 10
sconst "Report"
iload 10
@@ -568,13 +546,13 @@ LABEL471:
sconst "is"
iload 10
if_setonop
jump LABEL492
LABEL488:
jump LABEL474
LABEL470:
iconst -1
sconst ""
iload 10
if_setonop
LABEL492:
LABEL474:
iconst -1
sconst ""
iload 10
@@ -593,17 +571,17 @@ LABEL492:
iload 9
enum
istore 10
LABEL510:
LABEL492:
iload 12
chat_getprevuid
istore 12
jump LABEL332
LABEL514:
jump LABEL314
LABEL496:
iload 10
iconst -1
if_icmpne LABEL518
jump LABEL575
LABEL518:
if_icmpne LABEL500
jump LABEL557
LABEL500:
iload 10
if_clearops
iconst -1
@@ -630,14 +608,14 @@ LABEL518:
multiply
cc_find
iconst 1
if_icmpeq LABEL546
jump LABEL550
LABEL546:
if_icmpeq LABEL528
jump LABEL532
LABEL528:
sconst ""
cc_settext
iconst 1
cc_sethide
LABEL550:
LABEL532:
iconst 10682368
iload 9
iconst 2
@@ -646,14 +624,14 @@ LABEL550:
add
cc_find
iconst 1
if_icmpeq LABEL560
jump LABEL564
LABEL560:
if_icmpeq LABEL542
jump LABEL546
LABEL542:
sconst ""
cc_settext
iconst 1
cc_sethide
LABEL564:
LABEL546:
iload 9
iconst 1
add
@@ -664,6 +642,6 @@ LABEL564:
iload 9
enum
istore 10
jump LABEL514
LABEL575:
jump LABEL496
LABEL557:
return