Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ repositories {
}
}

def lastSupportedVersion = "1.10.36"
def lastSupportedVersion = "1.10.46.1"
def runeLiteVersion = getRuneLiteVersion()
def supportedCheck = false
if (supportedCheck) {
Expand All @@ -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()))
Expand Down
30 changes: 11 additions & 19 deletions src/main/java/net/runelite/client/callback/ClientThread.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<BooleanSupplier> 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() {
Expand All @@ -118,4 +110,4 @@ private void invokeList(ConcurrentLinkedQueue<BooleanSupplier> invokes) {
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -779,4 +779,8 @@ public void setOnScrollWheelListener(Object... objects) {
@Override
public void clearActions() { wrappedWidget.clearActions(); }

@Override
public int[] getVarTransmitTrigger() {
return wrappedWidget.getVarTransmitTrigger();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -600,5 +610,10 @@ public Widget setDragParent(Widget dragParent) {
public void clearActions() {
super.clearActions();
}

@Override
public int[] getVarTransmitTrigger() {
return super.getVarTransmitTrigger();
}
}
}