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

Merge branch 'master' of https://github.com/runelite/runelite

Browse Source 
# Conflicts:
#	runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
#	runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MapClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
#	runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java
#	runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/HitpointsDisplayStyle.java
#	runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java
#	runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ProgressBarComponent.java
This commit is contained in:
Ganom
2019-05-30 13:26:28 -04:00
parent 3465cc3269 ac19fd56b7
commit f79543acfe
53 changed files with 2088 additions and 1856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,8 +189,10 @@ CHAT_FILTER:
sload 11 ; Load the message
iconst 1 ; Gets changed to 0 if message is blocked
iload 10 ; Load the messageType
iload 9 ; Load the id of the messageNode
sconst "chatFilterCheck"
runelite_callback
pop_int ; Pop the id of the messageNode
pop_int ; Pop the messageType
iconst 1 ; 2nd half of conditional
sstore 11 ; Override the message with our filtered message

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

@@ -359,9 +359,11 @@ CHAT_FILTER:
sload 0 ; Load the message
iconst 1 ; Gets changed to 0 if message is blocked
iload 15 ; Load the messageType
iload 12 ; Load the id of the messageNode
sconst "chatFilterCheck"
runelite_callback
pop_int ; Pop the messageType
runelite_callback
pop_int ; Pop the id of the messageNode
pop_int ; Pop the messageType
iconst 1 ; 2nd half of conditional
sstore 0 ; Override the message with our filtered message
if_icmpeq LABEL327 ; Check if we are building this message

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

@@ -0,0 +1 @@
DDFE4E407122EEEAE2C64A233EA937B2CC20E92D66CB66772C31182A6C60820D

29
runelite-client/src/main/scripts/CombatInterfaceSP.rs2asm Normal file
View File

@@ -0,0 +1,29 @@
.id 327
.int_stack_count 1
.string_stack_count 0
.int_var_count 1
.string_var_count 0
; Attach specbar redraw listeners to the weapon name text instead of to
; auto retaliate text (which is var0). Test by enabling "Hide auto retaliate"
; and using a spec.
iconst 38862849 ; 593.1 - weapon name widget
istore 0 ; overwrite script parameter which is the autoretail text
iload 0
invoke 187
iconst 186
iload 0
iconst 301
iconst 300
iconst 284
iconst 3
sconst "IY"
iload 0
if_setonvartransmit
iconst 186
iload 0
iconst 94
iconst 1
sconst "IY"
iload 0
if_setoninvtransmit
return

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

@@ -37,6 +37,11 @@ LABEL20:
invoke 1972
iconst 1
if_icmpeq LABEL31
iconst 0 ; Modified to enable clanchat input
sconst "clanchatInput"
runelite_callback
iconst 1
if_icmpeq LABEL31 ; Compare to 1
jump LABEL37
LABEL31:
get_varc_int 41