rsclient: refactoring

deobfuscator/src/test/java/net/runelite/deob/deobfuscators/mapping/MappingDumper.java

@@ -81,7 +81,7 @@ public void dump() throws IOException
 
 		for (ClassFile cf : group.getClasses())
 		{
-			String implName = DeobAnnotations.getImplements(cf);
+			String implName = cf.getName();
 			String className = DeobAnnotations.getObfuscatedName(cf.getAnnotations());
 
 			if (implName != null)

runescape-api/src/main/java/net/runelite/rs/api/RSAccessFile.java

@@ -1,3 +1,16 @@
 package net.runelite.rs.api;
 
-public interface RSAccessFile {}
+import java.io.RandomAccessFile;
+import net.runelite.mapping.Import;
+
+public interface RSAccessFile
+{
+	@Import("file")
+	RandomAccessFile getFile();
+
+	@Import("offset")
+	long getPosition();
+
+	@Import("maxSize")
+	long getLength();
+}

runescape-api/src/main/java/net/runelite/rs/api/RSApproximateRouteStrategy.java

@@ -0,0 +1,3 @@
+package net.runelite.rs.api;
+
+public interface RSApproximateRouteStrategy {}

runescape-api/src/main/java/net/runelite/rs/api/RSGameBuild.java

@@ -0,0 +1,4 @@
+package net.runelite.rs.api;
+
+public interface RSGameBuild
+{}

runescape-api/src/main/java/net/runelite/rs/api/RSModeWhere.java

@@ -0,0 +1,3 @@
+package net.runelite.rs.api;
+
+public interface RSModeWhere {}

runescape-api/src/main/java/net/runelite/rs/api/RSPlayerProvider.java

@@ -0,0 +1,3 @@
+package net.runelite.rs.api;
+
+public interface RSPlayerProvider {}

runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapScaleHandler.java

@@ -0,0 +1,3 @@
+package net.runelite.rs.api;
+
+public interface RSWorldMapScaleHandler {}

runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapSection3.java

@@ -0,0 +1,3 @@
+package net.runelite.rs.api;
+
+public interface RSWorldMapSection3 {}

runescape-client/src/main/java/AbstractByteArrayCopier.java

@@ -55,7 +55,7 @@ static final void drawLoadingMessage(String var0, boolean var1) {
 			if (var1) {
 				class206.rasterProvider.drawFull(0, 0);
 			} else {
-				class49.method848(var3, var4, var5, var6);
+				WorldMapScaleHandler.method848(var3, var4, var5, var6);
 			}
 
 		}

runescape-client/src/main/java/AbstractUserComparator.java

@@ -63,7 +63,8 @@ static int method5119(int var0, Script var1, boolean var2) {
 				Interpreter.Interpreter_intStackSize -= 2;
 				var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
 				var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class201.method3761(var3, var4);
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ModeWhere
+					.method3761(var3, var4);
 				return 1;
 			} else if (var0 == ScriptOpcodes.INV_GETNUM) {
 				Interpreter.Interpreter_intStackSize -= 2;
@@ -120,7 +121,8 @@ static int method5119(int var0, Script var1, boolean var2) {
 					Interpreter.Interpreter_intStackSize -= 2;
 					var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768;
 					var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class201.method3761(var3, var4);
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ModeWhere
+						.method3761(var3, var4);
 					return 1;
 				} else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) {
 					Interpreter.Interpreter_intStackSize -= 2;

runescape-client/src/main/java/class74.java → runescape-client/src/main/java/ApproximateRouteStrategy.java

@@ -1,20 +1,22 @@
 import java.util.Date;
 import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 import netscape.javascript.JSObject;
 
 @ObfuscatedName("bj")
-public class class74 extends RouteStrategy {
+@Implements("ApproximateRouteStrategy")
+public class ApproximateRouteStrategy extends RouteStrategy {
 	@ObfuscatedName("hp")
 	@ObfuscatedGetter(
 		intValue = 363395723
 	)
 	@Export("cameraPitch")
 	static int cameraPitch;
 
-	class74() {
+	ApproximateRouteStrategy() {
 	}
 
 	@ObfuscatedName("x")

runescape-client/src/main/java/ArchiveDiskActionHandler.java

@@ -69,7 +69,7 @@ public void run() {
 						field3151 = 600;
 					}
 				} else {
-					class169.method3541(100L);
+					class169.sleepExact(100L);
 					synchronized(ArchiveDiskActionHandler_lock) {
 						if (field3151 <= 1) {
 							field3151 = 0;

runescape-client/src/main/java/Buffer.java

@@ -80,7 +80,7 @@ public Buffer(byte[] var1) {
 	@Export("releaseArray")
 	public void releaseArray() {
 		if (this.array != null) {
-			class51.ByteArrayPool_release(this.array);
+			WorldMapSection3.ByteArrayPool_release(this.array);
 		}
 
 		this.array = null;

runescape-client/src/main/java/ChatChannel.java

@@ -171,6 +171,6 @@ static void method2354() {
 			}
 		}
 
-		MusicPatchNode.method3922(class49.menuWidth / 2 + WorldMapDecoration.menuX, PacketBufferNode.menuY);
+		MusicPatchNode.method3922(WorldMapScaleHandler.menuWidth / 2 + WorldMapDecoration.menuX, PacketBufferNode.menuY);
 	}
 }

runescape-client/src/main/java/Client.java

@@ -137,7 +137,7 @@ public final class Client extends GameShell implements Usernamed {
 	@ObfuscatedSignature(
 		signature = "Lbj;"
 	)
-	static final class74 field954;
+	static final ApproximateRouteStrategy field954;
 	@ObfuscatedName("ow")
 	@ObfuscatedSignature(
 		signature = "Ljh;"
@@ -1562,7 +1562,7 @@ public final class Client extends GameShell implements Usernamed {
 		archiveLoaders = new ArrayList(10);
 		archiveLoadersDone = 0;
 		field898 = 0;
-		field954 = new class74();
+		field954 = new ApproximateRouteStrategy();
 		field955 = new int[50];
 		field956 = new int[50];
 	}
@@ -1827,7 +1827,7 @@ protected final void draw(boolean var1) {
 		}
 
 		if ((gameState == 10 || gameState == 20 || gameState == 30) && 0L != field893 && class217.currentTimeMillis() > field893) {
-			WorldMapIcon_1.setWindowedMode(class74.getWindowedMode());
+			WorldMapIcon_1.setWindowedMode(ApproximateRouteStrategy.getWindowedMode());
 		}
 
 		int var4;
@@ -1993,10 +1993,10 @@ public final void init() {
 							worldProperties = Integer.parseInt(var2);
 							break;
 						case 6:
-							IgnoreList.clientLanguage = Language.method3736(Integer.parseInt(var2));
+							IgnoreList.clientLanguage = Language.Language_get(Integer.parseInt(var2));
 							break;
 						case 7:
-							class198.field2353 = Strings.method4219(Integer.parseInt(var2));
+							class198.field2353 = Strings.ServerBuild_get(Integer.parseInt(var2));
 							break;
 						case 8:
 							if (var2.equalsIgnoreCase("true")) {
@@ -2024,7 +2024,7 @@ public final void init() {
 							gameBuild = Integer.parseInt(var2);
 							break;
 						case 17:
-							class201.field2390 = var2;
+							ModeWhere.worldListURL = var2;
 						}
 					}
 				}
@@ -2289,7 +2289,7 @@ public final void init() {
 				this.startThread(765, 503, 189);
 			}
 		} catch (RuntimeException var38) {
-			throw class51.newRunException(var38, "client.init(" + ')');
+			throw WorldMapSection3.newRunException(var38, "client.init(" + ')');
 		}
 	}
 
@@ -3167,7 +3167,7 @@ final void doCycleLoggedOut() {
 							}
 
 							var4 = FaceNormal.getPacketBufferNode(ClientPacket.field2257, packetWriter.isaacCipher);
-							var4.packetBuffer.writeByte(class74.getWindowedMode());
+							var4.packetBuffer.writeByte(ApproximateRouteStrategy.getWindowedMode());
 							var4.packetBuffer.writeShort(WorldMapLabel.canvasWidth);
 							var4.packetBuffer.writeShort(Varps.canvasHeight);
 							packetWriter.addNode(var4);
@@ -3774,17 +3774,18 @@ final void doCycleLoggedIn() {
 																	var11 = 383;
 																}
 
-																if (class74.cameraPitch < var11) {
-																	class74.cameraPitch = (var11 - class74.cameraPitch) * Players.field1280 / 1000 + class74.cameraPitch + Friend.field3626;
-																	if (class74.cameraPitch > var11) {
-																		class74.cameraPitch = var11;
+																if (ApproximateRouteStrategy.cameraPitch < var11) {
+																	ApproximateRouteStrategy.cameraPitch = (var11 - ApproximateRouteStrategy.cameraPitch) * Players.field1280 / 1000 + ApproximateRouteStrategy.cameraPitch + Friend.field3626;
+																	if (ApproximateRouteStrategy.cameraPitch > var11) {
+																		ApproximateRouteStrategy.cameraPitch = var11;
 																	}
 																}
 
-																if (class74.cameraPitch > var11) {
-																	class74.cameraPitch -= Players.field1280 * (class74.cameraPitch - var11) / 1000 + Friend.field3626;
-																	if (class74.cameraPitch < var11) {
-																		class74.cameraPitch = var11;
+																if (ApproximateRouteStrategy.cameraPitch > var11) {
+																	ApproximateRouteStrategy.cameraPitch -= Players.field1280 * (
+																		ApproximateRouteStrategy.cameraPitch - var11) / 1000 + Friend.field3626;
+																	if (ApproximateRouteStrategy.cameraPitch < var11) {
+																		ApproximateRouteStrategy.cameraPitch = var11;
 																	}
 																}
 
@@ -3919,7 +3920,7 @@ void resizeJS() {
 		if (GrandExchangeOfferOwnWorldComparator.clientPreferences != null) {
 			try {
 				Client var3 = WorldMapSection1.client;
-				Object[] var4 = new Object[]{class74.getWindowedMode()};
+				Object[] var4 = new Object[]{ApproximateRouteStrategy.getWindowedMode()};
 				JSObject.getWindow(var3).call("resize", var4);
 			} catch (Throwable var5) {
 			}
@@ -4007,7 +4008,7 @@ final void drawLoggedIn() {
 		} else {
 			var1 = WorldMapDecoration.menuX;
 			var2 = PacketBufferNode.menuY;
-			var3 = class49.menuWidth;
+			var3 = WorldMapScaleHandler.menuWidth;
 			int var13 = WorldMapData_1.menuHeight;
 			int var14 = 6116423;
 			Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var13, var14);
@@ -4037,7 +4038,7 @@ final void drawLoggedIn() {
 				var11.draw(var12, var1 + 3, var9, var10, 0);
 			}
 
-			class49.method848(WorldMapDecoration.menuX, PacketBufferNode.menuY, class49.menuWidth, WorldMapData_1.menuHeight);
+			WorldMapScaleHandler.method848(WorldMapDecoration.menuX, PacketBufferNode.menuY, WorldMapScaleHandler.menuWidth, WorldMapData_1.menuHeight);
 		}
 
 		if (gameDrawingMode == 3) {
@@ -4729,7 +4730,7 @@ final boolean method1524(PacketWriter var1) {
 				}
 
 				if (ServerPacket.field2152 == var1.serverPacket) {
-					class74.method1328(var3.readStringCp1252NullTerminated());
+					ApproximateRouteStrategy.method1328(var3.readStringCp1252NullTerminated());
 					var1.serverPacket = null;
 					return true;
 				}
@@ -4806,14 +4807,14 @@ final boolean method1524(PacketWriter var1) {
 						var8 = var6 - GrandExchangeOfferWorldComparator.cameraY;
 						var9 = var5 - class200.cameraZ;
 						var10 = (int)Math.sqrt((double)(var42 * var42 + var9 * var9));
-						class74.cameraPitch = (int)(Math.atan2((double)var8, (double)var10) * 325.949D) & 2047;
+						ApproximateRouteStrategy.cameraPitch = (int)(Math.atan2((double)var8, (double)var10) * 325.949D) & 2047;
 						WorldMapIcon_1.cameraYaw = (int)(Math.atan2((double)var42, (double)var9) * -325.949D) & 2047;
-						if (class74.cameraPitch < 128) {
-							class74.cameraPitch = 128;
+						if (ApproximateRouteStrategy.cameraPitch < 128) {
+							ApproximateRouteStrategy.cameraPitch = 128;
 						}
 
-						if (class74.cameraPitch > 383) {
-							class74.cameraPitch = 383;
+						if (ApproximateRouteStrategy.cameraPitch > 383) {
+							ApproximateRouteStrategy.cameraPitch = 383;
 						}
 					}
 
@@ -5453,11 +5454,11 @@ final void menu() {
 						if (var1 != 1 && (class217.mouseCam || var1 != 4)) {
 							var2 = MouseHandler.MouseHandler_x;
 							var3 = MouseHandler.MouseHandler_y;
-							if (var2 < WorldMapDecoration.menuX - 10 || var2 > class49.menuWidth + WorldMapDecoration.menuX + 10 || var3 < PacketBufferNode.menuY - 10 || var3 > WorldMapData_1.menuHeight + PacketBufferNode.menuY + 10) {
+							if (var2 < WorldMapDecoration.menuX - 10 || var2 > WorldMapScaleHandler.menuWidth + WorldMapDecoration.menuX + 10 || var3 < PacketBufferNode.menuY - 10 || var3 > WorldMapData_1.menuHeight + PacketBufferNode.menuY + 10) {
 								isMenuOpen = false;
 								var4 = WorldMapDecoration.menuX;
 								var5 = PacketBufferNode.menuY;
-								var6 = class49.menuWidth;
+								var6 = WorldMapScaleHandler.menuWidth;
 								var19 = WorldMapData_1.menuHeight;
 
 								for (var8 = 0; var8 < rootWidgetCount; ++var8) {
@@ -5471,7 +5472,7 @@ final void menu() {
 						if (var1 == 1 || !class217.mouseCam && var1 == 4) {
 							var2 = WorldMapDecoration.menuX;
 							var3 = PacketBufferNode.menuY;
-							var4 = class49.menuWidth;
+							var4 = WorldMapScaleHandler.menuWidth;
 							var5 = MouseHandler.MouseHandler_lastPressedX;
 							var6 = MouseHandler.MouseHandler_lastPressedY;
 							var19 = -1;
@@ -5497,7 +5498,7 @@ final void menu() {
 							isMenuOpen = false;
 							var8 = WorldMapDecoration.menuX;
 							var9 = PacketBufferNode.menuY;
-							var10 = class49.menuWidth;
+							var10 = WorldMapScaleHandler.menuWidth;
 							var11 = WorldMapData_1.menuHeight;
 
 							for (int var12 = 0; var12 < rootWidgetCount; ++var12) {

runescape-client/src/main/java/ClientPreferences.java

@@ -85,6 +85,7 @@ public class ClientPreferences {
 					for (int var4 = 0; var4 < var3; ++var4) {
 						int var5 = var1.readInt();
 						int var6 = var1.readInt();
+
 						this.parameters.put(var5, var6);
 					}
 				}

runescape-client/src/main/java/Coord.java

@@ -240,7 +240,7 @@ static final void drawEntities(int var0, int var1, int var2, int var3) {
 			WorldMapRectangle.cameraX = var6 - var13;
 			GrandExchangeOfferWorldComparator.cameraY = var7 - var14;
 			class200.cameraZ = var8 - var15;
-			class74.cameraPitch = var4;
+			ApproximateRouteStrategy.cameraPitch = var4;
 			WorldMapIcon_1.cameraYaw = var20;
 			if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (SoundSystem.oculusOrbFocalPointX >> 7 != ByteArrayPool.localPlayer.x >> 7 || ServerPacket.oculusOrbFocalPointY >> 7 != ByteArrayPool.localPlayer.y >> 7)) {
 				var16 = ByteArrayPool.localPlayer.plane;
@@ -259,7 +259,7 @@ static final void drawEntities(int var0, int var1, int var2, int var3) {
 		var20 = WorldMapRectangle.cameraX;
 		var6 = GrandExchangeOfferWorldComparator.cameraY;
 		var7 = class200.cameraZ;
-		var8 = class74.cameraPitch;
+		var8 = ApproximateRouteStrategy.cameraPitch;
 		var9 = WorldMapIcon_1.cameraYaw;
 
 		for (var10 = 0; var10 < 5; ++var10) {
@@ -282,13 +282,13 @@ static final void drawEntities(int var0, int var1, int var2, int var3) {
 				}
 
 				if (var10 == 4) {
-					class74.cameraPitch += var11;
-					if (class74.cameraPitch < 128) {
-						class74.cameraPitch = 128;
+					ApproximateRouteStrategy.cameraPitch += var11;
+					if (ApproximateRouteStrategy.cameraPitch < 128) {
+						ApproximateRouteStrategy.cameraPitch = 128;
 					}
 
-					if (class74.cameraPitch > 383) {
-						class74.cameraPitch = 383;
+					if (ApproximateRouteStrategy.cameraPitch > 383) {
+						ApproximateRouteStrategy.cameraPitch = 383;
 					}
 				}
 			}
@@ -312,7 +312,7 @@ static final void drawEntities(int var0, int var1, int var2, int var3) {
 		ChatChannel.playPcmPlayers();
 		var12 = Rasterizer3D.Rasterizer3D_zoom;
 		Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom;
-		GrandExchangeOfferWorldComparator.scene.draw(WorldMapRectangle.cameraX, GrandExchangeOfferWorldComparator.cameraY, class200.cameraZ, class74.cameraPitch, WorldMapIcon_1.cameraYaw, var4);
+		GrandExchangeOfferWorldComparator.scene.draw(WorldMapRectangle.cameraX, GrandExchangeOfferWorldComparator.cameraY, class200.cameraZ, ApproximateRouteStrategy.cameraPitch, WorldMapIcon_1.cameraYaw, var4);
 		Rasterizer3D.Rasterizer3D_zoom = var12;
 		ChatChannel.playPcmPlayers();
 		GrandExchangeOfferWorldComparator.scene.clearTempGameObjects();
@@ -323,7 +323,7 @@ static final void drawEntities(int var0, int var1, int var2, int var3) {
 		WorldMapRectangle.cameraX = var20;
 		GrandExchangeOfferWorldComparator.cameraY = var6;
 		class200.cameraZ = var7;
-		class74.cameraPitch = var8;
+		ApproximateRouteStrategy.cameraPitch = var8;
 		WorldMapIcon_1.cameraYaw = var9;
 		if (Client.isLoading && WorldMapLabelSize.method292(true, false) == 0) {
 			Client.isLoading = false;