From dd62d0654e1d422b720b64d8e47eb05c55ff111b Mon Sep 17 00:00:00 2001 From: Lee Marlow Date: Sun, 8 Dec 2024 19:16:02 -0800 Subject: [PATCH 1/4] add getDraw2DMask, setDraw2DMask, and getVarTransmitTrigger --- build.gradle | 2 +- .../client_wrapper/BaseClientWrapper.java | 10 ++++++++++ .../client_wrapper/BaseWidgetWrapper.java | 4 ++++ .../rsb/wrappers/client_wrapper/RSClient.java | 15 +++++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e2ce63f3..43e1962f 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ repositories { } } -def lastSupportedVersion = "1.10.36" +def lastSupportedVersion = "1.10.45" def runeLiteVersion = getRuneLiteVersion() def supportedCheck = false if (supportedCheck) { diff --git a/src/main/java/net/runelite/rsb/wrappers/client_wrapper/BaseClientWrapper.java b/src/main/java/net/runelite/rsb/wrappers/client_wrapper/BaseClientWrapper.java index f48438e9..f83847b6 100644 --- a/src/main/java/net/runelite/rsb/wrappers/client_wrapper/BaseClientWrapper.java +++ b/src/main/java/net/runelite/rsb/wrappers/client_wrapper/BaseClientWrapper.java @@ -1620,4 +1620,14 @@ public WorldView getWorldView(int i) { public WorldView getTopLevelWorldView() { return wrappedClient.getTopLevelWorldView(); } + + @Override + public int getDraw2DMask() { + return wrappedClient.getDraw2DMask(); + } + + @Override + public void setDraw2DMask(int i) { + wrappedClient.setDraw2DMask(i); + } } diff --git a/src/main/java/net/runelite/rsb/wrappers/client_wrapper/BaseWidgetWrapper.java b/src/main/java/net/runelite/rsb/wrappers/client_wrapper/BaseWidgetWrapper.java index e45131cb..4dee60b3 100644 --- a/src/main/java/net/runelite/rsb/wrappers/client_wrapper/BaseWidgetWrapper.java +++ b/src/main/java/net/runelite/rsb/wrappers/client_wrapper/BaseWidgetWrapper.java @@ -779,4 +779,8 @@ public void setOnScrollWheelListener(Object... objects) { @Override public void clearActions() { wrappedWidget.clearActions(); } + @Override + public int[] getVarTransmitTrigger() { + return wrappedWidget.getVarTransmitTrigger(); + } } diff --git a/src/main/java/net/runelite/rsb/wrappers/client_wrapper/RSClient.java b/src/main/java/net/runelite/rsb/wrappers/client_wrapper/RSClient.java index e62dbda1..cdc02676 100644 --- a/src/main/java/net/runelite/rsb/wrappers/client_wrapper/RSClient.java +++ b/src/main/java/net/runelite/rsb/wrappers/client_wrapper/RSClient.java @@ -281,6 +281,16 @@ public WorldView getTopLevelWorldView() { return convertResult(super.getTopLevelWorldView()); } + @Override + public int getDraw2DMask() { + return super.getDraw2DMask(); + } + + @Override + public void setDraw2DMask(int i) { + super.setDraw2DMask(i); + } + @Nullable @Override public LocalPoint getLocalDestinationLocation() { // tested, causes freezes without runOnClientThread @@ -600,5 +610,10 @@ public Widget setDragParent(Widget dragParent) { public void clearActions() { super.clearActions(); } + + @Override + public int[] getVarTransmitTrigger() { + return super.getVarTransmitTrigger(); + } } } From d9145059ccc26dcf65a9d221cf83d810fa8007bc Mon Sep 17 00:00:00 2001 From: Lee Marlow Date: Mon, 9 Dec 2024 18:33:14 -0800 Subject: [PATCH 2/4] add invokeAtTickEnd and update invoke --- .../client/callback/ClientThread.java | 30 +++++++------------ 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/src/main/java/net/runelite/client/callback/ClientThread.java b/src/main/java/net/runelite/client/callback/ClientThread.java index b9033f65..e983bfa5 100644 --- a/src/main/java/net/runelite/client/callback/ClientThread.java +++ b/src/main/java/net/runelite/client/callback/ClientThread.java @@ -70,28 +70,20 @@ public void invokeLater(BooleanSupplier r) { invokes.add(r); } + public void invokeAtTickEnd(Runnable r) + { + invokesAtTickEnd.add(() -> + { + r.run(); + return true; + }); + } + /** * Invokes queued actions on the client thread */ void invoke() { - assert client.isClientThread(); - Iterator ir = invokes.iterator(); - while (ir.hasNext()) { - BooleanSupplier r = ir.next(); - boolean remove = true; - try { - remove = r.getAsBoolean(); - } catch (ThreadDeath d) { - throw d; - } catch (Throwable e) { - log.warn("Exception in invoke", e); - } - if (remove) { - ir.remove(); - } else { - log.trace("Deferring task {}", r); - } - } + invokeList(invokes); } void invokeTickEnd() { @@ -118,4 +110,4 @@ private void invokeList(ConcurrentLinkedQueue invokes) { } } } -} \ No newline at end of file +} From cbf6699c82b3c8deeec095d7884cfedf2341d9b1 Mon Sep 17 00:00:00 2001 From: Lee Marlow Date: Mon, 9 Dec 2024 18:53:25 -0800 Subject: [PATCH 3/4] update lastSupportedVersion to 1.10.46-SNAPSHOT --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 43e1962f..989471d3 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ repositories { } } -def lastSupportedVersion = "1.10.45" +def lastSupportedVersion = "1.10.46-SNAPSHOT" def runeLiteVersion = getRuneLiteVersion() def supportedCheck = false if (supportedCheck) { From b72e8434b3f724e445f3f9a7d064caee5fa29e88 Mon Sep 17 00:00:00 2001 From: Lee Marlow Date: Tue, 10 Dec 2024 15:23:54 -0800 Subject: [PATCH 4/4] update lastSupportedVersion to 1.10.46.1 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 989471d3..5b4cadef 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ repositories { } } -def lastSupportedVersion = "1.10.46-SNAPSHOT" +def lastSupportedVersion = "1.10.46.1" def runeLiteVersion = getRuneLiteVersion() def supportedCheck = false if (supportedCheck) { @@ -26,7 +26,7 @@ if (supportedCheck) { } static def getRuneLiteVersion() { - URL url = new URL("http://repo.runelite.net/net/runelite/client/maven-metadata.xml") + URL url = new URL("https://repo.runelite.net/net/runelite/client/maven-metadata.xml") URLConnection urlConnection = url.openConnection() BufferedReader bufferedReader = new BufferedReader(new InputStreamReader( urlConnection.getInputStream()))