From f32d155f65e2806b0a1cf52da7293d0102df4470 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 22 Feb 2020 20:55:04 -0500 Subject: [PATCH 1/4] session: add logged-in tracking --- .../runelite/client/ClientSessionManager.java | 16 +++++++++++++--- .../java/net/runelite/client/SessionClient.java | 6 +++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java b/runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java index b206c8464b..0741f31231 100644 --- a/runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java @@ -29,9 +29,12 @@ import java.util.UUID; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; +import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; +import net.runelite.api.Client; +import net.runelite.api.GameState; import net.runelite.client.util.RunnableExceptionLogger; @Singleton @@ -40,15 +43,16 @@ public class ClientSessionManager { private final SessionClient sessionClient = new SessionClient(); private final ScheduledExecutorService executorService; + private final Client client; private ScheduledFuture scheduledFuture; private UUID sessionId; - @Inject - ClientSessionManager(ScheduledExecutorService executorService) + ClientSessionManager(ScheduledExecutorService executorService, @Nullable Client client) { this.executorService = executorService; + this.client = client; } public void start() @@ -101,9 +105,15 @@ public class ClientSessionManager return; } + boolean loggedIn = false; + if (client != null) + { + loggedIn = client.getGameState() != GameState.LOGIN_SCREEN; + } + try { - sessionClient.ping(sessionId); + sessionClient.ping(sessionId, loggedIn); } catch (IOException ex) { diff --git a/runelite-client/src/main/java/net/runelite/client/SessionClient.java b/runelite-client/src/main/java/net/runelite/client/SessionClient.java index e3166dfc98..ecfa96bafe 100644 --- a/runelite-client/src/main/java/net/runelite/client/SessionClient.java +++ b/runelite-client/src/main/java/net/runelite/client/SessionClient.java @@ -32,6 +32,7 @@ import java.util.UUID; import net.runelite.http.api.RuneLiteAPI; import okhttp3.HttpUrl; import okhttp3.Request; +import okhttp3.RequestBody; import okhttp3.Response; import okhttp3.ResponseBody; @@ -43,6 +44,7 @@ class SessionClient .build(); Request request = new Request.Builder() + .post(RequestBody.create(null, new byte[0])) .url(url) .build(); @@ -59,14 +61,16 @@ class SessionClient } } - void ping(UUID uuid) throws IOException + void ping(UUID uuid, boolean loggedIn) throws IOException { HttpUrl url = RuneLiteAPI.getSessionBase().newBuilder() .addPathSegment("ping") .addQueryParameter("session", uuid.toString()) + .addQueryParameter("logged-in", String.valueOf(loggedIn)) .build(); Request request = new Request.Builder() + .post(RequestBody.create(null, new byte[0])) .url(url) .build(); From 65d2127ba68f7f9641339af504f4f21951f1d97a Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 27 Feb 2020 11:33:12 +0000 Subject: [PATCH 2/4] Update Object IDs to 2020-02-27-rev182 --- .../main/java/net/runelite/api/NullObjectID.java | 14 +------------- .../src/main/java/net/runelite/api/ObjectID.java | 14 ++++---------- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java index b6e68844cb..07a5345876 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -13894,9 +13894,7 @@ public final class NullObjectID public static final int NULL_29702 = 29702; public static final int NULL_29703 = 29703; public static final int NULL_29704 = 29704; - public static final int NULL_29707 = 29707; - public static final int NULL_29711 = 29711; - public static final int NULL_29712 = 29712; + public static final int NULL_29706 = 29706; public static final int NULL_29713 = 29713; public static final int NULL_29714 = 29714; public static final int NULL_29715 = 29715; @@ -14124,14 +14122,6 @@ public final class NullObjectID public static final int NULL_30144 = 30144; public static final int NULL_30156 = 30156; public static final int NULL_30159 = 30159; - public static final int NULL_30160 = 30160; - public static final int NULL_30162 = 30162; - public static final int NULL_30163 = 30163; - public static final int NULL_30164 = 30164; - public static final int NULL_30165 = 30165; - public static final int NULL_30166 = 30166; - public static final int NULL_30167 = 30167; - public static final int NULL_30168 = 30168; public static final int NULL_30171 = 30171; public static final int NULL_30181 = 30181; public static final int NULL_30182 = 30182; @@ -14986,7 +14976,6 @@ public final class NullObjectID public static final int NULL_31895 = 31895; public static final int NULL_31896 = 31896; public static final int NULL_31897 = 31897; - public static final int NULL_31899 = 31899; public static final int NULL_31937 = 31937; public static final int NULL_31938 = 31938; public static final int NULL_31945 = 31945; @@ -18359,7 +18348,6 @@ public final class NullObjectID public static final int NULL_37980 = 37980; public static final int NULL_37981 = 37981; public static final int NULL_37982 = 37982; - public static final int NULL_37983 = 37983; public static final int NULL_37984 = 37984; public static final int NULL_37985 = 37985; public static final int NULL_37986 = 37986; diff --git a/runelite-api/src/main/java/net/runelite/api/ObjectID.java b/runelite-api/src/main/java/net/runelite/api/ObjectID.java index 849aa048d9..df53c61a1d 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -15800,10 +15800,6 @@ public final class ObjectID public static final int CARVED_REDWOOD_29681 = 29681; public static final int CARVED_REDWOOD_29682 = 29682; public static final int CRACK_29705 = 29705; - public static final int BANNER_29706 = 29706; - public static final int BANQUET_TABLE_29708 = 29708; - public static final int PRESENT_TABLE = 29709; - public static final int BIRTHDAY_HAT_TABLE = 29710; public static final int NOTICEBOARD_29718 = 29718; public static final int BALLISTA_29719 = 29719; public static final int STAIRCASE_29720 = 29720; @@ -16024,7 +16020,6 @@ public final class ObjectID public static final int PAINTING_30155 = 30155; public static final int FURNACE_30157 = 30157; public static final int FURNACE_30158 = 30158; - public static final int PARTY_BALLOONS = 30161; public static final int CRACK_30169 = 30169; public static final int ROOT_30170 = 30170; public static final int PORTAL_30172 = 30172; @@ -18505,7 +18500,6 @@ public final class ObjectID public static final int ATTAS_PLANT_DISPLAY = 34685; public static final int LEATHER_SHIELDS = 34686; public static final int BRYOPHYTA_DISPLAY = 34687; - public static final int BANNER_34688 = 34688; public static final int BLOOMING_HESPORI_SPROUT = 34705; public static final int SHRIVELLED_PLANT = 34706; public static final int TWISTED_BUSH = 34712; @@ -19541,6 +19535,7 @@ public final class ObjectID public static final int NIGHTMARE_DISPLAY = 37629; public static final int NIGHTMARE_TOPIARY = 37630; public static final int SUPPLIES_37631 = 37631; + public static final int BANNER_37726 = 37726; public static final int ENERGY_BARRIER_37730 = 37730; public static final int ENERGY_BARRIER_37731 = 37731; public static final int SPORE = 37738; @@ -19591,11 +19586,10 @@ public final class ObjectID public static final int LIGHT_37958 = 37958; public static final int LIGHT_37959 = 37959; public static final int LIGHT_37960 = 37960; - public static final int BANNER_37961 = 37961; public static final int BANQUET_TABLE_37968 = 37968; - public static final int PRESENT_TABLE_37969 = 37969; - public static final int BIRTHDAY_HAT_TABLE_37970 = 37970; - public static final int PARTY_BALLOONS_37974 = 37974; + public static final int PRESENT_TABLE = 37969; + public static final int BIRTHDAY_HAT_TABLE = 37970; + public static final int PARTY_BALLOONS = 37974; public static final int TABLE_37976 = 37976; /* This file is automatically generated. Do not edit. */ } From 10a3c05202dbd817c84a03f5d40275c9b044f66f Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 27 Feb 2020 11:33:13 +0000 Subject: [PATCH 3/4] Update NPC IDs to 2020-02-27-rev182 --- runelite-api/src/main/java/net/runelite/api/NpcID.java | 1 + 1 file changed, 1 insertion(+) diff --git a/runelite-api/src/main/java/net/runelite/api/NpcID.java b/runelite-api/src/main/java/net/runelite/api/NpcID.java index dea872017e..bdf2409edf 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -8428,6 +8428,7 @@ public final class NpcID public static final int STRONG_RONNY = 9410; public static final int SHURA = 9413; public static final int SHURA_9414 = 9414; + public static final int ACORN = 9415; public static final int THE_NIGHTMARE = 9425; public static final int THE_NIGHTMARE_9426 = 9426; public static final int THE_NIGHTMARE_9427 = 9427; From 703d3ff91a71e6e666f83d146ba9f64e22ed5539 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 27 Feb 2020 11:33:17 +0000 Subject: [PATCH 4/4] Update Scripts to 2020-02-27-rev182 --- .../scripts/ChatboxInputWidgetBuilder.hash | 2 +- .../scripts/ChatboxInputWidgetBuilder.rs2asm | 86 +++++++++++++++---- 2 files changed, 69 insertions(+), 19 deletions(-) diff --git a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash index 7e9ed52814..696943e422 100644 --- a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash +++ b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash @@ -1 +1 @@ -62630EDCE5CEB8733A496E2CAD89A4298F6EC05B8751DC6C9D2B25ED9D7BA391 \ No newline at end of file +15660E39A740C416BFD71621A448A96FA6B5C5E8AD212179F3D6785AE35CAA38 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm index 7d608c5d0c..c244330a59 100644 --- a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm +++ b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm @@ -1,7 +1,7 @@ .id 223 .int_stack_count 0 .string_stack_count 0 -.int_var_count 4 +.int_var_count 5 .string_var_count 3 sconst "" sstore 0 @@ -42,28 +42,44 @@ LABEL23: sstore 2 iconst 0 istore 3 + invoke 1972 + istore 4 get_varbit 8119 iconst 1 - if_icmpeq LABEL40 - jump LABEL99 -LABEL40: + if_icmpeq LABEL42 + jump LABEL144 +LABEL42: iconst 105 iconst 115 iconst 1894 get_varbit 1777 enum chat_playername + join_string 2 + sstore 2 + iload 4 + iconst 1 + if_icmpeq LABEL54 + jump LABEL58 +LABEL54: + sload 2 + sconst "" + append + sstore 2 +LABEL58: + sload 2 sconst ": " sload 0 sload 1 sconst "" - join_string 6 + join_string 4 + append sstore 2 iload 2 iconst 80 - if_icmplt LABEL56 - jump LABEL63 -LABEL56: + if_icmplt LABEL70 + jump LABEL77 +LABEL70: sload 2 sload 0 sconst "*" @@ -71,31 +87,65 @@ LABEL56: join_string 3 append sstore 2 -LABEL63: +LABEL77: sload 2 iconst 2147483647 iconst 495 parawidth istore 3 + iload 4 + iconst 1 + if_icmpeq LABEL86 + jump LABEL101 +LABEL86: + iconst 5 + iload 3 + add + iconst 30 + iconst 0 + iconst 0 + iconst 10616871 + if_setsize + iconst 0 + iconst 0 + iconst 0 + iconst 2 + iconst 10616871 + if_setposition + jump LABEL113 +LABEL101: + iconst 0 + iconst 30 + iconst 0 + iconst 1 + iconst 10616871 + if_setsize + iconst 0 + iconst 0 + iconst 0 + iconst 2 + iconst 10616871 + if_setposition +LABEL113: iload 3 iconst 10616889 if_getwidth - if_icmpgt LABEL73 - jump LABEL79 -LABEL73: + if_icmpgt LABEL118 + jump LABEL124 +LABEL118: iconst 2 iconst 2 iconst 0 iconst 10616889 if_settextalign - jump LABEL84 -LABEL79: + jump LABEL129 +LABEL124: iconst 0 iconst 2 iconst 0 iconst 10616889 if_settextalign -LABEL84: +LABEL129: iconst 10616889 if_clearops iconst -1 @@ -110,8 +160,8 @@ LABEL84: sconst "" iconst 10616889 if_setonop - jump LABEL140 -LABEL99: + jump LABEL185 +LABEL144: iconst 105 iconst 115 iconst 1894 @@ -153,7 +203,7 @@ LABEL99: sconst "ii" iconst 10616889 if_setonop -LABEL140: +LABEL185: sload 2 iconst 10616889 if_settext