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

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2021-12-09 16:30:14 +01:00
parent 2a75213297 479de04b73
commit 3eb2cf3ff3
20 changed files with 646 additions and 1210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

160
runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java
View File

@@ -1,160 +0,0 @@
/*
* Copyright (c) 2018, Woox <https://github.com/wooxsolo>
* 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.
*/
package net.runelite.client.plugins.chatboxperformance;
import javax.inject.Inject;
import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.ScriptID;
import net.runelite.api.events.ScriptCallbackEvent;
import net.runelite.api.widgets.WidgetType;
import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo;
import net.runelite.api.widgets.WidgetPositionMode;
import net.runelite.api.widgets.WidgetSizeMode;
import net.runelite.client.callback.ClientThread;
import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor;
@PluginDescriptor(
name = "Chatbox performance",
hidden = true
)
public class ChatboxPerformancePlugin extends Plugin
{
@Inject
private Client client;
@Inject
private ClientThread clientThread;
@Override
public void startUp()
{
if (client.getGameState() == GameState.LOGGED_IN)
{
clientThread.invokeLater(() -> client.runScript(ScriptID.MESSAGE_LAYER_CLOSE, 0, 0, 0));
}
}
@Override
public void shutDown()
{
if (client.getGameState() == GameState.LOGGED_IN)
{
clientThread.invokeLater(() -> client.runScript(ScriptID.MESSAGE_LAYER_CLOSE, 0, 0, 0));
}
}
@Subscribe
private void onScriptCallbackEvent(ScriptCallbackEvent ev)
{
if (!"chatboxBackgroundBuilt".equals(ev.getEventName()))
{
return;
}
fixDarkBackground();
fixWhiteLines(true);
fixWhiteLines(false);
}
private void fixDarkBackground()
{
int currOpacity = 256;
int prevY = 0;
Widget[] children = client.getWidget(WidgetInfo.CHATBOX_TRANSPARENT_BACKGROUND).getDynamicChildren();
Widget prev = null;
for (Widget w : children)
{
if (w.getType() != WidgetType.RECTANGLE)
{
continue;
}
if (prev != null)
{
int relY = w.getRelativeY();
prev.setHeightMode(WidgetSizeMode.ABSOLUTE);
prev.setYPositionMode(WidgetPositionMode.ABSOLUTE_TOP);
prev.setRelativeY(prevY);
prev.setOriginalY(prev.getRelativeY());
prev.setHeight(relY - prevY);
prev.setOriginalHeight(prev.getHeight());
prev.setOpacity(currOpacity);
}
prevY = w.getRelativeY();
currOpacity -= 3; // Rough number, can't get exactly the same as Jagex because of rounding
prev = w;
}
if (prev != null)
{
prev.setOpacity(currOpacity);
}
}
private void fixWhiteLines(boolean upperLine)
{
int currOpacity = 256;
int prevWidth = 0;
Widget[] children = client.getWidget(WidgetInfo.CHATBOX_TRANSPARENT_LINES).getDynamicChildren();
Widget prev = null;
for (Widget w : children)
{
if (w.getType() != WidgetType.RECTANGLE)
{
continue;
}
if ((w.getRelativeY() == 0 && !upperLine) ||
(w.getRelativeY() != 0 && upperLine))
{
continue;
}
if (prev != null)
{
int width = w.getWidth();
prev.setWidthMode(WidgetSizeMode.ABSOLUTE);
prev.setRelativeX(width);
prev.setOriginalX(width);
prev.setWidth(prevWidth - width);
prev.setOriginalWidth(prev.getWidth());
prev.setOpacity(currOpacity);
}
prevWidth = w.getWidth();
currOpacity -= upperLine ? 3 : 4; // Rough numbers, can't get exactly the same as Jagex because of rounding
prev = w;
}
if (prev != null)
{
prev.setOpacity(currOpacity);
}
}
}

8
runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java
View File

@@ -71,9 +71,11 @@ import net.runelite.client.ws.WSClient;
public class SpecialCounterPlugin extends Plugin
{
private static final Set<Integer> IGNORED_NPCS = ImmutableSet.of(
NpcID.DARK_ENERGY_CORE, NpcID.ZOMBIFIED_SPAWN, NpcID.ZOMBIFIED_SPAWN_8063,
NpcID.COMBAT_DUMMY, NpcID.UNDEAD_COMBAT_DUMMY,
NpcID.SKELETON_HELLHOUND_6613, NpcID.GREATER_SKELETON_HELLHOUND
NpcID.DARK_ENERGY_CORE, // corp
NpcID.ZOMBIFIED_SPAWN, NpcID.ZOMBIFIED_SPAWN_8063, // vorkath
NpcID.COMBAT_DUMMY, NpcID.UNDEAD_COMBAT_DUMMY, // poh
NpcID.SKELETON_HELLHOUND_6613, NpcID.GREATER_SKELETON_HELLHOUND, // vetion
NpcID.SPAWN, NpcID.SCION // abyssal sire
);
private static final Set<Integer> RESET_ON_LEAVE_INSTANCED_REGIONS = ImmutableSet.of(

154
runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsConfig.java
View File

@@ -29,106 +29,176 @@ import net.runelite.client.config.Alpha;
import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
import net.runelite.client.config.ConfigSection;
@ConfigGroup("tileindicators")
public interface TileIndicatorsConfig extends Config
{
@Alpha
@ConfigItem(
keyName = "highlightDestinationColor",
name = "Destination tile",
description = "Configures the highlight color of current destination",
@ConfigSection(
name = "Destination Tile",
description = "Destination tile configuration",
position = 0
)
String destinationTile = "destinationTile";
@ConfigSection(
name = "Hovered Tile",
description = "Hovered tile configuration",
position = 1
)
default Color highlightDestinationColor()
{
return Color.GRAY;
}
String hoveredTile = "hoveredTile";
@ConfigSection(
name = "Current Tile",
description = "Current tile configuration",
position = 2
)
String currentTile = "currentTile";
@ConfigItem(
keyName = "highlightDestinationTile",
name = "Highlight destination tile",
description = "Highlights tile player is walking to",
position = 2
position = 1,
section = destinationTile
)
default boolean highlightDestinationTile()
{
return true;
}
@Alpha
@ConfigItem(
keyName = "highlightDestinationColor",
name = "Highlight color",
description = "Configures the highlight color of current destination",
position = 2,
section = destinationTile
)
default Color highlightDestinationColor()
{
return Color.GRAY;
}
@Alpha
@ConfigItem(
keyName = "destinationTileFillColor",
name = "Fill color",
description = "Configures the fill color of destination tile",
position = 3,
section = destinationTile
)
default Color destinationTileFillColor()
{
return new Color(0, 0, 0, 50);
}
@ConfigItem(
keyName = "destinationTileBorderWidth",
name = "Destination border width",
name = "Border width",
description = "Width of the destination tile marker border",
position = 3
position = 4,
section = destinationTile
)
default double destinationTileBorderWidth()
{
return 2;
}
@Alpha
@ConfigItem(
keyName = "highlightHoveredColor",
name = "Hovered tile",
description = "Configures the highlight color of hovered tile",
position = 4
)
default Color highlightHoveredColor()
{
return new Color(0, 0, 0, 0);
}
@ConfigItem(
keyName = "highlightHoveredTile",
name = "Highlight hovered tile",
description = "Highlights tile player is hovering with mouse",
position = 5
position = 1,
section = hoveredTile
)
default boolean highlightHoveredTile()
{
return false;
}
@Alpha
@ConfigItem(
keyName = "highlightHoveredColor",
name = "Highlight color",
description = "Configures the highlight color of hovered tile",
position = 2,
section = hoveredTile
)
default Color highlightHoveredColor()
{
return new Color(0, 0, 0, 0);
}
@Alpha
@ConfigItem(
keyName = "hoveredTileFillColor",
name = "Fill color",
description = "Configures the fill color of hovered tile",
position = 3,
section = hoveredTile
)
default Color hoveredTileFillColor()
{
return new Color(0, 0, 0, 50);
}
@ConfigItem(
keyName = "hoveredTileBorderWidth",
name = "Hovered tile border width",
name = "Border width",
description = "Width of the hovered tile marker border",
position = 6
position = 4,
section = hoveredTile
)
default double hoveredTileBorderWidth()
{
return 2;
}
@Alpha
@ConfigItem(
keyName = "highlightCurrentColor",
name = "True tile",
description = "Configures the highlight color of current true tile",
position = 7
)
default Color highlightCurrentColor()
{
return Color.CYAN;
}
@ConfigItem(
keyName = "highlightCurrentTile",
name = "Highlight true tile",
description = "Highlights true tile player is on as seen by server",
position = 8
position = 1,
section = currentTile
)
default boolean highlightCurrentTile()
{
return false;
}
@Alpha
@ConfigItem(
keyName = "highlightCurrentColor",
name = "Highlight color",
description = "Configures the highlight color of current true tile",
position = 2,
section = currentTile
)
default Color highlightCurrentColor()
{
return Color.CYAN;
}
@Alpha
@ConfigItem(
keyName = "currentTileFillColor",
name = "Fill color",
description = "Configures the fill color of current true tile",
position = 3,
section = currentTile
)
default Color currentTileFillColor()
{
return new Color(0, 0, 0, 50);
}
@ConfigItem(
keyName = "currentTileBorderWidth",
name = "True tile border width",
name = "Border width",
description = "Width of the true tile marker border",
position = 9
position = 4,
section = currentTile
)
default double currentTileBorderWidth()
{

10
runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java
View File

@@ -63,13 +63,13 @@ public class TileIndicatorsOverlay extends Overlay
// If we have tile "selected" render it
if (client.getSelectedSceneTile() != null)
{
renderTile(graphics, client.getSelectedSceneTile().getLocalLocation(), config.highlightHoveredColor(), config.hoveredTileBorderWidth());
renderTile(graphics, client.getSelectedSceneTile().getLocalLocation(), config.highlightHoveredColor(), config.hoveredTileBorderWidth(), config.hoveredTileFillColor());
}
}
if (config.highlightDestinationTile())
{
renderTile(graphics, client.getLocalDestinationLocation(), config.highlightDestinationColor(), config.destinationTileBorderWidth());
renderTile(graphics, client.getLocalDestinationLocation(), config.highlightDestinationColor(), config.destinationTileBorderWidth(), config.destinationTileFillColor());
}
if (config.highlightCurrentTile())
@@ -86,13 +86,13 @@ public class TileIndicatorsOverlay extends Overlay
return null;
}
renderTile(graphics, playerPosLocal, config.highlightCurrentColor(), config.currentTileBorderWidth());
renderTile(graphics, playerPosLocal, config.highlightCurrentColor(), config.currentTileBorderWidth(), config.currentTileFillColor());
}
return null;
}
private void renderTile(final Graphics2D graphics, final LocalPoint dest, final Color color, final double borderWidth)
private void renderTile(final Graphics2D graphics, final LocalPoint dest, final Color color, final double borderWidth, final Color fillColor)
{
if (dest == null)
{
@@ -106,6 +106,6 @@ public class TileIndicatorsOverlay extends Overlay
return;
}
OverlayUtil.renderPolygon(graphics, poly, color, new BasicStroke((float) borderWidth));
OverlayUtil.renderPolygon(graphics, poly, color, fillColor, new BasicStroke((float) borderWidth));
}
}

6
runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
View File

@@ -124,6 +124,7 @@ public class TimersPlugin extends Plugin
private static final String RESURRECT_THRALL_DISAPPEAR_MESSAGE_END = " thrall returns to the grave.</col>";
private static final String WARD_OF_ARCEUUS_MESSAGE = ">Your defence against Arceuus magic has been strengthened.</col>";
private static final String PICKPOCKET_FAILURE_MESSAGE = "You fail to pick the ";
private static final String DODGY_NECKLACE_PROTECTION_MESSAGE = "Your dodgy necklace protects you.";
private static final Pattern TELEBLOCK_PATTERN = Pattern.compile("A Tele Block spell has been cast on you(?: by .+)?\\. It will expire in (?<mins>\\d+) minutes?(?:, (?<secs>\\d+) seconds?)?\\.");
private static final Pattern DIVINE_POTION_PATTERN = Pattern.compile("You drink some of your divine (.+) potion\\.");
@@ -508,6 +509,11 @@ public class TimersPlugin extends Plugin
return;
}
if (message.contains(DODGY_NECKLACE_PROTECTION_MESSAGE))
{
removeGameTimer(PICKPOCKET_STUN);
}
if (message.contains(PICKPOCKET_FAILURE_MESSAGE) && config.showPickpocketStun() && message.contains("pocket"))
{
if (message.contains("hero") || message.contains("elf"))

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

@@ -1 +1 @@
7D5A3CB415DC8A5BA0477F0587693A394E13C7144DCA3E2F9AEEE559A40210E2
2AA6E95505D50D42398FC71705CEE6CD9A21BB9E4B0E74E123AE003BFCABCA21

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

File diff suppressed because it is too large Load Diff

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

@@ -1 +1 @@
6FB26238E2041A40DE52A7E797AD54BF8633BE93FD3B0C244F1313B53CC0A922
77B41EBBD7A825A8AC984B282115ED636C9F32A4FA777B1B58169E9C6FF103E0

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

@@ -1 +1 @@
7D996BC73BC98D9BDE8FCDC0A866021F1F217F370B35C30C5B4B0FFECD9135C0
21BB416CB6B1BC4EF5150411D12A118494BCF943E7A419682377C33639F488C1

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

@@ -203,20 +203,20 @@ LABEL156:
get_varc_int 55
get_varc_int 202
if_icmpge LABEL189
jump LABEL319
jump LABEL320
LABEL189:
get_varc_int 55
clientclock
iconst 3000
sub
if_icmpgt LABEL195
jump LABEL319
jump LABEL320
LABEL195:
iconst 14
chat_gethistorylength
iconst 0
if_icmpgt LABEL200
jump LABEL319
jump LABEL320
LABEL200:
iconst 14
iconst 0
@@ -232,7 +232,7 @@ LABEL200:
iload 12
iconst -1
if_icmpne LABEL215
jump LABEL319
jump LABEL320
LABEL215:
sload 0
invoke 2066
@@ -245,7 +245,7 @@ LABEL215:
reboottimer
iconst 0
if_icmple LABEL227
jump LABEL319
jump LABEL320
LABEL227:
iload 7
sload 2
@@ -253,6 +253,7 @@ LABEL227:
sload 0
sconst "</col>"
join_string 3
sconst "null"
invoke 4742
iload 9
iload 10
@@ -273,14 +274,14 @@ LABEL227:
sload 4
string_length
iconst 0
if_icmpgt LABEL255
jump LABEL284
LABEL255:
if_icmpgt LABEL256
jump LABEL285
LABEL256:
iload 16
iconst -1
if_icmpne LABEL259
jump LABEL284
LABEL259:
if_icmpne LABEL260
jump LABEL285
LABEL260:
iconst 6
sconst "Open"
iload 10
@@ -305,8 +306,8 @@ LABEL259:
sconst "Iii"
iload 10
if_setonmouseleave
jump LABEL292
LABEL284:
jump LABEL293
LABEL285:
iconst -1
sconst ""
iload 10
@@ -315,7 +316,7 @@ LABEL284:
sconst ""
iload 10
if_setonmouseleave
LABEL292:
LABEL293:
iconst 9
sconst "Clear history"
iload 10
@@ -343,7 +344,7 @@ LABEL292:
iload 9
enum
istore 10
LABEL319:
LABEL320:
iload 0
istore 12
iconst 0
@@ -352,34 +353,34 @@ LABEL319:
istore 19
get_varp 287
iconst 1
if_icmpeq LABEL329
jump LABEL566
LABEL329:
if_icmpeq LABEL330
jump LABEL559
LABEL330:
get_varc_int 41
iconst 1337
if_icmpne LABEL336
if_icmpne LABEL337
get_varbit 4089
iconst 0
if_icmpeq LABEL336
jump LABEL566
LABEL336:
if_icmpeq LABEL337
jump LABEL559
LABEL337:
iload 12
iconst -1
if_icmpne LABEL340
jump LABEL566
LABEL340:
if_icmpne LABEL341
jump LABEL559
LABEL341:
iload 10
iconst -1
if_icmpne LABEL344
jump LABEL566
LABEL344:
if_icmpne LABEL345
jump LABEL559
LABEL345:
iload 7
iload 4
sub
iconst 57
if_icmplt LABEL350
jump LABEL566
LABEL350:
if_icmplt LABEL351
jump LABEL559
LABEL351:
iload 12
5031
istore 15
@@ -397,7 +398,7 @@ LABEL350:
invoke 91
iconst 1
if_icmpeq CHAT_FILTER ; Jump to our new label instead
jump LABEL562
jump LABEL555
CHAT_FILTER:
sload 0 ; Load the message
iconst 1 ; Gets changed to 0 if message is blocked
@@ -409,14 +410,14 @@ CHAT_FILTER:
pop_int ; Pop the messageType
iconst 1 ; 2nd half of conditional
sstore 0 ; Override the message with our filtered message
if_icmpeq LABEL368 ; Check if we are building this message
jump LABEL562
LABEL368:
if_icmpeq LABEL369 ; Check if we are building this message
jump LABEL555
LABEL369:
iload 12 ; message uid
sconst "" ; message channel
sload 1 ; message name
sload 0 ; message
sload 2 ; message timestamp
sload 1 ; message name
sload 0 ; message
sload 2 ; message timestamp
sconst "chatMessageBuilding"
runelite_callback
pop_int ; uid
@@ -426,18 +427,14 @@ LABEL368:
pop_string ; message channel
iload 18
switch
3: LABEL371
5: LABEL435
6: LABEL403
7: LABEL371
jump LABEL476
LABEL371:
3: LABEL372
5: LABEL430
6: LABEL401
7: LABEL372
jump LABEL468
LABEL372:
iload 7
sload 5
sload 2
append
sconst "</col>"
append
sload 5
sconst "splitPrivChatUsernameColor"
runelite_callback
@@ -446,6 +443,7 @@ LABEL371:
sconst ":"
sconst "</col>"
join_string 5
sload 5
invoke 4742
sload 5
sload 0
@@ -465,14 +463,10 @@ LABEL371:
invoke 203
add
istore 7
jump LABEL494
LABEL403:
jump LABEL487
LABEL401:
iload 7
sload 5
sload 2
append
sconst "</col>"
append
sload 5
sconst "splitPrivChatUsernameColor"
runelite_callback
@@ -481,6 +475,7 @@ LABEL403:
sconst ":"
sconst "</col>"
join_string 5
sload 5
invoke 4742
sload 5
sload 0
@@ -500,18 +495,15 @@ LABEL403:
invoke 203
add
istore 7
jump LABEL494
LABEL435:
jump LABEL487
LABEL430:
iload 7
sload 5
sload 2
append
sconst "</col>"
append
sload 5
sload 0
sconst "</col>"
join_string 3
sload 5
invoke 4742
iload 9
iload 10
@@ -529,9 +521,9 @@ LABEL435:
istore 7
iload 19
iconst 0
if_icmpeq LABEL464
jump LABEL475
LABEL464:
if_icmpeq LABEL456
jump LABEL467
LABEL456:
iload 13
iconst 500
add
@@ -543,12 +535,13 @@ LABEL464:
sconst "1"
iconst 10616832
if_setontimer
LABEL475:
jump LABEL494
LABEL476:
LABEL467:
jump LABEL487
LABEL468:
iload 7
sload 2
sload 0
sconst "null"
invoke 4742
iload 9
iload 10
@@ -564,31 +557,31 @@ LABEL476:
invoke 199
add
istore 7
LABEL494:
LABEL487:
iload 10
if_clearops
iload 18
iconst 3
if_icmpeq LABEL506
if_icmpeq LABEL499
iload 18
iconst 6
if_icmpeq LABEL506
if_icmpeq LABEL499
iload 18
iconst 7
if_icmpeq LABEL506
jump LABEL540
LABEL506:
if_icmpeq LABEL499
jump LABEL533
LABEL499:
iload 14
iconst 1
if_icmpeq LABEL510
jump LABEL515
LABEL510:
if_icmpeq LABEL503
jump LABEL508
LABEL503:
iconst 8
sconst "Message"
iload 10
if_setop
jump LABEL523
LABEL515:
jump LABEL516
LABEL508:
iconst 8
sconst "Add friend"
iload 10
@@ -597,7 +590,7 @@ LABEL515:
sconst "Add ignore"
iload 10
if_setop
LABEL523:
LABEL516:
iconst 10
sconst "Report"
iload 10
@@ -614,13 +607,13 @@ LABEL523:
sconst "is"
iload 10
if_setonop
jump LABEL544
LABEL540:
jump LABEL537
LABEL533:
iconst -1
sconst ""
iload 10
if_setonop
LABEL544:
LABEL537:
iconst -1
sconst ""
iload 10
@@ -639,17 +632,17 @@ LABEL544:
iload 9
enum
istore 10
LABEL562:
LABEL555:
iload 12
chat_getprevuid
istore 12
jump LABEL336
LABEL566:
jump LABEL337
LABEL559:
iload 10
iconst -1
if_icmpne LABEL570
jump LABEL653
LABEL570:
if_icmpne LABEL563
jump LABEL646
LABEL563:
iload 10
if_clearops
iconst -1
@@ -676,14 +669,14 @@ LABEL570:
multiply
cc_find
iconst 1
if_icmpeq LABEL598
jump LABEL602
LABEL598:
if_icmpeq LABEL591
jump LABEL595
LABEL591:
sconst ""
cc_settext
iconst 1
cc_sethide
LABEL602:
LABEL595:
iconst 10682368
iload 9
iconst 4
@@ -692,14 +685,14 @@ LABEL602:
add
cc_find
iconst 1
if_icmpeq LABEL612
jump LABEL616
LABEL612:
if_icmpeq LABEL605
jump LABEL609
LABEL605:
sconst ""
cc_settext
iconst 1
cc_sethide
LABEL616:
LABEL609:
iconst 10682368
iload 9
iconst 4
@@ -708,14 +701,14 @@ LABEL616:
add
cc_find
iconst 1
if_icmpeq LABEL626
jump LABEL630
LABEL626:
if_icmpeq LABEL619
jump LABEL623
LABEL619:
sconst ""
cc_settext
iconst 1
cc_sethide
LABEL630:
LABEL623:
iconst 10682368
iload 9
iconst 4
@@ -724,12 +717,12 @@ LABEL630:
add
cc_find
iconst 1
if_icmpeq LABEL640
jump LABEL642
LABEL640:
if_icmpeq LABEL633
jump LABEL635
LABEL633:
iconst 1
cc_sethide
LABEL642:
LABEL635:
iload 9
iconst 1
add
@@ -740,6 +733,6 @@ LABEL642:
iload 9
enum
istore 10
jump LABEL566
LABEL653:
jump LABEL559
LABEL646:
return

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

@@ -1 +1 @@
690BCC4CE42FE670B31A14E214FECD3B27CEB013D6413713DB4A587D1CC38974
BC3DDC3675375E1FD9AD64DEBF4FDA5B4102FE542088C310881120DC47270566

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

@@ -789,7 +789,7 @@ LABEL659:
mes
jump LABEL664
LABEL662:
sconst "You are not chatting in the channel of your own clan at the moment."
sconst "You are not chatting in the channel of your own Iron Group at the moment."
mes
LABEL664:
jump LABEL810

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

@@ -1 +1 @@
03E202EADA91DB0D5EE9B98E360685149F29B10A1C565B9BE65C2A50BD262BC3
F24070EC29F94E90F83578CF29B242EB9F31D6255578C69F51814E9C199B6E8E

39
runelite-client/src/main/scripts/GELayout.rs2asm
View File

@@ -1,7 +1,7 @@
.id 806
.int_stack_count 7
.string_stack_count 0
.int_var_count 9
.int_var_count 11
.string_var_count 0
iload 6
invoke 41
@@ -52,12 +52,25 @@ LABEL37:
iconst 0
iload 2
if_settrans
iconst -1
istore 9
iconst 0
istore 10
iload 7
invoke 5733
istore 10
istore 9
iload 7
stockmarket_isofferempty
iconst 1
if_icmpeq LABEL48
jump LABEL66
LABEL48:
if_icmpeq LABEL56
jump LABEL78
LABEL56:
iload 9
iconst -1
if_icmpeq LABEL60
jump LABEL78
LABEL60:
iconst 1
iload 3
if_sethide
@@ -71,14 +84,14 @@ LABEL48:
iload 1
cc_find
iconst 1
if_icmpeq LABEL63
jump LABEL65
LABEL63:
if_icmpeq LABEL75
jump LABEL77
LABEL75:
sconst "Grand Exchange: Set up offer"
cc_settext
LABEL65:
LABEL77:
return
LABEL66:
LABEL78:
iconst 1
iload 3
if_sethide
@@ -92,10 +105,10 @@ LABEL66:
iload 1
cc_find
iconst 1
if_icmpeq LABEL81
jump LABEL83
LABEL81:
if_icmpeq LABEL93
jump LABEL95
LABEL93:
sconst "Grand Exchange: Offer status"
cc_settext
LABEL83:
LABEL95:
return

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

@@ -1 +1 @@
9C827673E7E0FADA71DB2017F4AEE7CC2A6A9C617756DBAF7821B93D62D412C8
1A989C17A54BD28EE9DEE314EFB9198FCD16B0D90D2B296CE4C4165C7464B8BC

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

@@ -23,9 +23,9 @@
runelite_callback
sub
istore 1
iconst 7602274
iconst 7602276
if_getwidth
iconst 7602275
iconst 7602277
if_getwidth
sub
istore 2
@@ -78,6 +78,6 @@ LABEL44:
iconst 0
iconst 0
iconst 0
iconst 7602275
iconst 7602277
if_setposition
return

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

@@ -1 +0,0 @@
CAF61FF2A3131623A421CCCC68914587A69044768DEB79432DA8A85937283F7B

516
runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm
View File

@@ -1,516 +0,0 @@
.id 923
.int_stack_count 0
.string_stack_count 0
.int_var_count 5
.string_var_count 0
; callback "chatboxBackgroundBuilt"
; used by the ChatboxPerformancePlugin to know when it needs to rebuild.
; Unmark the plugin as hidden and toggle it. The chatbox should change opacity
; slightly
iconst 10616834
cc_deleteall
iconst 0
istore 0
get_varc_int 41
iconst 1337
if_icmpeq LABEL15
get_varbit 542
iconst 1
if_icmpeq LABEL11
jump LABEL31
LABEL11:
getwindowmode
iconst 1
if_icmpne LABEL15
jump LABEL31
LABEL15:
invoke 922
iconst 1
if_icmpeq LABEL19
jump LABEL22
LABEL19:
iconst 1
istore 0
jump LABEL31
LABEL22:
getwindowmode
iconst 1
if_icmpeq LABEL26
jump LABEL31
LABEL26:
iconst 0
set_varc_int 41
iconst 0
iconst 0
invoke 183
LABEL31:
iload 0
iconst 10616866
if_sethide
get_varbit 6374
iconst 1
if_icmpeq LABEL38
jump LABEL55
LABEL38:
getwindowmode
iconst 1
if_icmpne LABEL42
jump LABEL55
LABEL42:
iconst 1
iconst 0
iconst 2
iconst 0
iconst 10616888
if_setposition
iconst -1
iconst 0
iconst 0
iconst 0
iconst 10617389
if_setposition
jump LABEL67
LABEL55:
iconst 0
iconst 0
iconst 0
iconst 0
iconst 10616888
if_setposition
iconst 0
iconst 0
iconst 2
iconst 0
iconst 10617389
if_setposition
LABEL67:
iconst 10616867
cc_deleteall
iconst 10616886
cc_deleteall
iconst 0
istore 1
clientclock
get_varc_int 223
if_icmplt LABEL77
jump LABEL89
LABEL77:
invoke 900
iconst 1129
if_icmpne LABEL81
jump LABEL89
LABEL81:
iconst 1
istore 1
iconst 2155
get_varc_int 223
sconst "i"
iconst 10616867
if_setontimer
jump LABEL93
LABEL89:
iconst -1
sconst ""
iconst 10616867
if_setontimer
LABEL93:
invoke 921
iconst 0
if_icmpeq LABEL97
jump LABEL163
LABEL97:
iconst 1
iconst 10616867
if_setnoclickthrough
iload 1
iconst 0
if_icmpeq LABEL104
jump LABEL142
LABEL104:
iconst 10616867
iconst 5
iconst 0
cc_create
iconst 0
iconst 0
iconst 1
iconst 1
cc_setsize
iconst 0
iconst 0
iconst 1
iconst 1
cc_setposition
iconst 1017
cc_setgraphic
iconst 0
cc_settiling
iconst 0
cc_settrans
iconst 10616886
iconst 3
iconst 0
cc_create
iconst 0
iconst 1
iconst 1
iconst 0
cc_setsize
iconst 0
iconst 15
iconst 1
iconst 2
cc_setposition
iconst 8418912
cc_setcolour
iconst 1
cc_setfill
LABEL142:
iconst 10617389
iconst 792
iconst 789
iconst 790
iconst 791
iconst 773
iconst 788
iconst 0
invoke 838
invoke 2373
iconst 1
if_icmpeq LABEL155
jump LABEL159
LABEL155:
iconst 255
iconst 10616835
if_settrans
jump LABEL162
LABEL159:
iconst 0
iconst 10616835
if_settrans
LABEL162:
return
LABEL163:
iconst 16384
iconst 25
div
istore 2
iconst 16384
istore 3
get_varbit 2570
iconst 1
if_icmpeq LABEL173
jump LABEL177
LABEL173:
iconst 1
iconst 10616867
if_setnoclickthrough
jump LABEL183
LABEL177:
iconst 0
iconst 10616867
if_setnoclickthrough
iconst 1
iconst 10616867
if_setnoscrollthrough
LABEL183:
iconst 0
istore 4
iload 1
iconst 0
if_icmpeq LABEL189
jump LABEL417
LABEL189:
invoke 1445
iconst 1
if_icmpeq LABEL193
jump LABEL267
LABEL193:
iload 4
iconst 20
if_icmplt LABEL197
jump LABEL226
LABEL197:
iconst 10616867
iconst 3
iload 4
cc_create
iconst 0
iload 3
iconst 1
iconst 2
cc_setsize
iconst 0
iconst 0
iconst 1
iconst 2
cc_setposition
iconst 0
cc_setcolour
iconst 1
cc_setfill
iconst 252
cc_settrans
iload 4
iconst 1
add
iload 3
iload 2
sub
istore 3
istore 4
jump LABEL193
LABEL226:
iconst 10616886
iconst 3
iconst 0
cc_create
iconst 10616886
iconst 3
iconst 1
cc_create 1
iconst 16384
iconst 1
iconst 2
iconst 0
cc_setsize
iconst 16384
iconst 1
iconst 2
iconst 0
cc_setsize 1
iconst 0
iconst 0
iconst 0
iconst 0
cc_setposition
iconst 0
iconst 15
iconst 0
iconst 2
cc_setposition 1
iconst 16777215
cc_setcolour
iconst 16777215
cc_setcolour 1
iconst 1
cc_setfill
iconst 1
cc_setfill 1
iconst 100
cc_settrans
iconst 120
cc_settrans 1
jump LABEL417
LABEL267:
invoke 1972
iconst 0
if_icmpeq LABEL271
jump LABEL351
LABEL271:
iload 4
iconst 20
if_icmplt LABEL275
jump LABEL350
LABEL275:
iconst 10616867
iconst 3
iload 4
cc_create
iconst 0
iload 3
iconst 1
iconst 2
cc_setsize
iconst 0
iconst 0
iconst 1
iconst 2
cc_setposition
iconst 0
cc_setcolour
iconst 1
cc_setfill
iconst 254
cc_settrans
iconst 10616886
iconst 3
iload 4
iconst 2
multiply
cc_create
iconst 10616886
iconst 3
iload 4
iconst 2
multiply
iconst 1
add
cc_create 1
iload 3
iconst 1
iconst 2
iconst 0
cc_setsize
iload 3
iconst 1
iconst 2
iconst 0
cc_setsize 1
iconst 0
iconst 0
iconst 0
iconst 0
cc_setposition
iconst 0
iconst 15
iconst 0
iconst 2
cc_setposition 1
iconst 16777215
cc_setcolour
iconst 16777215
cc_setcolour 1
iconst 1
cc_setfill
iconst 1
cc_setfill 1
iconst 250
cc_settrans
iconst 250
cc_settrans 1
iload 4
iconst 1
add
iload 3
iload 2
sub
istore 3
istore 4
jump LABEL271
LABEL350:
sconst "chatboxBackgroundBuilt"
runelite_callback
jump LABEL417
LABEL351:
iconst 10616867
iconst 3
iload 4
cc_create
iconst 0
iload 3
iconst 1
iconst 2
cc_setsize
iconst 0
iconst 0
iconst 1
iconst 2
cc_setposition
iconst 0
cc_setcolour
iconst 1
cc_setfill
iconst 225
cc_settrans
iconst 10616886
iconst 3
iload 4
iconst 2
multiply
cc_create
iconst 10616886
iconst 3
iload 4
iconst 2
multiply
iconst 1
add
cc_create 1
iload 3
iconst 1
iconst 2
iconst 0
cc_setsize
iload 3
iconst 1
iconst 2
iconst 0
cc_setsize 1
iconst 0
iconst 0
iconst 0
iconst 0
cc_setposition
iconst 0
iconst 15
iconst 0
iconst 2
cc_setposition 1
iconst 16777215
cc_setcolour
iconst 16777215
cc_setcolour 1
iconst 1
cc_setfill
iconst 1
cc_setfill 1
iconst 200
cc_settrans
iconst 130
cc_settrans 1
LABEL417:
iconst 10617389
iconst 1190
iconst 1187
iconst 1188
iconst 1189
iconst 1185
iconst 1186
iconst 1
invoke 838
iload 0
iconst 1
if_icmpeq LABEL430
jump LABEL434
LABEL430:
iconst 255
iconst 10616835
if_settrans
jump LABEL465
LABEL434:
invoke 1972
iconst 0
if_icmpeq LABEL438
jump LABEL442
LABEL438:
iconst 155
iconst 10616835
if_settrans
jump LABEL465
LABEL442:
iconst 255
iconst 10616835
if_settrans
iconst 10616834
iconst 3
iconst 0
cc_create
iconst 0
iconst 0
iconst 1
iconst 1
cc_setsize
iconst 0
iconst 0
iconst 1
iconst 1
cc_setposition
iconst 0
cc_setcolour
iconst 1
cc_setfill
iconst 225
cc_settrans
LABEL465:
return