project: Java 17 support, update deps, rework some stupid logic

buildSrc/src/main/kotlin/Dependencies.kt

@@ -27,7 +27,7 @@ object ProjectVersions {
     const val launcherVersion = "2.2.0"
     const val rlVersion = "1.7.24"
 
-    const val openosrsVersion = "4.10.0"
+    const val openosrsVersion = "4.11.0"
 
     const val rsversion = 199
     const val cacheversion = 165

cache/cache.gradle.kts

@@ -38,14 +38,14 @@ dependencies {
 
     compileOnly(group = "org.projectlombok", name = "lombok", version = ProjectVersions.lombokVersion)
 
-    implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6")
-    implementation(group = "com.google.guava", name = "guava", version = "30.0-jre")
+    implementation(group = "com.google.code.gson", name = "gson", version = "2.8.5")
+    implementation(group = "com.google.guava", name = "guava", version = "30.1.1-jre")
     implementation(group = "commons-cli", name = "commons-cli", version = "1.4")
     implementation(group = "io.netty", name = "netty-buffer", version = "4.1.54.Final")
-    implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.9.0")
+    implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.9.1")
     implementation(group = "org.antlr", name = "antlr4-runtime", version = "4.8-1")
-    implementation(group = "org.apache.commons", name = "commons-compress", version = "1.20")
-    implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30")
+    implementation(group = "org.apache.commons", name = "commons-compress", version = "1.21")
+    implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.32")
 
     testAnnotationProcessor(group = "org.projectlombok", name = "lombok", version = ProjectVersions.lombokVersion)
 

deobfuscator/deobfuscator.gradle.kts

@@ -40,15 +40,15 @@ dependencies {
     implementation(project(":runelite-api"))
     implementation(project(":runescape-api"))
     implementation(project(":cache"))
-    implementation(group = "org.jetbrains", name = "annotations", version = "20.1.0")
+    implementation(group = "org.jetbrains", name = "annotations", version = "22.0.0")
     implementation(group = "org.ow2.asm", name = "asm", version = "9.0")
     implementation(group = "org.ow2.asm", name = "asm-util", version = "9.0")
     implementation(group = "net.runelite", name = "fernflower", version = "07082019")
     implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6")
-    implementation(group = "com.google.guava", name = "guava", version = "23.2-jre")
-    implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.12")
+    implementation(group = "com.google.guava", name = "guava", version = "30.1.1-jre")
+    implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.32")
 
-    runtimeOnly(group = "org.slf4j", name = "slf4j-simple", version = "1.7.12")
+    runtimeOnly(group = "org.slf4j", name = "slf4j-simple", version = "1.7.32")
 
     testImplementation(deobjars)
     testImplementation(group = "junit", name = "junit", version = "4.12")

http-api/http-api.gradle.kts

@@ -34,14 +34,14 @@ dependencies {
 
     implementation(project(":runelite-api"))
     implementation(group = "com.google.code.gson", name = "gson", version = "2.8.5")
-    implementation(group = "com.google.guava", name = "guava", version = "23.2-jre")
-    implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "3.7.0")
-    implementation(group = "org.apache.commons", name = "commons-csv", version = "1.4")
-    implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.12")
+    implementation(group = "com.google.guava", name = "guava", version = "30.1.1-jre")
+    implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.9.1")
+    implementation(group = "org.apache.commons", name = "commons-csv", version = "1.9.0")
+    implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.32")
 
-    testImplementation(group = "com.squareup.okhttp3", name = "mockwebserver", version = "4.9.0")
+    testImplementation(group = "com.squareup.okhttp3", name = "mockwebserver", version = "4.9.1")
     testImplementation(group = "junit", name = "junit", version = "4.12")
-    testImplementation(group = "org.slf4j", name = "slf4j-simple", version = "1.7.12")
+    testImplementation(group = "org.slf4j", name = "slf4j-simple", version = "1.7.32")
 }
 
 tasks {

injector/injector.gradle.kts

@@ -24,11 +24,11 @@ dependencies {
     implementation(project(":runescape-client"))
     implementation(project(":runelite-mixins"))
 
-    implementation(group = "org.ow2.asm", name = "asm", version = "8.0.1")
-    implementation(group = "org.ow2.asm", name = "asm-util", version = "8.0.1")
-    implementation(group = "org.jetbrains", name = "annotations", version = "19.0.0")
-    implementation(group = "com.google.guava", name = "guava", version = "23.2-jre")
-    implementation(group = "net.sf.jopt-simple", name = "jopt-simple", version = "5.0.1")
+    implementation(group = "org.ow2.asm", name = "asm", version = "9.0")
+    implementation(group = "org.ow2.asm", name = "asm-util", version = "9.0")
+    implementation(group = "org.jetbrains", name = "annotations", version = "22.0.0")
+    implementation(group = "com.google.guava", name = "guava", version = "30.1.1-jre")
+    implementation(group = "net.sf.jopt-simple", name = "jopt-simple", version = "5.0.4")
 }
 
 tasks.register<JavaExec>("inject") {

injector/src/main/java/com/openosrs/injector/injection/InjectData.java

@@ -63,7 +63,7 @@ public void initToVanilla()
 
 		for (final ClassFile deobClass : deobfuscated)
 		{
-			if (deobClass.getName().startsWith("net/runelite/"))
+			if (deobClass.getName().startsWith("net/runelite/") || deobClass.getName().startsWith("netscape"))
 			{
 				continue;
 			}

runelite-api/runelite-api.gradle.kts

@@ -31,9 +31,9 @@ dependencies {
     compileOnly(group = "org.projectlombok", name = "lombok", version = ProjectVersions.lombokVersion)
 
     implementation(group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2")
-    implementation(group = "com.google.guava", name = "guava", version = "23.2-jre")
-    implementation(group = "org.apache.commons", name = "commons-text", version = "1.2")
-    implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.12")
+    implementation(group = "com.google.guava", name = "guava", version = "30.1.1-jre")
+    implementation(group = "org.apache.commons", name = "commons-text", version = "1.9")
+    implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.32")
 
     testImplementation(group = "junit", name = "junit", version = "4.12")
 }

runelite-api/src/main/java/net/runelite/api/events/ActorDeath.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, HSJ <https://github.com/HSJ-OSRS>
+ * Copyright (c) 2018, Matthew Steglinski <https://github.com/sainttx>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,5 +33,5 @@
 @Value
 public class ActorDeath
 {
-	Actor actor;
+	private final Actor actor;
 }

runelite-api/src/main/java/net/runelite/api/events/AnimationChanged.java

@@ -1,7 +1,31 @@
+/*
+ * Copyright (c) 2016-2017, Abel Briggs
+ * 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.api.events;
 
-import net.runelite.api.Actor;
 import lombok.Data;
+import net.runelite.api.Actor;
 
 /**
  * An event where the {@link Actor} has changed animations.

runelite-api/src/main/java/net/runelite/api/events/AreaSoundEffectPlayed.java

@@ -33,7 +33,6 @@ public class AreaSoundEffectPlayed
 {
 	@Nullable
 	private final Actor source;
-
 	private int soundId;
 	private int sceneX;
 	private int sceneY;

runelite-api/src/main/java/net/runelite/api/events/ChatMessage.java

@@ -24,11 +24,11 @@
  */
 package net.runelite.api.events;
 
-import net.runelite.api.ChatMessageType;
-import net.runelite.api.MessageNode;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import net.runelite.api.ChatMessageType;
+import net.runelite.api.MessageNode;
 
 /**
  * An event where a new chat message is received.

runelite-api/src/main/java/net/runelite/api/events/CommandExecuted.java

@@ -47,9 +47,9 @@ public class CommandExecuted
 	/**
 	 * The name of the command entered.
 	 */
-	String command;
+	private String command;
 	/**
 	 * The command arguments that have been entered.
 	 */
-	String[] arguments;
+	private String[] arguments;
 }

runelite-api/src/main/java/net/runelite/api/events/DecorativeObjectChanged.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.Data;
 import net.runelite.api.DecorativeObject;
 import net.runelite.api.Tile;
-import lombok.Data;
 
 /**
  * An event where the {@link DecorativeObject} attached to a {@link Tile}

runelite-api/src/main/java/net/runelite/api/events/DecorativeObjectDespawned.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.Data;
 import net.runelite.api.DecorativeObject;
 import net.runelite.api.Tile;
-import lombok.Data;
 
 /**
  * An event where the {@link DecorativeObject} attached to a {@link Tile}

runelite-api/src/main/java/net/runelite/api/events/DecorativeObjectSpawned.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.Data;
 import net.runelite.api.DecorativeObject;
 import net.runelite.api.Tile;
-import lombok.Data;
 
 /**
  * An event where a {@link DecorativeObject} is attached to a {@link Tile}.

runelite-api/src/main/java/net/runelite/api/events/FakeXpDrop.java

@@ -30,6 +30,6 @@
 @Value
 public class FakeXpDrop
 {
-	Skill skill;
-	int xp;
+	private final Skill skill;
+	private final int xp;
 }

runelite-api/src/main/java/net/runelite/api/events/FriendsChatChanged.java

@@ -35,5 +35,5 @@ public class FriendsChatChanged
 	/**
 	 * Whether or not the client is now in a friends chat.
 	 */
-	boolean joined;
+	private boolean joined;
 }

runelite-api/src/main/java/net/runelite/api/events/FriendsChatMemberJoined.java

@@ -33,5 +33,5 @@ public class FriendsChatMemberJoined
 	/**
 	 * The member that joined
 	 */
-	FriendsChatMember member;
+	private FriendsChatMember member;
 }

runelite-api/src/main/java/net/runelite/api/events/FriendsChatMemberLeft.java

@@ -33,5 +33,5 @@ public class FriendsChatMemberLeft
 	/**
 	 * The member that left
 	 */
-	FriendsChatMember member;
+	private FriendsChatMember member;
 }

runelite-api/src/main/java/net/runelite/api/events/GameObjectDespawned.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.Data;
 import net.runelite.api.GameObject;
 import net.runelite.api.Tile;
-import lombok.Data;
 
 /**
  * An event where a {@link GameObject} on a {@link Tile} is removed.

runelite-api/src/main/java/net/runelite/api/events/GameObjectSpawned.java

@@ -37,9 +37,9 @@ public class GameObjectSpawned
 	/**
 	 * The affected tile.
 	 */
-	Tile tile;
+	private Tile tile;
 	/**
 	 * The newly spawned game object.
 	 */
-	GameObject gameObject;
+	private GameObject gameObject;
 }

runelite-api/src/main/java/net/runelite/api/events/GameStateChanged.java

@@ -24,8 +24,8 @@
  */
 package net.runelite.api.events;
 
-import net.runelite.api.GameState;
 import lombok.Data;
+import net.runelite.api.GameState;
 
 /**
  * An event where the clients game state has changed.

runelite-api/src/main/java/net/runelite/api/events/GrandExchangeOfferChanged.java

@@ -24,20 +24,21 @@
  */
 package net.runelite.api.events;
 
-import net.runelite.api.GrandExchangeOffer;
 import lombok.Data;
+import net.runelite.api.GrandExchangeOffer;
+import net.runelite.api.GrandExchangeOfferState;
 
 /**
- * An event where a {GrandExchangeOffer} has been updated with
+ * An event where a {@link GrandExchangeOffer} has been updated with
  * new information.
  * <p>
  * When the client initially logs in, this event is called for all grand
- * exchange slots with the {GrandExchangeOfferState#EMPTY} state,
+ * exchange slots with the {@link GrandExchangeOfferState#EMPTY} state,
  * regardless of whether any slots have offers. Once the exchange is
  * initialized, the client then updates any offers with items as it
  * receives information from the server.
  * <p>
- * See {GrandExchangeOfferState} for potential states an offer
+ * See {@link GrandExchangeOfferState} for potential states an offer
  * can change into.
  */
 @Data

runelite-api/src/main/java/net/runelite/api/events/GraphicChanged.java

@@ -1,3 +1,27 @@
+/*
+ * Copyright (c) 2018, Adam <[email protected]>
+ * 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.api.events;
 
 import lombok.Data;

runelite-api/src/main/java/net/runelite/api/events/GraphicsObjectCreated.java

@@ -24,8 +24,8 @@
  */
 package net.runelite.api.events;
 
-import net.runelite.api.GraphicsObject;
 import lombok.Value;
+import net.runelite.api.GraphicsObject;
 
 /**
  * An event where a new {@link GraphicsObject} has been created.
@@ -36,5 +36,5 @@ public class GraphicsObjectCreated
 	/**
 	 * The newly created graphics object.
 	 */
-	GraphicsObject graphicsObject;
+	private final GraphicsObject graphicsObject;
 }

runelite-api/src/main/java/net/runelite/api/events/GroundObjectChanged.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.Data;
 import net.runelite.api.GroundObject;
 import net.runelite.api.Tile;
-import lombok.Data;
 
 /**
  * An event where the {@link GroundObject} on a {@link Tile} has been changed.

runelite-api/src/main/java/net/runelite/api/events/GroundObjectDespawned.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.Data;
 import net.runelite.api.GroundObject;
 import net.runelite.api.Tile;
-import lombok.Data;
 
 /**
  * An event where a {@link GroundObject} on a {@link Tile} has been removed.

runelite-api/src/main/java/net/runelite/api/events/GroundObjectSpawned.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.Data;
 import net.runelite.api.GroundObject;
 import net.runelite.api.Tile;
-import lombok.Data;
 
 /**
  * An event where a {@link GroundObject} is added to a {@link Tile}.