From 9cd7060035597944c28ce00891bbcd05c835d783 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 7 Dec 2021 12:49:12 -0500 Subject: [PATCH 01/12] config service: avoid raising a json exception on non json input The config service accepts in strings instead of json strings, however this causes the normal control flow to throw a json parsing exception. Since this happens so frequently it is using a measurable amount of CPU time, so avoid it in the common case by testing if the string is json first --- .../http/service/config/ConfigService.java | 34 ++++++++++++++++--- .../service/config/ConfigServiceTest.java | 16 +++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/http-service/src/main/java/net/runelite/http/service/config/ConfigService.java b/http-service/src/main/java/net/runelite/http/service/config/ConfigService.java index 6c48a60277..bb6050ad4b 100644 --- a/http-service/src/main/java/net/runelite/http/service/config/ConfigService.java +++ b/http-service/src/main/java/net/runelite/http/service/config/ConfigService.java @@ -47,6 +47,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.regex.Pattern; import javax.annotation.Nullable; import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.api.config.ConfigEntry; @@ -60,6 +61,7 @@ import org.springframework.stereotype.Service; @Service public class ConfigService { + private static final Pattern MAYBE_JSON = Pattern.compile("^[\\-0-9{\\[\"]|true|false"); private static final int MAX_DEPTH = 8; private static final int MAX_VALUE_LENGTH = 262144; @@ -184,12 +186,25 @@ public class ConfigService return unset(dbKey); } - if (!validateJson(value)) + Object jsonValue; + if (!isMaybeJson(value)) { - return null; - } + if (!validateStr(value)) + { + return null; + } - Object jsonValue = parseJsonString(value); + jsonValue = value; + } + else + { + if (!validateJson(value)) + { + return null; + } + + jsonValue = parseJsonString(value); + } return set(dbKey, jsonValue); } @@ -268,6 +283,17 @@ public class ConfigService return jsonValue; } + @VisibleForTesting + static boolean isMaybeJson(String value) + { + return MAYBE_JSON.matcher(value).find(); + } + + private static boolean validateStr(String value) + { + return value.length() < MAX_VALUE_LENGTH; + } + @VisibleForTesting static boolean validateJson(String value) { diff --git a/http-service/src/test/java/net/runelite/http/service/config/ConfigServiceTest.java b/http-service/src/test/java/net/runelite/http/service/config/ConfigServiceTest.java index e74eb4d4fa..a08a9a7160 100644 --- a/http-service/src/test/java/net/runelite/http/service/config/ConfigServiceTest.java +++ b/http-service/src/test/java/net/runelite/http/service/config/ConfigServiceTest.java @@ -26,6 +26,7 @@ package net.runelite.http.service.config; import com.google.common.collect.ImmutableMap; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; @@ -53,4 +54,19 @@ public class ConfigServiceTest assertTrue(ConfigService.validateJson("{\"key\": \"value\"}")); assertTrue(ConfigService.validateJson("\n")); } + + @Test + public void testMaybeJson() + { + assertFalse(ConfigService.isMaybeJson("string")); + assertFalse(ConfigService.isMaybeJson("string with spaces")); + + assertTrue(ConfigService.isMaybeJson("true")); + assertTrue(ConfigService.isMaybeJson("false")); + assertTrue(ConfigService.isMaybeJson("1")); + assertTrue(ConfigService.isMaybeJson("1.2")); + assertTrue(ConfigService.isMaybeJson("\"quote\"")); + assertTrue(ConfigService.isMaybeJson("{\"key\": \"value\"}")); + assertTrue(ConfigService.isMaybeJson("[42]")); + } } \ No newline at end of file From a54b3d149f1edc3cbf3720787e55053ef4136354 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 7 Dec 2021 15:47:07 -0500 Subject: [PATCH 02/12] loot tracker: aggregate kills prior to inserting In most cases this saves a number of queries since the loot tracker data is submitted in 5 minute batches --- .../loottracker/LootTrackerService.java | 55 ++++++++++++++++++- 1 file changed, 52 insertions(+), 3 deletions(-) diff --git a/http-service/src/main/java/net/runelite/http/service/loottracker/LootTrackerService.java b/http-service/src/main/java/net/runelite/http/service/loottracker/LootTrackerService.java index 1a4ee1230f..4836afd97d 100644 --- a/http-service/src/main/java/net/runelite/http/service/loottracker/LootTrackerService.java +++ b/http-service/src/main/java/net/runelite/http/service/loottracker/LootTrackerService.java @@ -27,10 +27,16 @@ package net.runelite.http.service.loottracker; import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.RequiredArgsConstructor; import net.runelite.http.api.loottracker.GameItem; import net.runelite.http.api.loottracker.LootAggregate; import net.runelite.http.api.loottracker.LootRecord; +import net.runelite.http.api.loottracker.LootRecordType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; @@ -67,7 +73,7 @@ public class LootTrackerService ") ENGINE=InnoDB;\n"; // Queries for inserting kills - private static final String INSERT_KILL_QUERY = "INSERT INTO loottracker_kills (accountId, type, eventId, amount) VALUES (:accountId, :type, :eventId, 1) ON DUPLICATE KEY UPDATE amount = amount + 1"; + private static final String INSERT_KILL_QUERY = "INSERT INTO loottracker_kills (accountId, type, eventId, amount) VALUES (:accountId, :type, :eventId, :kills) ON DUPLICATE KEY UPDATE amount = amount + :kills"; private static final String INSERT_DROP_QUERY = "INSERT INTO loottracker_drops (killId, itemId, itemQuantity) VALUES (:killId, :itemId, :itemQuantity) ON DUPLICATE KEY UPDATE itemQuantity = itemQuantity + :itemQuantity"; private static final String SELECT_LOOT_QUERY = "SELECT killId,first_time,last_time,type,eventId,amount,itemId,itemQuantity FROM loottracker_kills JOIN loottracker_drops ON loottracker_drops.killId = loottracker_kills.id WHERE accountId = :accountId ORDER BY last_time DESC LIMIT :limit OFFSET :offset"; @@ -95,6 +101,46 @@ public class LootTrackerService } } + @RequiredArgsConstructor + @EqualsAndHashCode(exclude = {"kills", "drops"}) + @Getter + private static class AggregateLootRecord + { + final LootRecordType type; + final String eventId; + int kills = 0; + Map drops = new HashMap<>(); + } + + @RequiredArgsConstructor + @EqualsAndHashCode(exclude = "qty") + @Getter + private static class AggregateDrop + { + final int id; + int qty = 0; + } + + private static Collection aggregate(Collection records) + { + Map combinedRecords = new HashMap<>(); + for (LootRecord record : records) + { + AggregateLootRecord r = new AggregateLootRecord(record.getType(), record.getEventId()); + r = combinedRecords.computeIfAbsent(r, (k) -> k); + ++r.kills; + + // Combine drops + for (GameItem gameItem : record.getDrops()) + { + AggregateDrop cd = new AggregateDrop(gameItem.getId()); + cd = r.drops.computeIfAbsent(cd, (k) -> k); + cd.qty += gameItem.getQty(); + } + } + return combinedRecords.values(); + } + /** * Store LootRecord * @@ -103,21 +149,24 @@ public class LootTrackerService */ public void store(Collection records, int accountId) { + Collection combinedRecords = aggregate(records); + try (Connection con = sql2o.beginTransaction()) { Query killQuery = con.createQuery(INSERT_KILL_QUERY, true); Query insertDrop = con.createQuery(INSERT_DROP_QUERY); - for (LootRecord record : records) + for (AggregateLootRecord record : combinedRecords) { killQuery .addParameter("accountId", accountId) .addParameter("type", record.getType()) .addParameter("eventId", record.getEventId()) + .addParameter("kills", record.getKills()) .executeUpdate(); Object[] keys = con.getKeys(); - for (GameItem drop : record.getDrops()) + for (AggregateDrop drop : record.getDrops().values()) { insertDrop .addParameter("killId", keys[0]) From 517dc2b50437d106d2f67308a5a1420d374400e2 Mon Sep 17 00:00:00 2001 From: Krazune Date: Wed, 8 Dec 2021 15:18:21 +0000 Subject: [PATCH 03/12] timers: add dodgy necklace protection to pickpocket stun timer --- .../net/runelite/client/plugins/timers/TimersPlugin.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index 2adb8fa1b1..d5309be51b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -124,6 +124,7 @@ public class TimersPlugin extends Plugin private static final String RESURRECT_THRALL_DISAPPEAR_MESSAGE_END = " thrall returns to the grave."; private static final String WARD_OF_ARCEUUS_MESSAGE = ">Your defence against Arceuus magic has been strengthened."; 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 (?\\d+) minutes?(?:, (?\\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")) From be79cbea8293f644f51e6e5013574b2de52ba6ff Mon Sep 17 00:00:00 2001 From: Paul Norton Date: Fri, 3 Dec 2021 00:49:23 -0800 Subject: [PATCH 04/12] spec counter: add sire spawns and scions to ignore list --- .../plugins/specialcounter/SpecialCounterPlugin.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java index b2b78e9a52..c1f72e1b42 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java @@ -71,9 +71,11 @@ import net.runelite.client.ws.WSClient; public class SpecialCounterPlugin extends Plugin { private static final Set 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 RESET_ON_LEAVE_INSTANCED_REGIONS = ImmutableSet.of( From ad6eb4652fd856bbd50b70a4be425a0ab7689223 Mon Sep 17 00:00:00 2001 From: Josh J <33074635+JoshJ96@users.noreply.github.com> Date: Mon, 6 Dec 2021 23:05:22 -0500 Subject: [PATCH 05/12] tile indicators: add fill color config Co-authored-by: Adam --- .../tileindicators/TileIndicatorsConfig.java | 50 ++++++++++++++++--- .../tileindicators/TileIndicatorsOverlay.java | 10 ++-- 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsConfig.java index f30b1c7667..b69bf953ad 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsConfig.java @@ -56,11 +56,23 @@ public interface TileIndicatorsConfig extends Config return true; } + @Alpha + @ConfigItem( + keyName = "destinationTileFillColor", + name = "Destination tile fill color", + description = "Configures the fill color of destination tile", + position = 3 + ) + default Color destinationTileFillColor() + { + return new Color(0, 0, 0, 50); + } + @ConfigItem( keyName = "destinationTileBorderWidth", name = "Destination border width", description = "Width of the destination tile marker border", - position = 3 + position = 4 ) default double destinationTileBorderWidth() { @@ -72,7 +84,7 @@ public interface TileIndicatorsConfig extends Config keyName = "highlightHoveredColor", name = "Hovered tile", description = "Configures the highlight color of hovered tile", - position = 4 + position = 5 ) default Color highlightHoveredColor() { @@ -83,18 +95,30 @@ public interface TileIndicatorsConfig extends Config keyName = "highlightHoveredTile", name = "Highlight hovered tile", description = "Highlights tile player is hovering with mouse", - position = 5 + position = 6 ) default boolean highlightHoveredTile() { return false; } + @Alpha + @ConfigItem( + keyName = "hoveredTileFillColor", + name = "Hovered tile fill color", + description = "Configures the fill color of hovered tile", + position = 7 + ) + default Color hoveredTileFillColor() + { + return new Color(0, 0, 0, 50); + } + @ConfigItem( keyName = "hoveredTileBorderWidth", name = "Hovered tile border width", description = "Width of the hovered tile marker border", - position = 6 + position = 8 ) default double hoveredTileBorderWidth() { @@ -106,7 +130,7 @@ public interface TileIndicatorsConfig extends Config keyName = "highlightCurrentColor", name = "True tile", description = "Configures the highlight color of current true tile", - position = 7 + position = 9 ) default Color highlightCurrentColor() { @@ -117,18 +141,30 @@ public interface TileIndicatorsConfig extends Config keyName = "highlightCurrentTile", name = "Highlight true tile", description = "Highlights true tile player is on as seen by server", - position = 8 + position = 10 ) default boolean highlightCurrentTile() { return false; } + @Alpha + @ConfigItem( + keyName = "currentTileFillColor", + name = "True tile fill color", + description = "Configures the fill color of current true tile", + position = 11 + ) + default Color currentTileFillColor() + { + return new Color(0, 0, 0, 50); + } + @ConfigItem( keyName = "currentTileBorderWidth", name = "True tile border width", description = "Width of the true tile marker border", - position = 9 + position = 12 ) default double currentTileBorderWidth() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java index 8abb968314..99f81a298b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java @@ -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)); } } From 5156be037149f81214327ce9b3fa017980b7769b Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 8 Dec 2021 11:13:14 -0500 Subject: [PATCH 06/12] tile indicators: add config sections --- .../tileindicators/TileIndicatorsConfig.java | 130 +++++++++++------- 1 file changed, 82 insertions(+), 48 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsConfig.java index b69bf953ad..26d39bd53d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsConfig.java @@ -29,39 +29,64 @@ 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 = "Destination tile fill color", + name = "Fill color", description = "Configures the fill color of destination tile", - position = 3 + position = 3, + section = destinationTile ) default Color destinationTileFillColor() { @@ -70,44 +95,48 @@ public interface TileIndicatorsConfig extends Config @ConfigItem( keyName = "destinationTileBorderWidth", - name = "Destination border width", + name = "Border width", description = "Width of the destination tile marker border", - position = 4 + 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 = 5 - ) - 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 = 6 + 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 = "Hovered tile fill color", + name = "Fill color", description = "Configures the fill color of hovered tile", - position = 7 + position = 3, + section = hoveredTile ) default Color hoveredTileFillColor() { @@ -116,44 +145,48 @@ public interface TileIndicatorsConfig extends Config @ConfigItem( keyName = "hoveredTileBorderWidth", - name = "Hovered tile border width", + name = "Border width", description = "Width of the hovered tile marker border", - position = 8 + 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 = 9 - ) - 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 = 10 + 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 = "True tile fill color", + name = "Fill color", description = "Configures the fill color of current true tile", - position = 11 + position = 3, + section = currentTile ) default Color currentTileFillColor() { @@ -162,9 +195,10 @@ public interface TileIndicatorsConfig extends Config @ConfigItem( keyName = "currentTileBorderWidth", - name = "True tile border width", + name = "Border width", description = "Width of the true tile marker border", - position = 12 + position = 4, + section = currentTile ) default double currentTileBorderWidth() { From f5e16493b2d633976b167c600cd1e2517eeab5b2 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Thu, 9 Dec 2021 11:34:12 +0000 Subject: [PATCH 07/12] Update 202 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 45e9aad458..019ee0936c 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ true - 201 + 202 From 92f09f629cb2629583910469e5d817ffe912a930 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Wed, 8 Dec 2021 18:13:12 -0700 Subject: [PATCH 08/12] Update Widget IDs to 2021-12-9 --- .../java/net/runelite/api/widgets/WidgetID.java | 17 ++++++----------- .../net/runelite/api/widgets/WidgetInfo.java | 3 +-- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index 156ea575d5..7e4588ace8 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -297,13 +297,8 @@ public final class WidgetID static class GrandExchange { static final int WINDOW_CONTAINER = 0; - static final int WINDOW_BORDERS = 2; - static final int HISTORY_BUTTON = 3; - static final int BACK_BUTTON = 4; - static final int OFFER_CONTAINER = 24; - static final int OFFER_DESCRIPTION = 25; - static final int OFFER_PRICE = 26; - static final int OFFER_CONFIRM_BUTTON = 27; + static final int OFFER_CONTAINER = 25; + static final int OFFER_DESCRIPTION = 26; } static class GrandExchangeInventory @@ -849,10 +844,10 @@ public final class WidgetID static class SettingsSide { - static final int CAMERA_ZOOM_SLIDER_TRACK = 98; - static final int MUSIC_SLIDER = 27; - static final int SOUND_EFFECT_SLIDER = 41; - static final int AREA_SOUND_SLIDER = 55; + static final int CAMERA_ZOOM_SLIDER_TRACK = 100; + static final int MUSIC_SLIDER = 29; + static final int SOUND_EFFECT_SLIDER = 43; + static final int AREA_SOUND_SLIDER = 57; } static class Settings diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java index 98d6f6542c..8e43b14e66 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -156,7 +156,6 @@ public enum WidgetInfo GRAND_EXCHANGE_WINDOW_CONTAINER(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.WINDOW_CONTAINER), GRAND_EXCHANGE_OFFER_CONTAINER(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.OFFER_CONTAINER), GRAND_EXCHANGE_OFFER_TEXT(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.OFFER_DESCRIPTION), - GRAND_EXCHANGE_OFFER_PRICE(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.OFFER_PRICE), GRAND_EXCHANGE_INVENTORY_ITEMS_CONTAINER(WidgetID.GRAND_EXCHANGE_INVENTORY_GROUP_ID, WidgetID.GrandExchangeInventory.INVENTORY_ITEM_CONTAINER), @@ -493,7 +492,7 @@ public enum WidgetInfo WORLD_SWITCHER_LIST(WidgetID.WORLD_SWITCHER_GROUP_ID, WidgetID.WorldSwitcher.WORLD_LIST), - FOSSIL_ISLAND_OXYGENBAR(WidgetID.FOSSIL_ISLAND_OXYGENBAR_ID, 2), + FOSSIL_ISLAND_OXYGENBAR(WidgetID.FOSSIL_ISLAND_OXYGENBAR_ID, 1), MINIGAME_TELEPORT_BUTTON(WidgetID.MINIGAME_TAB_ID, WidgetID.Minigames.TELEPORT_BUTTON), From 9825cef62105dc31998f9df5c1737f27128daca1 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Wed, 8 Dec 2021 18:13:12 -0700 Subject: [PATCH 09/12] Update Scripts to 2021-12-9 --- .../src/main/scripts/ChatBuilder.hash | 2 +- .../src/main/scripts/ChatBuilder.rs2asm | 720 +++++++++--------- .../src/main/scripts/ChatSend.hash | 2 +- .../src/main/scripts/ChatSplitBuilder.hash | 2 +- .../src/main/scripts/ChatSplitBuilder.rs2asm | 203 +++-- .../src/main/scripts/CommandScript.hash | 2 +- .../src/main/scripts/CommandScript.rs2asm | 2 +- .../src/main/scripts/GELayout.hash | 2 +- .../src/main/scripts/GELayout.rs2asm | 39 +- .../main/scripts/OptionsPanelZoomUpdater.hash | 2 +- .../scripts/OptionsPanelZoomUpdater.rs2asm | 6 +- .../scripts/ToplevelChatboxBackground.hash | 2 +- .../scripts/ToplevelChatboxBackground.rs2asm | 290 ++++--- 13 files changed, 643 insertions(+), 631 deletions(-) diff --git a/runelite-client/src/main/scripts/ChatBuilder.hash b/runelite-client/src/main/scripts/ChatBuilder.hash index 169c51e68a..d17ea1223a 100644 --- a/runelite-client/src/main/scripts/ChatBuilder.hash +++ b/runelite-client/src/main/scripts/ChatBuilder.hash @@ -1 +1 @@ -7D5A3CB415DC8A5BA0477F0587693A394E13C7144DCA3E2F9AEEE559A40210E2 \ No newline at end of file +2AA6E95505D50D42398FC71705CEE6CD9A21BB9E4B0E74E123AE003BFCABCA21 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ChatBuilder.rs2asm b/runelite-client/src/main/scripts/ChatBuilder.rs2asm index 59c9b36675..e3739e6da4 100644 --- a/runelite-client/src/main/scripts/ChatBuilder.rs2asm +++ b/runelite-client/src/main/scripts/ChatBuilder.rs2asm @@ -293,7 +293,7 @@ LABEL251: iconst -1 sconst "" iload 9 - if_setonmouserepeat + if_setonmouseover iconst -1 sconst "" iload 9 @@ -385,12 +385,12 @@ LABEL365: iload 10 iconst -1 if_icmpne LABEL369 - jump LABEL1725 + jump LABEL1755 LABEL369: iload 9 iconst -1 if_icmpne LABEL373 - jump LABEL1725 + jump LABEL1755 LABEL373: iload 10 5031 @@ -409,7 +409,7 @@ LABEL373: invoke 193 iconst 1 if_icmpeq CHAT_FILTER - jump LABEL1721 + jump LABEL1751 CHAT_FILTER: sload 18 ; Load the message iconst 1 ; Gets changed to 0 if message is blocked @@ -422,12 +422,13 @@ CHAT_FILTER: iconst 1 ; 2nd half of conditional sstore 18 ; Override the message with our filtered message if_icmpeq LABEL391 ; Check if we are building this message - jump LABEL1721 ; continue to next message, skipping this + jump LABEL1751 ; continue to next message, skipping this LABEL391: iload 11 sload 16 sload 21 sload 18 + sconst "null" invoke 4742 sload 18 iload 12 @@ -436,9 +437,9 @@ LABEL391: iload 15 invoke 90 iconst 1 - if_icmpeq LABEL405 - jump LABEL1721 -LABEL405: + if_icmpeq LABEL406 + jump LABEL1751 +LABEL406: iload 10 ; message uid sload 17 ; message channel sload 16 ; message name @@ -453,34 +454,35 @@ LABEL405: sstore 17 ; message channel iload 11 switch - 1: LABEL408 - 2: LABEL408 - 3: LABEL454 - 101: LABEL478 - 5: LABEL498 - 6: LABEL533 - 7: LABEL454 - 103: LABEL557 - 104: LABEL557 - 9: LABEL597 - 41: LABEL665 - 43: LABEL1040 - 107: LABEL1257 - 44: LABEL879 - 109: LABEL577 - 110: LABEL557 - 46: LABEL1175 - 14: LABEL1228 - 111: LABEL625 - 112: LABEL645 - 90: LABEL431 - 91: LABEL431 - jump LABEL1295 -LABEL408: + 1: LABEL409 + 2: LABEL409 + 3: LABEL457 + 101: LABEL482 + 5: LABEL503 + 6: LABEL539 + 7: LABEL457 + 103: LABEL564 + 104: LABEL564 + 9: LABEL606 + 41: LABEL677 + 43: LABEL1061 + 107: LABEL1285 + 44: LABEL896 + 109: LABEL585 + 110: LABEL564 + 46: LABEL1200 + 14: LABEL1255 + 111: LABEL635 + 112: LABEL656 + 90: LABEL433 + 91: LABEL433 + jump LABEL1324 +LABEL409: sload 21 sload 16 sconst ":" join_string 2 + sconst "null" invoke 4742 sload 4 sload 18 @@ -499,12 +501,13 @@ LABEL408: iload 4 invoke 203 istore 7 - jump LABEL1311 -LABEL431: + jump LABEL1341 +LABEL433: sload 21 sload 16 sconst ":" join_string 2 + sconst "null" invoke 4742 sload 6 sload 18 @@ -523,8 +526,8 @@ LABEL431: iload 4 invoke 203 istore 7 - jump LABEL1311 -LABEL454: + jump LABEL1341 +LABEL457: sload 21 sconst "From " sload 16 @@ -532,6 +535,7 @@ LABEL454: join_string 3 sconst "privChatUsername" runelite_callback + sconst "null" invoke 4742 sload 5 sload 18 @@ -550,13 +554,14 @@ LABEL454: iload 4 invoke 203 istore 7 - jump LABEL1311 -LABEL478: + jump LABEL1341 +LABEL482: sload 21 sload 9 sload 18 sconst "" join_string 3 + sconst "null" invoke 4742 iload 8 iload 9 @@ -571,13 +576,14 @@ LABEL478: iload 4 invoke 199 istore 7 - jump LABEL1311 -LABEL498: + jump LABEL1341 +LABEL503: sload 21 sload 5 sload 18 sconst "" join_string 3 + sconst "null" invoke 4742 iload 8 iload 9 @@ -594,9 +600,9 @@ LABEL498: istore 7 get_varbit 1627 iconst 0 - if_icmpeq LABEL521 - jump LABEL532 -LABEL521: + if_icmpeq LABEL527 + jump LABEL538 +LABEL527: iload 12 iconst 500 add @@ -608,9 +614,9 @@ LABEL521: sconst "1" iconst 10616832 if_setontimer -LABEL532: - jump LABEL1311 -LABEL533: +LABEL538: + jump LABEL1341 +LABEL539: sload 21 sconst "To " sload 16 @@ -618,6 +624,7 @@ LABEL533: join_string 3 sconst "privChatUsername" runelite_callback + sconst "null" invoke 4742 sload 5 sload 18 @@ -636,13 +643,14 @@ LABEL533: iload 4 invoke 203 istore 7 - jump LABEL1311 -LABEL557: + jump LABEL1341 +LABEL564: sload 21 sload 10 sload 18 sconst "" join_string 3 + sconst "null" invoke 4742 iload 8 iload 9 @@ -657,13 +665,14 @@ LABEL557: iload 4 invoke 199 istore 7 - jump LABEL1311 -LABEL577: + jump LABEL1341 +LABEL585: sload 21 sconst "" sload 18 sconst "" join_string 3 + sconst "null" invoke 4742 iload 8 iload 9 @@ -678,8 +687,8 @@ LABEL577: iload 4 invoke 199 istore 7 - jump LABEL1311 -LABEL597: + jump LABEL1341 +LABEL606: sload 21 sconst "[" sload 3 @@ -689,6 +698,7 @@ LABEL597: sload 16 sconst ":" join_string 7 + sconst "null" invoke 4742 sload 7 sload 18 @@ -707,13 +717,14 @@ LABEL597: iload 4 invoke 203 istore 7 - jump LABEL1311 -LABEL625: + jump LABEL1341 +LABEL635: sload 21 sconst "" sload 18 sconst "" join_string 3 + sconst "null" invoke 4742 iload 8 iload 9 @@ -728,13 +739,14 @@ LABEL625: iload 4 invoke 199 istore 7 - jump LABEL1311 -LABEL645: + jump LABEL1341 +LABEL656: sload 21 sconst "" sload 18 sconst "" join_string 3 + sconst "null" invoke 4742 iload 8 iload 9 @@ -749,26 +761,26 @@ LABEL645: iload 4 invoke 199 istore 7 - jump LABEL1311 -LABEL665: + jump LABEL1341 +LABEL677: iconst 1 activeclansettings_find_affined iconst 1 - if_icmpeq LABEL670 - jump LABEL716 -LABEL670: + if_icmpeq LABEL682 + jump LABEL729 +LABEL682: iconst 1 activeclanchannel_find_affined iconst 1 - if_icmpeq LABEL675 - jump LABEL716 -LABEL675: + if_icmpeq LABEL687 + jump LABEL729 +LABEL687: sload 18 invoke 5501 iconst 1 - if_icmpeq LABEL680 - jump LABEL716 -LABEL680: + if_icmpeq LABEL692 + jump LABEL729 +LABEL692: sload 18 invoke 632 sstore 18 @@ -780,6 +792,7 @@ LABEL680: sconst "" sconst "]" join_string 5 + sconst "null" invoke 4742 iconst -1 iconst 0 @@ -804,29 +817,29 @@ LABEL680: iload 4 invoke 4483 istore 7 - jump LABEL878 -LABEL716: + jump LABEL895 +LABEL729: iconst 0 activeclansettings_find_affined iconst 1 - if_icmpeq LABEL721 - jump LABEL847 -LABEL721: + if_icmpeq LABEL734 + jump LABEL863 +LABEL734: iconst 0 activeclanchannel_find_affined iconst 1 - if_icmpeq LABEL726 - jump LABEL847 -LABEL726: + if_icmpeq LABEL739 + jump LABEL863 +LABEL739: sload 16 removetags activeclanchannel_getuserslot istore 17 iload 17 iconst -1 - if_icmpne LABEL734 - jump LABEL811 -LABEL734: + if_icmpne LABEL747 + jump LABEL826 +LABEL747: iload 17 activeclanchannel_getuserrank invoke 4302 @@ -834,9 +847,9 @@ LABEL734: sstore 20 iload 16 iconst -1 - if_icmpne LABEL743 - jump LABEL775 -LABEL743: + if_icmpne LABEL756 + jump LABEL789 +LABEL756: sload 21 sconst "[" sload 2 @@ -844,6 +857,7 @@ LABEL743: sconst "" sconst "]" join_string 5 + sconst "null" invoke 4742 iload 16 iconst 13 @@ -868,8 +882,8 @@ LABEL743: iload 4 invoke 4483 istore 7 - jump LABEL810 -LABEL775: + jump LABEL825 +LABEL789: sload 21 sconst "[" sload 2 @@ -877,6 +891,7 @@ LABEL775: sconst "" sconst "]" join_string 5 + sconst "null" invoke 4742 iconst -1 iconst 0 @@ -905,9 +920,9 @@ LABEL775: iload 4 invoke 4483 istore 7 -LABEL810: - jump LABEL846 -LABEL811: +LABEL825: + jump LABEL862 +LABEL826: iconst -1 invoke 4302 istore 16 @@ -919,6 +934,7 @@ LABEL811: sconst "" sconst "]" join_string 5 + sconst "null" invoke 4742 iload 16 iconst 13 @@ -943,9 +959,9 @@ LABEL811: iload 4 invoke 4483 istore 7 -LABEL846: - jump LABEL878 -LABEL847: +LABEL862: + jump LABEL895 +LABEL863: sload 21 sconst "[" sload 2 @@ -953,6 +969,7 @@ LABEL847: sconst "" sconst "]" join_string 5 + sconst "null" invoke 4742 iconst -1 iconst 0 @@ -977,28 +994,28 @@ LABEL847: iload 4 invoke 4483 istore 7 -LABEL878: - jump LABEL1311 -LABEL879: +LABEL895: + jump LABEL1341 +LABEL896: activeclansettings_find_listened iconst 1 - if_icmpeq LABEL883 - jump LABEL1008 -LABEL883: + if_icmpeq LABEL900 + jump LABEL1028 +LABEL900: activeclanchannel_find_listened iconst 1 - if_icmpeq LABEL887 - jump LABEL1008 -LABEL887: + if_icmpeq LABEL904 + jump LABEL1028 +LABEL904: sload 16 removetags activeclanchannel_getuserslot istore 17 iload 17 iconst -1 - if_icmpne LABEL895 - jump LABEL972 -LABEL895: + if_icmpne LABEL912 + jump LABEL991 +LABEL912: iload 17 activeclanchannel_getuserrank invoke 4302 @@ -1006,9 +1023,9 @@ LABEL895: sstore 20 iload 16 iconst -1 - if_icmpne LABEL904 - jump LABEL936 -LABEL904: + if_icmpne LABEL921 + jump LABEL954 +LABEL921: sload 21 sconst "[" sload 2 @@ -1016,6 +1033,7 @@ LABEL904: sconst "" sconst "]" join_string 5 + sconst "null" invoke 4742 iload 16 iconst 13 @@ -1040,8 +1058,8 @@ LABEL904: iload 4 invoke 4483 istore 7 - jump LABEL971 -LABEL936: + jump LABEL990 +LABEL954: sload 21 sconst "[" sload 2 @@ -1049,6 +1067,7 @@ LABEL936: sconst "" sconst "]" join_string 5 + sconst "null" invoke 4742 iconst -1 iconst 0 @@ -1077,9 +1096,9 @@ LABEL936: iload 4 invoke 4483 istore 7 -LABEL971: - jump LABEL1007 -LABEL972: +LABEL990: + jump LABEL1027 +LABEL991: iconst -1 invoke 4302 istore 16 @@ -1091,6 +1110,7 @@ LABEL972: sconst "" sconst "]" join_string 5 + sconst "null" invoke 4742 iload 16 iconst 13 @@ -1115,9 +1135,9 @@ LABEL972: iload 4 invoke 4483 istore 7 -LABEL1007: - jump LABEL1039 -LABEL1008: +LABEL1027: + jump LABEL1060 +LABEL1028: sload 21 sconst "[" sload 2 @@ -1125,6 +1145,7 @@ LABEL1008: sconst "" sconst "]" join_string 5 + sconst "null" invoke 4742 iconst -1 iconst 0 @@ -1149,15 +1170,15 @@ LABEL1008: iload 4 invoke 4483 istore 7 -LABEL1039: - jump LABEL1311 -LABEL1040: +LABEL1060: + jump LABEL1341 +LABEL1061: sload 18 invoke 5309 iconst 1 - if_icmpeq LABEL1045 - jump LABEL1108 -LABEL1045: + if_icmpeq LABEL1066 + jump LABEL1131 +LABEL1066: sload 18 invoke 632 sstore 18 @@ -1172,9 +1193,9 @@ LABEL1045: iconst 1 activeclansettings_find_affined iconst 1 - if_icmpeq LABEL1061 - jump LABEL1087 -LABEL1061: + if_icmpeq LABEL1082 + jump LABEL1109 +LABEL1082: sload 21 sconst "[" sload 2 @@ -1182,6 +1203,7 @@ LABEL1061: sconst "" sconst "]" join_string 5 + sconst "null" invoke 4742 sload 14 sload 18 @@ -1200,10 +1222,11 @@ LABEL1061: iload 4 invoke 203 istore 7 - jump LABEL1107 -LABEL1087: + jump LABEL1130 +LABEL1109: sload 21 sconst "" + sconst "null" invoke 4742 sload 14 sload 18 @@ -1222,9 +1245,9 @@ LABEL1087: iload 4 invoke 203 istore 7 -LABEL1107: - jump LABEL1174 -LABEL1108: +LABEL1130: + jump LABEL1199 +LABEL1131: sload 18 sconst "" sconst "" @@ -1235,9 +1258,9 @@ LABEL1108: iconst 0 activeclanchannel_find_affined iconst 1 - if_icmpeq LABEL1120 - jump LABEL1150 -LABEL1120: + if_icmpeq LABEL1143 + jump LABEL1174 +LABEL1143: sload 21 sconst "[" sload 2 @@ -1245,6 +1268,7 @@ LABEL1120: sconst "" sconst "]" join_string 5 + sconst "null" invoke 4742 iconst -1 iconst 0 @@ -1267,10 +1291,11 @@ LABEL1120: iload 4 invoke 4483 istore 7 - jump LABEL1174 -LABEL1150: + jump LABEL1199 +LABEL1174: sload 21 sconst "" + sconst "null" invoke 4742 iconst -1 iconst 0 @@ -1293,14 +1318,14 @@ LABEL1150: iload 4 invoke 4483 istore 7 -LABEL1174: - jump LABEL1311 -LABEL1175: +LABEL1199: + jump LABEL1341 +LABEL1200: activeclanchannel_find_listened iconst 1 - if_icmpeq LABEL1179 - jump LABEL1206 -LABEL1179: + if_icmpeq LABEL1204 + jump LABEL1232 +LABEL1204: sload 21 sconst "[" sload 2 @@ -1308,6 +1333,7 @@ LABEL1179: sconst "" sconst "]" join_string 5 + sconst "null" invoke 4742 iconst -1 iconst 0 @@ -1327,10 +1353,11 @@ LABEL1179: iload 4 invoke 4483 istore 7 - jump LABEL1227 -LABEL1206: + jump LABEL1254 +LABEL1232: sload 21 sconst "" + sconst "null" invoke 4742 iconst -1 iconst 0 @@ -1350,9 +1377,9 @@ LABEL1206: iload 4 invoke 4483 istore 7 -LABEL1227: - jump LABEL1311 -LABEL1228: +LABEL1254: + jump LABEL1341 +LABEL1255: sload 18 invoke 2066 istore 13 @@ -1363,6 +1390,7 @@ LABEL1228: sconst "Broadcast:" sconst "" join_string 3 + sconst "null" invoke 4742 sload 15 sload 18 @@ -1381,15 +1409,15 @@ LABEL1228: iload 4 invoke 203 istore 7 - jump LABEL1311 -LABEL1257: + jump LABEL1341 +LABEL1285: clientclock iload 12 sub iconst 500 - if_icmpgt LABEL1263 - jump LABEL1278 -LABEL1263: + if_icmpgt LABEL1291 + jump LABEL1306 +LABEL1291: sconst "jk :P" iload 8 iload 9 @@ -1404,10 +1432,11 @@ LABEL1263: iload 4 invoke 199 istore 7 - jump LABEL1294 -LABEL1278: + jump LABEL1323 +LABEL1306: sload 21 sload 18 + sconst "null" invoke 4742 iload 8 iload 9 @@ -1422,11 +1451,12 @@ LABEL1278: iload 4 invoke 199 istore 7 -LABEL1294: - jump LABEL1311 -LABEL1295: +LABEL1323: + jump LABEL1341 +LABEL1324: sload 21 sload 18 + sconst "null" invoke 4742 iload 8 iload 9 @@ -1441,32 +1471,32 @@ LABEL1295: iload 4 invoke 199 istore 7 -LABEL1311: +LABEL1341: iload 9 if_clearops iload 11 switch - 1: LABEL1316 - 2: LABEL1316 - 3: LABEL1316 - 101: LABEL1420 - 6: LABEL1316 - 7: LABEL1316 - 103: LABEL1463 - 104: LABEL1463 - 9: LABEL1316 - 41: LABEL1316 - 106: LABEL1316 - 44: LABEL1316 - 109: LABEL1566 - 110: LABEL1463 - 14: LABEL1506 - 111: LABEL1609 - 112: LABEL1652 - 90: LABEL1316 - 91: LABEL1316 - jump LABEL1695 -LABEL1316: + 1: LABEL1346 + 2: LABEL1346 + 3: LABEL1346 + 101: LABEL1450 + 6: LABEL1346 + 7: LABEL1346 + 103: LABEL1493 + 104: LABEL1493 + 9: LABEL1346 + 41: LABEL1346 + 106: LABEL1346 + 44: LABEL1346 + 109: LABEL1596 + 110: LABEL1493 + 14: LABEL1536 + 111: LABEL1639 + 112: LABEL1682 + 90: LABEL1346 + 91: LABEL1346 + jump LABEL1725 +LABEL1346: sconst "" sload 16 sconst "" @@ -1483,7 +1513,7 @@ LABEL1316: iconst -1 sconst "" iload 9 - if_setonmouserepeat + if_setonmouseover iconst -1 sconst "" iload 9 @@ -1493,20 +1523,20 @@ LABEL1316: removetags compare iconst 0 - if_icmpne LABEL1344 - jump LABEL1419 -LABEL1344: + if_icmpne LABEL1374 + jump LABEL1449 +LABEL1374: iload 15 iconst 1 - if_icmpeq LABEL1348 - jump LABEL1353 -LABEL1348: + if_icmpeq LABEL1378 + jump LABEL1383 +LABEL1378: iconst 6 sconst "Message" iload 9 if_setop - jump LABEL1361 -LABEL1353: + jump LABEL1391 +LABEL1383: iconst 6 sconst "Add friend" iload 9 @@ -1515,78 +1545,78 @@ LABEL1353: sconst "Add ignore" iload 9 if_setop -LABEL1361: +LABEL1391: iconst 8 sconst "Report" iload 9 if_setop iload 11 iconst 9 - if_icmpeq LABEL1369 - jump LABEL1382 -LABEL1369: + if_icmpeq LABEL1399 + jump LABEL1412 +LABEL1399: clan_getchatcount iconst 0 - if_icmpgt LABEL1373 - jump LABEL1381 -LABEL1373: + if_icmpgt LABEL1403 + jump LABEL1411 +LABEL1403: clan_getchatrank clan_getchatminkick - if_icmpge LABEL1377 - jump LABEL1381 -LABEL1377: + if_icmpge LABEL1407 + jump LABEL1411 +LABEL1407: iconst 9 sconst "Kick" iload 9 if_setop -LABEL1381: - jump LABEL1419 -LABEL1382: +LABEL1411: + jump LABEL1449 +LABEL1412: iload 11 iconst 41 - if_icmpeq LABEL1386 - jump LABEL1419 -LABEL1386: + if_icmpeq LABEL1416 + jump LABEL1449 +LABEL1416: iload 18 iload 19 - if_icmpge LABEL1390 - jump LABEL1419 -LABEL1390: + if_icmpge LABEL1420 + jump LABEL1449 +LABEL1420: iconst 0 activeclanchannel_find_affined iconst 1 - if_icmpeq LABEL1395 - jump LABEL1419 -LABEL1395: + if_icmpeq LABEL1425 + jump LABEL1449 +LABEL1425: sload 16 removetags activeclanchannel_getuserslot istore 17 iload 17 iconst -1 - if_icmpeq LABEL1407 + if_icmpeq LABEL1437 iload 17 activeclanchannel_getuserrank iconst -1 - if_icmple LABEL1407 - jump LABEL1419 -LABEL1407: + if_icmple LABEL1437 + jump LABEL1449 +LABEL1437: iconst 9 sconst "Kick" iload 9 if_setop iload 18 iload 20 - if_icmpge LABEL1415 - jump LABEL1419 -LABEL1415: + if_icmpge LABEL1445 + jump LABEL1449 +LABEL1445: iconst 10 sconst "Ban" iload 9 if_setop -LABEL1419: - jump LABEL1707 -LABEL1420: +LABEL1449: + jump LABEL1737 +LABEL1450: sconst "" sload 16 sconst "" @@ -1603,7 +1633,7 @@ LABEL1420: iconst -1 sconst "" iload 9 - if_setonmouserepeat + if_setonmouseover iconst -1 sconst "" iload 9 @@ -1614,15 +1644,15 @@ LABEL1420: if_setop iload 15 iconst 1 - if_icmpeq LABEL1449 - jump LABEL1454 -LABEL1449: + if_icmpeq LABEL1479 + jump LABEL1484 +LABEL1479: iconst 6 sconst "Message" iload 9 if_setop - jump LABEL1462 -LABEL1454: + jump LABEL1492 +LABEL1484: iconst 6 sconst "Add friend" iload 9 @@ -1631,9 +1661,9 @@ LABEL1454: sconst "Add ignore" iload 9 if_setop -LABEL1462: - jump LABEL1707 -LABEL1463: +LABEL1492: + jump LABEL1737 +LABEL1493: sconst "" sload 16 sconst "" @@ -1650,7 +1680,7 @@ LABEL1463: iconst -1 sconst "" iload 9 - if_setonmouserepeat + if_setonmouseover iconst -1 sconst "" iload 9 @@ -1661,15 +1691,15 @@ LABEL1463: if_setop iload 15 iconst 1 - if_icmpeq LABEL1492 - jump LABEL1497 -LABEL1492: + if_icmpeq LABEL1522 + jump LABEL1527 +LABEL1522: iconst 6 sconst "Message" iload 9 if_setop - jump LABEL1505 -LABEL1497: + jump LABEL1535 +LABEL1527: iconst 6 sconst "Add friend" iload 9 @@ -1678,20 +1708,20 @@ LABEL1497: sconst "Add ignore" iload 9 if_setop -LABEL1505: - jump LABEL1707 -LABEL1506: +LABEL1535: + jump LABEL1737 +LABEL1536: sload 19 string_length iconst 0 - if_icmpgt LABEL1511 - jump LABEL1540 -LABEL1511: + if_icmpgt LABEL1541 + jump LABEL1570 +LABEL1541: iload 13 iconst -1 - if_icmpne LABEL1515 - jump LABEL1540 -LABEL1515: + if_icmpne LABEL1545 + jump LABEL1570 +LABEL1545: iconst 6 sconst "Open" iload 9 @@ -1707,7 +1737,7 @@ LABEL1515: iconst 3158271 sconst "Iii" iload 9 - if_setonmouserepeat + if_setonmouseover iconst 2065 iload 9 if_getlayer @@ -1716,17 +1746,17 @@ LABEL1515: sconst "Iii" iload 9 if_setonmouseleave - jump LABEL1548 -LABEL1540: + jump LABEL1578 +LABEL1570: iconst -1 sconst "" iload 9 - if_setonmouserepeat + if_setonmouseover iconst -1 sconst "" iload 9 if_setonmouseleave -LABEL1548: +LABEL1578: iconst 9 sconst "Clear history" iload 9 @@ -1744,8 +1774,8 @@ LABEL1548: sconst "isi" iload 9 if_setonop - jump LABEL1707 -LABEL1566: + jump LABEL1737 +LABEL1596: sconst "" sload 16 sconst "" @@ -1766,22 +1796,22 @@ LABEL1566: iconst -1 sconst "" iload 9 - if_setonmouserepeat + if_setonmouseover iconst -1 sconst "" iload 9 if_setonmouseleave iload 15 iconst 1 - if_icmpeq LABEL1595 - jump LABEL1600 -LABEL1595: + if_icmpeq LABEL1625 + jump LABEL1630 +LABEL1625: iconst 6 sconst "Message" iload 9 if_setop - jump LABEL1608 -LABEL1600: + jump LABEL1638 +LABEL1630: iconst 6 sconst "Add friend" iload 9 @@ -1790,9 +1820,9 @@ LABEL1600: sconst "Add ignore" iload 9 if_setop -LABEL1608: - jump LABEL1707 -LABEL1609: +LABEL1638: + jump LABEL1737 +LABEL1639: sconst "" sload 16 sconst "" @@ -1813,22 +1843,22 @@ LABEL1609: iconst -1 sconst "" iload 9 - if_setonmouserepeat + if_setonmouseover iconst -1 sconst "" iload 9 if_setonmouseleave iload 15 iconst 1 - if_icmpeq LABEL1638 - jump LABEL1643 -LABEL1638: + if_icmpeq LABEL1668 + jump LABEL1673 +LABEL1668: iconst 6 sconst "Message" iload 9 if_setop - jump LABEL1651 -LABEL1643: + jump LABEL1681 +LABEL1673: iconst 6 sconst "Add friend" iload 9 @@ -1837,9 +1867,9 @@ LABEL1643: sconst "Add ignore" iload 9 if_setop -LABEL1651: - jump LABEL1707 -LABEL1652: +LABEL1681: + jump LABEL1737 +LABEL1682: sconst "" sload 16 sconst "" @@ -1860,22 +1890,22 @@ LABEL1652: iconst -1 sconst "" iload 9 - if_setonmouserepeat + if_setonmouseover iconst -1 sconst "" iload 9 if_setonmouseleave iload 15 iconst 1 - if_icmpeq LABEL1681 - jump LABEL1686 -LABEL1681: + if_icmpeq LABEL1711 + jump LABEL1716 +LABEL1711: iconst 6 sconst "Message" iload 9 if_setop - jump LABEL1694 -LABEL1686: + jump LABEL1724 +LABEL1716: iconst 6 sconst "Add friend" iload 9 @@ -1884,9 +1914,9 @@ LABEL1686: sconst "Add ignore" iload 9 if_setop -LABEL1694: - jump LABEL1707 -LABEL1695: +LABEL1724: + jump LABEL1737 +LABEL1725: iconst -1 sconst "" iload 9 @@ -1894,12 +1924,12 @@ LABEL1695: iconst -1 sconst "" iload 9 - if_setonmouserepeat + if_setonmouseover iconst -1 sconst "" iload 9 if_setonmouseleave -LABEL1707: +LABEL1737: iload 6 iload 7 sub @@ -1914,20 +1944,20 @@ LABEL1707: iload 8 enum istore 9 -LABEL1721: +LABEL1751: iload 10 chat_getprevuid istore 10 jump LABEL365 -LABEL1725: +LABEL1755: iload 8 istore 22 -LABEL1727: +LABEL1757: iload 9 iconst -1 - if_icmpne LABEL1731 - jump LABEL1814 -LABEL1731: + if_icmpne LABEL1761 + jump LABEL1844 +LABEL1761: iload 9 if_clearops iconst -1 @@ -1937,7 +1967,7 @@ LABEL1731: iconst -1 sconst "" iload 9 - if_setonmouserepeat + if_setonmouseover iconst -1 sconst "" iload 9 @@ -1954,14 +1984,14 @@ LABEL1731: multiply cc_find iconst 1 - if_icmpeq LABEL1759 - jump LABEL1763 -LABEL1759: + if_icmpeq LABEL1789 + jump LABEL1793 +LABEL1789: sconst "" cc_settext iconst 1 cc_sethide -LABEL1763: +LABEL1793: iconst 10616888 iload 8 iconst 4 @@ -1970,14 +2000,14 @@ LABEL1763: add cc_find iconst 1 - if_icmpeq LABEL1773 - jump LABEL1777 -LABEL1773: + if_icmpeq LABEL1803 + jump LABEL1807 +LABEL1803: sconst "" cc_settext iconst 1 cc_sethide -LABEL1777: +LABEL1807: iconst 10616888 iload 8 iconst 4 @@ -1986,14 +2016,14 @@ LABEL1777: add cc_find iconst 1 - if_icmpeq LABEL1787 - jump LABEL1791 -LABEL1787: + if_icmpeq LABEL1817 + jump LABEL1821 +LABEL1817: sconst "" cc_settext iconst 1 cc_sethide -LABEL1791: +LABEL1821: iconst 10616888 iload 8 iconst 4 @@ -2002,12 +2032,12 @@ LABEL1791: add cc_find iconst 1 - if_icmpeq LABEL1801 - jump LABEL1803 -LABEL1801: + if_icmpeq LABEL1831 + jump LABEL1833 +LABEL1831: iconst 1 cc_sethide -LABEL1803: +LABEL1833: iload 8 iconst 1 add @@ -2018,8 +2048,8 @@ LABEL1803: iload 8 enum istore 9 - jump LABEL1727 -LABEL1814: + jump LABEL1757 +LABEL1844: iload 6 iconst 2 sub @@ -2033,20 +2063,20 @@ LABEL1814: istore 23 iload 6 iload 23 - if_icmpgt LABEL1829 - jump LABEL1831 -LABEL1829: + if_icmpgt LABEL1859 + jump LABEL1861 +LABEL1859: iload 6 istore 23 -LABEL1831: +LABEL1861: iload 22 istore 8 -LABEL1833: +LABEL1863: iload 8 iconst 0 - if_icmpgt LABEL1837 - jump LABEL1920 -LABEL1837: + if_icmpgt LABEL1867 + jump LABEL1950 +LABEL1867: iload 8 iconst 1 sub @@ -2077,40 +2107,6 @@ LABEL1837: multiply cc_find iconst 1 - if_icmpeq LABEL1869 - jump LABEL1874 -LABEL1869: - cc_getx - iload 6 - iconst 0 - iconst 0 - cc_setposition -LABEL1874: - iconst 10616888 - iload 8 - iconst 4 - multiply - iconst 1 - add - cc_find - iconst 1 - if_icmpeq LABEL1884 - jump LABEL1889 -LABEL1884: - cc_getx - iload 6 - iconst 0 - iconst 0 - cc_setposition -LABEL1889: - iconst 10616888 - iload 8 - iconst 4 - multiply - iconst 2 - add - cc_find - iconst 1 if_icmpeq LABEL1899 jump LABEL1904 LABEL1899: @@ -2124,7 +2120,7 @@ LABEL1904: iload 8 iconst 4 multiply - iconst 3 + iconst 1 add cc_find iconst 1 @@ -2137,8 +2133,42 @@ LABEL1914: iconst 0 cc_setposition LABEL1919: - jump LABEL1833 -LABEL1920: + iconst 10616888 + iload 8 + iconst 4 + multiply + iconst 2 + add + cc_find + iconst 1 + if_icmpeq LABEL1929 + jump LABEL1934 +LABEL1929: + cc_getx + iload 6 + iconst 0 + iconst 0 + cc_setposition +LABEL1934: + iconst 10616888 + iload 8 + iconst 4 + multiply + iconst 3 + add + cc_find + iconst 1 + if_icmpeq LABEL1944 + jump LABEL1949 +LABEL1944: + cc_getx + iload 6 + iconst 0 + iconst 0 + cc_setposition +LABEL1949: + jump LABEL1863 +LABEL1950: iconst 0 iload 23 iconst 10616888 diff --git a/runelite-client/src/main/scripts/ChatSend.hash b/runelite-client/src/main/scripts/ChatSend.hash index 9c54adf40e..03fd850497 100644 --- a/runelite-client/src/main/scripts/ChatSend.hash +++ b/runelite-client/src/main/scripts/ChatSend.hash @@ -1 +1 @@ -6FB26238E2041A40DE52A7E797AD54BF8633BE93FD3B0C244F1313B53CC0A922 \ No newline at end of file +77B41EBBD7A825A8AC984B282115ED636C9F32A4FA777B1B58169E9C6FF103E0 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ChatSplitBuilder.hash b/runelite-client/src/main/scripts/ChatSplitBuilder.hash index f44294153a..39f5efa12c 100644 --- a/runelite-client/src/main/scripts/ChatSplitBuilder.hash +++ b/runelite-client/src/main/scripts/ChatSplitBuilder.hash @@ -1 +1 @@ -7D996BC73BC98D9BDE8FCDC0A866021F1F217F370B35C30C5B4B0FFECD9135C0 \ No newline at end of file +21BB416CB6B1BC4EF5150411D12A118494BCF943E7A419682377C33639F488C1 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm index 80cdf54e09..eb8907443e 100644 --- a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm +++ b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm @@ -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 "" 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 "" - append sload 5 sconst "splitPrivChatUsernameColor" runelite_callback @@ -446,6 +443,7 @@ LABEL371: sconst ":" sconst "" 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 "" - append sload 5 sconst "splitPrivChatUsernameColor" runelite_callback @@ -481,6 +475,7 @@ LABEL403: sconst ":" sconst "" 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 "" - append sload 5 sload 0 sconst "" 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 diff --git a/runelite-client/src/main/scripts/CommandScript.hash b/runelite-client/src/main/scripts/CommandScript.hash index 3e4753a0fe..837a1a06f9 100644 --- a/runelite-client/src/main/scripts/CommandScript.hash +++ b/runelite-client/src/main/scripts/CommandScript.hash @@ -1 +1 @@ -690BCC4CE42FE670B31A14E214FECD3B27CEB013D6413713DB4A587D1CC38974 \ No newline at end of file +BC3DDC3675375E1FD9AD64DEBF4FDA5B4102FE542088C310881120DC47270566 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/CommandScript.rs2asm b/runelite-client/src/main/scripts/CommandScript.rs2asm index 15da445c03..8f7fb0cece 100644 --- a/runelite-client/src/main/scripts/CommandScript.rs2asm +++ b/runelite-client/src/main/scripts/CommandScript.rs2asm @@ -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 diff --git a/runelite-client/src/main/scripts/GELayout.hash b/runelite-client/src/main/scripts/GELayout.hash index dba0bed2f5..0417d1658c 100644 --- a/runelite-client/src/main/scripts/GELayout.hash +++ b/runelite-client/src/main/scripts/GELayout.hash @@ -1 +1 @@ -03E202EADA91DB0D5EE9B98E360685149F29B10A1C565B9BE65C2A50BD262BC3 \ No newline at end of file +F24070EC29F94E90F83578CF29B242EB9F31D6255578C69F51814E9C199B6E8E \ No newline at end of file diff --git a/runelite-client/src/main/scripts/GELayout.rs2asm b/runelite-client/src/main/scripts/GELayout.rs2asm index b60bb6537b..9e8c00b4c7 100644 --- a/runelite-client/src/main/scripts/GELayout.rs2asm +++ b/runelite-client/src/main/scripts/GELayout.rs2asm @@ -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 diff --git a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash index 66a18c2a05..8ea504548f 100644 --- a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash +++ b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash @@ -1 +1 @@ -9C827673E7E0FADA71DB2017F4AEE7CC2A6A9C617756DBAF7821B93D62D412C8 \ No newline at end of file +1A989C17A54BD28EE9DEE314EFB9198FCD16B0D90D2B296CE4C4165C7464B8BC \ No newline at end of file diff --git a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm index 89363385e9..ce745610ea 100644 --- a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm +++ b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm @@ -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 diff --git a/runelite-client/src/main/scripts/ToplevelChatboxBackground.hash b/runelite-client/src/main/scripts/ToplevelChatboxBackground.hash index e928cac148..3fb1ce7612 100644 --- a/runelite-client/src/main/scripts/ToplevelChatboxBackground.hash +++ b/runelite-client/src/main/scripts/ToplevelChatboxBackground.hash @@ -1 +1 @@ -CAF61FF2A3131623A421CCCC68914587A69044768DEB79432DA8A85937283F7B \ No newline at end of file +4D29B854CF452995C8D3CF235D045560B8C8F847C2DD0ED2B3FF71B1C5A95509 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm b/runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm index 9d9a3c7001..5d9ad2de83 100644 --- a/runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm +++ b/runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm @@ -1,7 +1,7 @@ .id 923 .int_stack_count 0 .string_stack_count 0 -.int_var_count 5 +.int_var_count 14 .string_var_count 0 ; callback "chatboxBackgroundBuilt" ; used by the ChatboxPerformancePlugin to know when it needs to rebuild. @@ -191,178 +191,154 @@ LABEL159: 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: + if_icmpeq LABEL167 + jump LABEL171 +LABEL167: iconst 1 iconst 10616867 if_setnoclickthrough - jump LABEL183 -LABEL177: + jump LABEL177 +LABEL171: iconst 0 iconst 10616867 if_setnoclickthrough iconst 1 iconst 10616867 if_setnoscrollthrough -LABEL183: - iconst 0 +LABEL177: + iconst 20 + istore 2 + iconst 193 + istore 3 + iconst 253 istore 4 + iconst 10616867 + if_getheight + istore 5 + iload 5 + iload 2 + div + istore 6 + iload 5 + iload 6 + iload 2 + multiply + sub + istore 7 + iconst 200 + istore 8 + iconst 253 + istore 9 + iconst 10616886 + if_getwidth + istore 10 + iload 10 + iload 2 + div + istore 11 + iload 10 + iload 11 + iload 2 + multiply + sub + istore 12 + iconst 0 + istore 13 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: + if_icmpeq LABEL219 + jump LABEL394 +LABEL219: invoke 1972 iconst 0 - if_icmpeq LABEL271 - jump LABEL351 -LABEL271: - iload 4 - iconst 20 - if_icmplt LABEL275 - jump LABEL350 -LABEL275: + if_icmpeq LABEL223 + jump LABEL334 +LABEL223: + iload 13 + iload 2 + if_icmplt LABEL227 + jump LABEL333 +LABEL227: iconst 10616867 iconst 3 - iload 4 + iload 13 cc_create - iconst 0 - iload 3 + iload 13 + iload 2 iconst 1 - iconst 2 + sub + if_icmpeq LABEL237 + jump LABEL245 +LABEL237: + iconst 0 + iload 6 + iload 7 + add + iconst 1 + iconst 0 cc_setsize + jump LABEL250 +LABEL245: iconst 0 - iconst 0 + iload 6 iconst 1 - iconst 2 + iconst 0 + cc_setsize +LABEL250: + iconst 0 + iload 6 + iload 13 + multiply + iconst 0 + iconst 0 cc_setposition iconst 0 cc_setcolour iconst 1 cc_setfill - iconst 254 + iload 4 + iload 3 + iconst 0 + iload 2 + iload 13 + interpolate cc_settrans iconst 10616886 iconst 3 - iload 4 + iload 13 iconst 2 multiply cc_create iconst 10616886 iconst 3 - iload 4 + iload 13 iconst 2 multiply iconst 1 add cc_create 1 - iload 3 + iload 11 iconst 1 - iconst 2 + iconst 0 iconst 0 cc_setsize - iload 3 + iload 11 iconst 1 - iconst 2 + iconst 0 iconst 0 cc_setsize 1 - iconst 0 + iload 11 + iload 13 + multiply iconst 0 iconst 0 iconst 0 cc_setposition - iconst 0 + iload 11 + iload 13 + multiply iconst 15 iconst 0 iconst 2 @@ -375,30 +351,36 @@ LABEL275: cc_setfill iconst 1 cc_setfill 1 - iconst 250 + iload 8 + iload 9 + iconst 0 + iload 2 + iload 13 + interpolate cc_settrans - iconst 250 + iload 8 + iload 9 + iconst 0 + iload 2 + iload 13 + interpolate cc_settrans 1 - iload 4 + iload 13 iconst 1 add - iload 3 - iload 2 - sub - istore 3 - istore 4 - jump LABEL271 -LABEL350: + istore 13 + jump LABEL223 +LABEL333: sconst "chatboxBackgroundBuilt" runelite_callback - jump LABEL417 -LABEL351: + jump LABEL394 +LABEL334: iconst 10616867 iconst 3 - iload 4 + iconst 0 cc_create iconst 0 - iload 3 + iconst 16384 iconst 1 iconst 2 cc_setsize @@ -415,24 +397,18 @@ LABEL351: cc_settrans iconst 10616886 iconst 3 - iload 4 - iconst 2 - multiply + iconst 0 cc_create iconst 10616886 iconst 3 - iload 4 - iconst 2 - multiply iconst 1 - add cc_create 1 - iload 3 + iconst 16384 iconst 1 iconst 2 iconst 0 cc_setsize - iload 3 + iconst 16384 iconst 1 iconst 2 iconst 0 @@ -459,7 +435,7 @@ LABEL351: cc_settrans iconst 130 cc_settrans 1 -LABEL417: +LABEL394: iconst 10617389 iconst 1190 iconst 1187 @@ -471,24 +447,24 @@ LABEL417: invoke 838 iload 0 iconst 1 - if_icmpeq LABEL430 - jump LABEL434 -LABEL430: + if_icmpeq LABEL407 + jump LABEL411 +LABEL407: iconst 255 iconst 10616835 if_settrans - jump LABEL465 -LABEL434: + jump LABEL442 +LABEL411: invoke 1972 iconst 0 - if_icmpeq LABEL438 - jump LABEL442 -LABEL438: + if_icmpeq LABEL415 + jump LABEL419 +LABEL415: iconst 155 iconst 10616835 if_settrans - jump LABEL465 -LABEL442: + jump LABEL442 +LABEL419: iconst 255 iconst 10616835 if_settrans @@ -512,5 +488,5 @@ LABEL442: cc_setfill iconst 225 cc_settrans -LABEL465: +LABEL442: return From 2e1e5bfd723fa5f21deb6db71e90768190acae56 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Thu, 9 Dec 2021 04:55:12 -0700 Subject: [PATCH 10/12] rl-client: remove chatbox performance plugin vanilla's background was reworked so this shouldn't be necessary --- .../ChatboxPerformancePlugin.java | 160 ------ .../scripts/ToplevelChatboxBackground.hash | 1 - .../scripts/ToplevelChatboxBackground.rs2asm | 492 ------------------ 3 files changed, 653 deletions(-) delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java delete mode 100644 runelite-client/src/main/scripts/ToplevelChatboxBackground.hash delete mode 100644 runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java deleted file mode 100644 index 15e20d6c8a..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java +++ /dev/null @@ -1,160 +0,0 @@ -/* - * Copyright (c) 2018, Woox - * 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); - } - } -} diff --git a/runelite-client/src/main/scripts/ToplevelChatboxBackground.hash b/runelite-client/src/main/scripts/ToplevelChatboxBackground.hash deleted file mode 100644 index 3fb1ce7612..0000000000 --- a/runelite-client/src/main/scripts/ToplevelChatboxBackground.hash +++ /dev/null @@ -1 +0,0 @@ -4D29B854CF452995C8D3CF235D045560B8C8F847C2DD0ED2B3FF71B1C5A95509 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm b/runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm deleted file mode 100644 index 5d9ad2de83..0000000000 --- a/runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm +++ /dev/null @@ -1,492 +0,0 @@ -.id 923 -.int_stack_count 0 -.string_stack_count 0 -.int_var_count 14 -.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: - get_varbit 2570 - iconst 1 - if_icmpeq LABEL167 - jump LABEL171 -LABEL167: - iconst 1 - iconst 10616867 - if_setnoclickthrough - jump LABEL177 -LABEL171: - iconst 0 - iconst 10616867 - if_setnoclickthrough - iconst 1 - iconst 10616867 - if_setnoscrollthrough -LABEL177: - iconst 20 - istore 2 - iconst 193 - istore 3 - iconst 253 - istore 4 - iconst 10616867 - if_getheight - istore 5 - iload 5 - iload 2 - div - istore 6 - iload 5 - iload 6 - iload 2 - multiply - sub - istore 7 - iconst 200 - istore 8 - iconst 253 - istore 9 - iconst 10616886 - if_getwidth - istore 10 - iload 10 - iload 2 - div - istore 11 - iload 10 - iload 11 - iload 2 - multiply - sub - istore 12 - iconst 0 - istore 13 - iload 1 - iconst 0 - if_icmpeq LABEL219 - jump LABEL394 -LABEL219: - invoke 1972 - iconst 0 - if_icmpeq LABEL223 - jump LABEL334 -LABEL223: - iload 13 - iload 2 - if_icmplt LABEL227 - jump LABEL333 -LABEL227: - iconst 10616867 - iconst 3 - iload 13 - cc_create - iload 13 - iload 2 - iconst 1 - sub - if_icmpeq LABEL237 - jump LABEL245 -LABEL237: - iconst 0 - iload 6 - iload 7 - add - iconst 1 - iconst 0 - cc_setsize - jump LABEL250 -LABEL245: - iconst 0 - iload 6 - iconst 1 - iconst 0 - cc_setsize -LABEL250: - iconst 0 - iload 6 - iload 13 - multiply - iconst 0 - iconst 0 - cc_setposition - iconst 0 - cc_setcolour - iconst 1 - cc_setfill - iload 4 - iload 3 - iconst 0 - iload 2 - iload 13 - interpolate - cc_settrans - iconst 10616886 - iconst 3 - iload 13 - iconst 2 - multiply - cc_create - iconst 10616886 - iconst 3 - iload 13 - iconst 2 - multiply - iconst 1 - add - cc_create 1 - iload 11 - iconst 1 - iconst 0 - iconst 0 - cc_setsize - iload 11 - iconst 1 - iconst 0 - iconst 0 - cc_setsize 1 - iload 11 - iload 13 - multiply - iconst 0 - iconst 0 - iconst 0 - cc_setposition - iload 11 - iload 13 - multiply - 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 - iload 8 - iload 9 - iconst 0 - iload 2 - iload 13 - interpolate - cc_settrans - iload 8 - iload 9 - iconst 0 - iload 2 - iload 13 - interpolate - cc_settrans 1 - iload 13 - iconst 1 - add - istore 13 - jump LABEL223 -LABEL333: - sconst "chatboxBackgroundBuilt" - runelite_callback - jump LABEL394 -LABEL334: - iconst 10616867 - iconst 3 - iconst 0 - cc_create - iconst 0 - iconst 16384 - 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 - 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 200 - cc_settrans - iconst 130 - cc_settrans 1 -LABEL394: - iconst 10617389 - iconst 1190 - iconst 1187 - iconst 1188 - iconst 1189 - iconst 1185 - iconst 1186 - iconst 1 - invoke 838 - iload 0 - iconst 1 - if_icmpeq LABEL407 - jump LABEL411 -LABEL407: - iconst 255 - iconst 10616835 - if_settrans - jump LABEL442 -LABEL411: - invoke 1972 - iconst 0 - if_icmpeq LABEL415 - jump LABEL419 -LABEL415: - iconst 155 - iconst 10616835 - if_settrans - jump LABEL442 -LABEL419: - 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 -LABEL442: - return From c45d7d41d736fc2fbde94c763f62f0f675638b78 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Thu, 9 Dec 2021 14:34:20 +0000 Subject: [PATCH 11/12] Release 1.8.6 --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- http-api/pom.xml | 2 +- http-service/pom.xml | 2 +- pom.xml | 4 ++-- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-jshell/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 5f54995b99..517773dc2a 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.6-SNAPSHOT + 1.8.6 cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 49bd310da0..2a0d18ada3 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.8.6-SNAPSHOT + 1.8.6 Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 708b5987b5..838ed3aab5 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.6-SNAPSHOT + 1.8.6 cache diff --git a/http-api/pom.xml b/http-api/pom.xml index d5bf4a1eda..c6594288ad 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.8.6-SNAPSHOT + 1.8.6 Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index a197cc6641..77bf1cdeac 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.8.6-SNAPSHOT + 1.8.6 Web Service diff --git a/pom.xml b/pom.xml index 019ee0936c..944bda9269 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.8.6-SNAPSHOT + 1.8.6 pom RuneLite @@ -61,7 +61,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - HEAD + runelite-parent-1.8.6 diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index b54416057b..7644e4f232 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.6-SNAPSHOT + 1.8.6 runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index da70f04e45..ad45e1f66b 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.6-SNAPSHOT + 1.8.6 client diff --git a/runelite-jshell/pom.xml b/runelite-jshell/pom.xml index bdad6ef657..79e17d37cb 100644 --- a/runelite-jshell/pom.xml +++ b/runelite-jshell/pom.xml @@ -30,7 +30,7 @@ net.runelite runelite-parent - 1.8.6-SNAPSHOT + 1.8.6 jshell diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 4b93922611..3872d26058 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.6-SNAPSHOT + 1.8.6 script-assembler-plugin From 479de04b735931ba2c1eadffbe21c4e0cb7eacb8 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Thu, 9 Dec 2021 14:34:23 +0000 Subject: [PATCH 12/12] Bump for 1.8.7-SNAPSHOT --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- http-api/pom.xml | 2 +- http-service/pom.xml | 2 +- pom.xml | 4 ++-- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-jshell/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 517773dc2a..aa3e9cf336 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.6 + 1.8.7-SNAPSHOT cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 2a0d18ada3..89eab54e01 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.8.6 + 1.8.7-SNAPSHOT Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 838ed3aab5..e3dd6a7fda 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.6 + 1.8.7-SNAPSHOT cache diff --git a/http-api/pom.xml b/http-api/pom.xml index c6594288ad..cbb637626e 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.8.6 + 1.8.7-SNAPSHOT Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index 77bf1cdeac..9c34fb8984 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.8.6 + 1.8.7-SNAPSHOT Web Service diff --git a/pom.xml b/pom.xml index 944bda9269..51e43da81f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.8.6 + 1.8.7-SNAPSHOT pom RuneLite @@ -61,7 +61,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - runelite-parent-1.8.6 + HEAD diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 7644e4f232..78e3b77012 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.6 + 1.8.7-SNAPSHOT runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index ad45e1f66b..46bd34a2b2 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.6 + 1.8.7-SNAPSHOT client diff --git a/runelite-jshell/pom.xml b/runelite-jshell/pom.xml index 79e17d37cb..a4e3b26d1f 100644 --- a/runelite-jshell/pom.xml +++ b/runelite-jshell/pom.xml @@ -30,7 +30,7 @@ net.runelite runelite-parent - 1.8.6 + 1.8.7-SNAPSHOT jshell diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 3872d26058..6c7b4e3810 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.6 + 1.8.7-SNAPSHOT script-assembler-plugin