From 5fdefb98f6afa1cfafc0652ca0d6dce2c71ba0ba Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Sat, 11 Apr 2020 11:29:54 +0100 Subject: [PATCH 1/2] fix null class names --- .../net/runelite/deob/deobfuscators/mapping/MappingDumper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/mapping/MappingDumper.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/mapping/MappingDumper.java index d72a8c78a1..53481982c5 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/mapping/MappingDumper.java +++ b/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) From bb255a6da2f2ea5566db2a9abcf045511815f7c5 Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Sat, 11 Apr 2020 13:00:01 +0100 Subject: [PATCH 2/2] whole bunch of refactoring client --- .../net/runelite/rs/api/RSAccessFile.java | 15 ++++- .../rs/api/RSApproximateRouteStrategy.java | 3 + .../net/runelite/rs/api/RSFileOnDisk.java | 16 ----- .../java/net/runelite/rs/api/RSGameBuild.java | 4 ++ .../java/net/runelite/rs/api/RSModeWhere.java | 3 + .../net/runelite/rs/api/RSPlayerProvider.java | 3 + .../net/runelite/rs/api/RSServerBuild.java | 3 - .../rs/api/RSWorldMapScaleHandler.java | 3 + .../runelite/rs/api/RSWorldMapSection3.java | 3 + .../main/java/AbstractByteArrayCopier.java | 2 +- .../src/main/java/AbstractUserComparator.java | 6 +- ...s74.java => ApproximateRouteStrategy.java} | 6 +- .../main/java/ArchiveDiskActionHandler.java | 2 +- runescape-client/src/main/java/Buffer.java | 2 +- .../src/main/java/ChatChannel.java | 2 +- runescape-client/src/main/java/Client.java | 59 ++++++++++--------- .../src/main/java/ClientPreferences.java | 1 + runescape-client/src/main/java/Coord.java | 18 +++--- runescape-client/src/main/java/Decimator.java | 2 +- .../main/java/DevicePcmPlayerProvider.java | 2 +- .../java/{ServerBuild.java => GameBuild.java} | 27 +++++---- runescape-client/src/main/java/GameShell.java | 6 +- .../src/main/java/GrandExchangeEvent.java | 2 +- .../java/GrandExchangeOfferAgeComparator.java | 38 ++++++------ runescape-client/src/main/java/Language.java | 25 ++++---- .../src/main/java/LoginPacket.java | 2 +- .../src/main/java/MilliClock.java | 2 +- .../java/{class201.java => ModeWhere.java} | 18 +++--- .../src/main/java/MouseRecorder.java | 2 +- .../src/main/java/MusicPatchNode.java | 2 +- .../src/main/java/MusicPatchPcmStream.java | 2 +- runescape-client/src/main/java/NanoClock.java | 2 +- runescape-client/src/main/java/NetSocket.java | 2 +- .../src/main/java/PacketBuffer.java | 26 ++++---- runescape-client/src/main/java/PcmPlayer.java | 2 +- .../src/main/java/PlayerAppearance.java | 2 +- .../{class108.java => PlayerProvider.java} | 4 +- .../src/main/java/ReflectionCheck.java | 2 +- .../src/main/java/SecureRandomFuture.java | 2 +- runescape-client/src/main/java/Strings.java | 10 ++-- .../src/main/java/UserComparator8.java | 2 +- .../src/main/java/UserComparator9.java | 2 +- .../src/main/java/VerticalAlignment.java | 2 +- runescape-client/src/main/java/Widget.java | 2 +- .../src/main/java/WorldMapArea.java | 2 +- .../src/main/java/WorldMapEvent.java | 2 +- .../src/main/java/WorldMapIcon_1.java | 4 +- .../src/main/java/WorldMapManager.java | 13 ++-- .../src/main/java/WorldMapRegion.java | 12 ++-- ...class49.java => WorldMapScaleHandler.java} | 6 +- .../src/main/java/WorldMapSection0.java | 4 +- .../{class51.java => WorldMapSection3.java} | 6 +- runescape-client/src/main/java/class105.java | 2 +- runescape-client/src/main/java/class169.java | 3 +- runescape-client/src/main/java/class198.java | 2 +- runescape-client/src/main/java/class22.java | 6 +- runescape-client/src/main/java/class237.java | 2 +- runescape-client/src/main/java/class7.java | 7 ++- 58 files changed, 225 insertions(+), 187 deletions(-) create mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSApproximateRouteStrategy.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSFileOnDisk.java create mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSGameBuild.java create mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSModeWhere.java create mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSPlayerProvider.java delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSServerBuild.java create mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapScaleHandler.java create mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapSection3.java rename runescape-client/src/main/java/{class74.java => ApproximateRouteStrategy.java} (94%) rename runescape-client/src/main/java/{ServerBuild.java => GameBuild.java} (64%) rename runescape-client/src/main/java/{class201.java => ModeWhere.java} (92%) rename runescape-client/src/main/java/{class108.java => PlayerProvider.java} (73%) rename runescape-client/src/main/java/{class49.java => WorldMapScaleHandler.java} (98%) rename runescape-client/src/main/java/{class51.java => WorldMapSection3.java} (97%) diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSAccessFile.java b/runescape-api/src/main/java/net/runelite/rs/api/RSAccessFile.java index d103a468e9..e7f6169734 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSAccessFile.java +++ b/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(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSApproximateRouteStrategy.java b/runescape-api/src/main/java/net/runelite/rs/api/RSApproximateRouteStrategy.java new file mode 100644 index 0000000000..20a4fff2a6 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSApproximateRouteStrategy.java @@ -0,0 +1,3 @@ +package net.runelite.rs.api; + +public interface RSApproximateRouteStrategy {} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFileOnDisk.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFileOnDisk.java deleted file mode 100644 index 8f73327bae..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFileOnDisk.java +++ /dev/null @@ -1,16 +0,0 @@ -package net.runelite.rs.api; - -import java.io.RandomAccessFile; -import net.runelite.mapping.Import; - -public interface RSFileOnDisk -{ - @Import("file") - RandomAccessFile getFile(); - - @Import("index") - long getPosition(); - - @Import("capacity") - long getLength(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSGameBuild.java b/runescape-api/src/main/java/net/runelite/rs/api/RSGameBuild.java new file mode 100644 index 0000000000..37563f669a --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSGameBuild.java @@ -0,0 +1,4 @@ +package net.runelite.rs.api; + +public interface RSGameBuild +{} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSModeWhere.java b/runescape-api/src/main/java/net/runelite/rs/api/RSModeWhere.java new file mode 100644 index 0000000000..0b2e0dad32 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSModeWhere.java @@ -0,0 +1,3 @@ +package net.runelite.rs.api; + +public interface RSModeWhere {} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSPlayerProvider.java b/runescape-api/src/main/java/net/runelite/rs/api/RSPlayerProvider.java new file mode 100644 index 0000000000..7622cdb484 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSPlayerProvider.java @@ -0,0 +1,3 @@ +package net.runelite.rs.api; + +public interface RSPlayerProvider {} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSServerBuild.java b/runescape-api/src/main/java/net/runelite/rs/api/RSServerBuild.java deleted file mode 100644 index d6985260fb..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSServerBuild.java +++ /dev/null @@ -1,3 +0,0 @@ -package net.runelite.rs.api; - -public interface RSServerBuild {} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapScaleHandler.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapScaleHandler.java new file mode 100644 index 0000000000..d0c8608d4a --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapScaleHandler.java @@ -0,0 +1,3 @@ +package net.runelite.rs.api; + +public interface RSWorldMapScaleHandler {} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapSection3.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapSection3.java new file mode 100644 index 0000000000..3f96a5dfd0 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapSection3.java @@ -0,0 +1,3 @@ +package net.runelite.rs.api; + +public interface RSWorldMapSection3 {} diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index 1b613412ba..aeac519b39 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/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); } } diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index dcd7c2db87..9886e2b12b 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/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; diff --git a/runescape-client/src/main/java/class74.java b/runescape-client/src/main/java/ApproximateRouteStrategy.java similarity index 94% rename from runescape-client/src/main/java/class74.java rename to runescape-client/src/main/java/ApproximateRouteStrategy.java index ec8a4b7e87..824bec4516 100644 --- a/runescape-client/src/main/java/class74.java +++ b/runescape-client/src/main/java/ApproximateRouteStrategy.java @@ -1,12 +1,14 @@ 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 @@ -14,7 +16,7 @@ public class class74 extends RouteStrategy { @Export("cameraPitch") static int cameraPitch; - class74() { + ApproximateRouteStrategy() { } @ObfuscatedName("x") diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index 26e3bb6f0e..d288c817a0 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/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; diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index 88d72c05d7..9c061c6888 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/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; diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index 26f5f89d4e..2193a4d931 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/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); } } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index d73dc00ecf..6f3ab0ba01 100644 --- a/runescape-client/src/main/java/Client.java +++ b/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) { diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index 8c4863677d..64ddebcfab 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/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); } } diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index 9716bc22c2..e304cca404 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/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; diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index 6240a6bb3e..871a51ffac 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -26,7 +26,7 @@ public class Decimator { public Decimator(int var1, int var2) { if (var2 != var1) { - int var3 = class201.method3763(var1, var2); + int var3 = ModeWhere.method3763(var1, var2); var1 /= var3; var2 /= var3; this.inputRate = var1; diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index 82b0ff2a9b..aefc8a6ed1 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -5,7 +5,7 @@ @ObfuscatedName("bd") @Implements("DevicePcmPlayerProvider") -public class DevicePcmPlayerProvider implements class108 { +public class DevicePcmPlayerProvider implements PlayerProvider { DevicePcmPlayerProvider() { } diff --git a/runescape-client/src/main/java/ServerBuild.java b/runescape-client/src/main/java/GameBuild.java similarity index 64% rename from runescape-client/src/main/java/ServerBuild.java rename to runescape-client/src/main/java/GameBuild.java index 7e59e98c32..ab0eba3184 100644 --- a/runescape-client/src/main/java/ServerBuild.java +++ b/runescape-client/src/main/java/GameBuild.java @@ -5,32 +5,32 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ii") -@Implements("ServerBuild") -public class ServerBuild { +@Implements("GameBuild") +public class GameBuild { @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lii;" ) @Export("LIVE") - static final ServerBuild LIVE; + static final GameBuild LIVE; @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lii;" ) @Export("BUILDLIVE") - static final ServerBuild BUILDLIVE; + static final GameBuild BUILDLIVE; @ObfuscatedName("k") @ObfuscatedSignature( signature = "Lii;" ) @Export("RC") - static final ServerBuild RC; + static final GameBuild RC; @ObfuscatedName("d") @ObfuscatedSignature( signature = "Lii;" ) @Export("WIP") - static final ServerBuild WIP; + static final GameBuild WIP; @ObfuscatedName("w") @Export("name") public final String name; @@ -38,17 +38,18 @@ public class ServerBuild { @ObfuscatedGetter( intValue = 1808149537 ) - final int field3101; + @Export("buildId") + final int buildId; static { - LIVE = new ServerBuild("LIVE", 0); - BUILDLIVE = new ServerBuild("BUILDLIVE", 3); - RC = new ServerBuild("RC", 1); - WIP = new ServerBuild("WIP", 2); + LIVE = new GameBuild("LIVE", 0); + BUILDLIVE = new GameBuild("BUILDLIVE", 3); + RC = new GameBuild("RC", 1); + WIP = new GameBuild("WIP", 2); } - ServerBuild(String var1, int var2) { + GameBuild(String var1, int var2) { this.name = var1; - this.field3101 = var2; + this.buildId = var2; } } diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index 62ca6d9679..b36ba023f1 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -245,7 +245,7 @@ protected final void setMaxCanvasSize(int var1, int var2) { final void post(Object var1) { if (this.eventQueue != null) { for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { - class169.method3541(1L); + class169.sleepExact(1L); } if (var1 != null) { @@ -857,7 +857,7 @@ public final synchronized void paint(Graphics var1) { public final void destroy() { if (this == gameShell && !isKilled) { stopTimeMs = class217.currentTimeMillis(); - class169.method3541(5000L); + class169.sleepExact(5000L); this.kill(); } } @@ -892,7 +892,7 @@ public void run() { this.setFocusCycleRoot(true); this.addCanvas(); this.setUp(); - clock = class74.method1326(); + clock = ApproximateRouteStrategy.method1326(); while (0L == stopTimeMs || class217.currentTimeMillis() < stopTimeMs) { ModelData0.gameCyclesToDo = clock.wait(cycleDurationMillis, fiveOrOne); diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index cfef3ff570..e470019eee 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -588,7 +588,7 @@ static final void method161() { class348.field4061 = null; Tiles.field539 = null; Tiles.field540 = null; - class51.field404 = null; + WorldMapSection3.field404 = null; SoundCache.field1462 = null; Tiles.field545 = null; GrandExchangeOfferAgeComparator.Tiles_hue = null; diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index ea12b5a1cc..ba480b009b 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -961,7 +961,7 @@ static final void method248(Scene var0, CollisionMap[] var1) { } if (var47 && var22 == var23 && var24 == var22 && var22 == var25) { - var10000 = class51.field404[var2][var11]; + var10000 = WorldMapSection3.field404[var2][var11]; var10000[var17] |= 2340; } } @@ -1074,22 +1074,22 @@ static final void method248(Scene var0, CollisionMap[] var1) { for (int var7 = 0; var7 <= 104; ++var7) { for (int var8 = 0; var8 <= 104; ++var8) { short var46; - if ((class51.field404[var6][var8][var7] & var2) != 0) { + if ((WorldMapSection3.field404[var6][var8][var7] & var2) != 0) { var9 = var7; var10 = var7; var11 = var6; - for (var12 = var6; var9 > 0 && (class51.field404[var6][var8][var9 - 1] & var2) != 0; --var9) { + for (var12 = var6; var9 > 0 && (WorldMapSection3.field404[var6][var8][var9 - 1] & var2) != 0; --var9) { } - while (var10 < 104 && (class51.field404[var6][var8][var10 + 1] & var2) != 0) { + while (var10 < 104 && (WorldMapSection3.field404[var6][var8][var10 + 1] & var2) != 0) { ++var10; } label465: while (var11 > 0) { for (var13 = var9; var13 <= var10; ++var13) { - if ((class51.field404[var11 - 1][var8][var13] & var2) == 0) { + if ((WorldMapSection3.field404[var11 - 1][var8][var13] & var2) == 0) { break label465; } } @@ -1100,7 +1100,7 @@ static final void method248(Scene var0, CollisionMap[] var1) { label454: while (var12 < var5) { for (var13 = var9; var13 <= var10; ++var13) { - if ((class51.field404[var12 + 1][var8][var13] & var2) == 0) { + if ((WorldMapSection3.field404[var12 + 1][var8][var13] & var2) == 0) { break label454; } } @@ -1117,29 +1117,29 @@ static final void method248(Scene var0, CollisionMap[] var1) { for (var17 = var11; var17 <= var12; ++var17) { for (var18 = var9; var18 <= var10; ++var18) { - var10000 = class51.field404[var17][var8]; + var10000 = WorldMapSection3.field404[var17][var8]; var10000[var18] &= ~var2; } } } } - if ((class51.field404[var6][var8][var7] & var3) != 0) { + if ((WorldMapSection3.field404[var6][var8][var7] & var3) != 0) { var9 = var8; var10 = var8; var11 = var6; - for (var12 = var6; var9 > 0 && (class51.field404[var6][var9 - 1][var7] & var3) != 0; --var9) { + for (var12 = var6; var9 > 0 && (WorldMapSection3.field404[var6][var9 - 1][var7] & var3) != 0; --var9) { } - while (var10 < 104 && (class51.field404[var6][var10 + 1][var7] & var3) != 0) { + while (var10 < 104 && (WorldMapSection3.field404[var6][var10 + 1][var7] & var3) != 0) { ++var10; } label518: while (var11 > 0) { for (var13 = var9; var13 <= var10; ++var13) { - if ((class51.field404[var11 - 1][var13][var7] & var3) == 0) { + if ((WorldMapSection3.field404[var11 - 1][var13][var7] & var3) == 0) { break label518; } } @@ -1150,7 +1150,7 @@ static final void method248(Scene var0, CollisionMap[] var1) { label507: while (var12 < var5) { for (var13 = var9; var13 <= var10; ++var13) { - if ((class51.field404[var12 + 1][var13][var7] & var3) == 0) { + if ((WorldMapSection3.field404[var12 + 1][var13][var7] & var3) == 0) { break label507; } } @@ -1167,29 +1167,29 @@ static final void method248(Scene var0, CollisionMap[] var1) { for (var17 = var11; var17 <= var12; ++var17) { for (var18 = var9; var18 <= var10; ++var18) { - var10000 = class51.field404[var17][var18]; + var10000 = WorldMapSection3.field404[var17][var18]; var10000[var7] &= ~var3; } } } } - if ((class51.field404[var6][var8][var7] & var4) != 0) { + if ((WorldMapSection3.field404[var6][var8][var7] & var4) != 0) { var9 = var8; var10 = var8; var11 = var7; - for (var12 = var7; var11 > 0 && (class51.field404[var6][var8][var11 - 1] & var4) != 0; --var11) { + for (var12 = var7; var11 > 0 && (WorldMapSection3.field404[var6][var8][var11 - 1] & var4) != 0; --var11) { } - while (var12 < 104 && (class51.field404[var6][var8][var12 + 1] & var4) != 0) { + while (var12 < 104 && (WorldMapSection3.field404[var6][var8][var12 + 1] & var4) != 0) { ++var12; } label571: while (var9 > 0) { for (var13 = var11; var13 <= var12; ++var13) { - if ((class51.field404[var6][var9 - 1][var13] & var4) == 0) { + if ((WorldMapSection3.field404[var6][var9 - 1][var13] & var4) == 0) { break label571; } } @@ -1200,7 +1200,7 @@ static final void method248(Scene var0, CollisionMap[] var1) { label560: while (var10 < 104) { for (var13 = var11; var13 <= var12; ++var13) { - if ((class51.field404[var6][var10 + 1][var13] & var4) == 0) { + if ((WorldMapSection3.field404[var6][var10 + 1][var13] & var4) == 0) { break label560; } } @@ -1214,7 +1214,7 @@ static final void method248(Scene var0, CollisionMap[] var1) { for (var14 = var9; var14 <= var10; ++var14) { for (var15 = var11; var15 <= var12; ++var15) { - var10000 = class51.field404[var6][var14]; + var10000 = WorldMapSection3.field404[var6][var14]; var10000[var15] &= ~var4; } } diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java index 5c0b21d8da..b99515f580 100644 --- a/runescape-client/src/main/java/Language.java +++ b/runescape-client/src/main/java/Language.java @@ -75,13 +75,13 @@ public class Language implements Enumerated { final int id; static { - Language_EN = new Language("EN", "en", "English", class201.field2375, 0, "GB"); - Language_DE = new Language("DE", "de", "German", class201.field2375, 1, "DE"); - Language_FR = new Language("FR", "fr", "French", class201.field2375, 2, "FR"); - Language_PT = new Language("PT", "pt", "Portuguese", class201.field2375, 3, "BR"); - Language_NL = new Language("NL", "nl", "Dutch", class201.field2376, 4, "NL"); - Language_ES = new Language("ES", "es", "Spanish", class201.field2376, 5, "ES"); - Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", class201.field2375, 6, "MX"); + Language_EN = new Language("EN", "en", "English", ModeWhere.field2375, 0, "GB"); + Language_DE = new Language("DE", "de", "German", ModeWhere.field2375, 1, "DE"); + Language_FR = new Language("FR", "fr", "French", ModeWhere.field2375, 2, "FR"); + Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field2375, 3, "BR"); + Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field2376, 4, "NL"); + Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field2376, 5, "ES"); + Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field2375, 6, "MX"); Language[] var0 = method3733(); Language_valuesOrdered = new Language[var0.length]; Language[] var1 = var0; @@ -100,7 +100,7 @@ public class Language implements Enumerated { @ObfuscatedSignature( signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lgd;ILjava/lang/String;)V" ) - Language(String var1, String var2, String var3, class201 var4, int var5, String var6) { + Language(String var1, String var2, String var3, ModeWhere var4, int var5, String var6) { this.field2364 = var1; this.language = var2; this.id = var5; @@ -177,8 +177,8 @@ static void method3744() { signature = "(I)[Lii;", garbageValue = "806638344" ) - static ServerBuild[] method3751() { - return new ServerBuild[]{ServerBuild.BUILDLIVE, ServerBuild.WIP, ServerBuild.RC, ServerBuild.LIVE}; + static GameBuild[] method3751() { + return new GameBuild[]{GameBuild.BUILDLIVE, GameBuild.WIP, GameBuild.RC, GameBuild.LIVE}; } @ObfuscatedName("x") @@ -199,7 +199,7 @@ static Language[] method3733() { static boolean loadWorlds() { try { if (LoginPacket.World_request == null) { - LoginPacket.World_request = WorldMapLabel.urlRequester.request(new URL(class201.field2390)); + LoginPacket.World_request = WorldMapLabel.urlRequester.request(new URL(ModeWhere.worldListURL)); } else if (LoginPacket.World_request.isDone()) { byte[] var0 = LoginPacket.World_request.getResponse(); Buffer var1 = new Buffer(var0); @@ -257,7 +257,8 @@ public static int method3749(int var0, int var1, int var2, int var3, int var4, i signature = "(II)Lgl;", garbageValue = "-1926428299" ) - public static Language method3736(int var0) { + @Export("Language_get") + public static Language Language_get(int var0) { return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null; } } diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index 7e425b1fa2..04a3adf649 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -63,7 +63,7 @@ public class LoginPacket implements class190 { field2314 = new LoginPacket(19, -2); field2319 = new LoginPacket(27, 0); LoginPacked_indexedValues = new LoginPacket[32]; - LoginPacket[] var0 = class51.method895(); + LoginPacket[] var0 = WorldMapSection3.method895(); for (int var1 = 0; var1 < var0.length; ++var1) { LoginPacked_indexedValues[var0[var1].id] = var0[var1]; diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 7914b89f91..dc42814687 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -128,7 +128,7 @@ public int wait(int var1, int var2) { this.field2021 = var2; } - class169.method3541((long)this.field2021); + class169.sleepExact((long)this.field2021); for (var5 = 0; this.field2023 < 256; this.field2023 += this.field2020) { ++var5; diff --git a/runescape-client/src/main/java/class201.java b/runescape-client/src/main/java/ModeWhere.java similarity index 92% rename from runescape-client/src/main/java/class201.java rename to runescape-client/src/main/java/ModeWhere.java index 694c6ee2e8..fff887e995 100644 --- a/runescape-client/src/main/java/class201.java +++ b/runescape-client/src/main/java/ModeWhere.java @@ -1,12 +1,14 @@ import java.util.HashSet; import java.util.Set; 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; @ObfuscatedName("gd") -public enum class201 implements Enumerated { +@Implements("ModeWhere") +public enum ModeWhere implements Enumerated { @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lgd;" @@ -74,7 +76,8 @@ public enum class201 implements Enumerated { field2386("", 13, new class200[]{class200.field2371}); @ObfuscatedName("bh") - static String field2390; + @Export("worldListURL") + static String worldListURL; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 1460687895 @@ -85,13 +88,13 @@ public enum class201 implements Enumerated { final Set field2388; static { - method3753(); + ModeWhere_rsValues(); } @ObfuscatedSignature( signature = "(Ljava/lang/String;I[Lgy;)V" ) - class201(String var3, int var4, class200[] var5) { + ModeWhere(String var3, int var4, class200[] var5) { this.field2388 = new HashSet(); this.id = var4; class200[] var6 = var5; @@ -103,7 +106,7 @@ public enum class201 implements Enumerated { } - class201(String var3, int var4) { + ModeWhere(String var3, int var4) { this.field2388 = new HashSet(); this.id = var4; } @@ -123,8 +126,9 @@ public int rsOrdinal() { signature = "(I)[Lgd;", garbageValue = "-2096888845" ) - static class201[] method3753() { - return new class201[]{field2379, field2385, field2386, field2376, field2384, field2380, field2381, field2377, field2378, field2374, field2375, field2382, field2383}; + @Export("ModeWhere_rsValues") + static ModeWhere[] ModeWhere_rsValues() { + return new ModeWhere[]{field2379, field2385, field2386, field2376, field2384, field2380, field2381, field2377, field2378, field2374, field2375, field2382, field2383}; } @ObfuscatedName("x") diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index e2b08b5917..f7ac2369df 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -40,7 +40,7 @@ public class MouseRecorder implements Runnable { } public void run() { - for (; this.isRunning; class169.method3541(50L)) { + for (; this.isRunning; class169.sleepExact(50L)) { synchronized(this.lock) { if (this.index < 500) { this.xs[this.index] = MouseHandler.MouseHandler_x; diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java index 0f2a343cc8..004acfbfde 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -253,7 +253,7 @@ static void method3922(int var0, int var1) { WorldMapDecoration.menuX = var7; PacketBufferNode.menuY = var8; - class49.menuWidth = var2; + WorldMapScaleHandler.menuWidth = var2; WorldMapData_1.menuHeight = Client.menuOptionsCount * 15 + 22; } } diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index 0e86cb0926..1fab1948a3 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -306,7 +306,7 @@ static void method4004() { } PacketBufferNode var5 = FaceNormal.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); - var5.packetBuffer.writeByte(class74.getWindowedMode()); + var5.packetBuffer.writeByte(ApproximateRouteStrategy.getWindowedMode()); var5.packetBuffer.writeShort(WorldMapLabel.canvasWidth); var5.packetBuffer.writeShort(Varps.canvasHeight); Client.packetWriter.addNode(var5); diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index 68366f7fdb..b2ddbfb622 100644 --- a/runescape-client/src/main/java/NanoClock.java +++ b/runescape-client/src/main/java/NanoClock.java @@ -41,7 +41,7 @@ public int wait(int var1, int var2) { var5 = var3; } - class169.method3541(var5 / 1000000L); + class169.sleepExact(var5 / 1000000L); long var7 = System.nanoTime(); int var9; diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index 9f0d529c22..aceaac94e3 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -102,7 +102,7 @@ public void close() { if (this.task != null) { while (this.task.status == 0) { - class169.method3541(1L); + class169.sleepExact(1L); } if (this.task.status == 1) { diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index ff39804e3b..9de3da0a44 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -268,7 +268,7 @@ static final void method5554(int var0, int var1, int var2, int var3, int var4, i var6.method3187(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21); if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { - var10000 = class51.field404[var0][var1]; + var10000 = WorldMapSection3.field404[var0][var1]; var10000[var2] |= 2340; } @@ -291,7 +291,7 @@ static final void method5554(int var0, int var1, int var2, int var3, int var4, i } if (var8.modelClipped) { - var10000 = class51.field404[var0][var1]; + var10000 = WorldMapSection3.field404[var0][var1]; var10000[var2] |= 585; } } else if (var4 == 1) { @@ -301,7 +301,7 @@ static final void method5554(int var0, int var1, int var2, int var3, int var4, i } if (var8.modelClipped) { - var10000 = class51.field404[var0][var1]; + var10000 = WorldMapSection3.field404[var0][var1]; var10000[var2 + 1] |= 1170; } } else if (var4 == 2) { @@ -311,7 +311,7 @@ static final void method5554(int var0, int var1, int var2, int var3, int var4, i } if (var8.modelClipped) { - var10000 = class51.field404[var0][var1 + 1]; + var10000 = WorldMapSection3.field404[var0][var1 + 1]; var10000[var2] |= 585; } } else if (var4 == 3) { @@ -321,7 +321,7 @@ static final void method5554(int var0, int var1, int var2, int var3, int var4, i } if (var8.modelClipped) { - var10000 = class51.field404[var0][var1]; + var10000 = WorldMapSection3.field404[var0][var1]; var10000[var2] |= 1170; } } @@ -375,24 +375,24 @@ static final void method5554(int var0, int var1, int var2, int var3, int var4, i var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var29, (Entity)var30, Tiles.field544[var4], Tiles.field544[var28], var19, var21); if (var8.modelClipped) { if (var4 == 0) { - var10000 = class51.field404[var0][var1]; + var10000 = WorldMapSection3.field404[var0][var1]; var10000[var2] |= 585; - var10000 = class51.field404[var0][var1]; + var10000 = WorldMapSection3.field404[var0][var1]; var10000[1 + var2] |= 1170; } else if (var4 == 1) { - var10000 = class51.field404[var0][var1]; + var10000 = WorldMapSection3.field404[var0][var1]; var10000[var2 + 1] |= 1170; - var10000 = class51.field404[var0][var1 + 1]; + var10000 = WorldMapSection3.field404[var0][var1 + 1]; var10000[var2] |= 585; } else if (var4 == 2) { - var10000 = class51.field404[var0][var1 + 1]; + var10000 = WorldMapSection3.field404[var0][var1 + 1]; var10000[var2] |= 585; - var10000 = class51.field404[var0][var1]; + var10000 = WorldMapSection3.field404[var0][var1]; var10000[var2] |= 1170; } else if (var4 == 3) { - var10000 = class51.field404[var0][var1]; + var10000 = WorldMapSection3.field404[var0][var1]; var10000[var2] |= 1170; - var10000 = class51.field404[var0][var1]; + var10000 = WorldMapSection3.field404[var0][var1]; var10000[var2] |= 585; } } diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index fafb486353..30a2a22e95 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -29,7 +29,7 @@ public class PcmPlayer { signature = "Ldg;" ) @Export("pcmPlayerProvider") - static class108 pcmPlayerProvider; + static PlayerProvider pcmPlayerProvider; @ObfuscatedName("u") @Export("samples") protected int[] samples; diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java index 98d3252df6..abfd16357d 100644 --- a/runescape-client/src/main/java/PlayerAppearance.java +++ b/runescape-client/src/main/java/PlayerAppearance.java @@ -543,7 +543,7 @@ static void runScript(ScriptEvent var0, int var1) { var32 = false; } - var20 = class201.method3760(var29, var3, var32); + var20 = ModeWhere.method3760(var29, var3, var32); switch(var20) { case 0: return; diff --git a/runescape-client/src/main/java/class108.java b/runescape-client/src/main/java/PlayerProvider.java similarity index 73% rename from runescape-client/src/main/java/class108.java rename to runescape-client/src/main/java/PlayerProvider.java index f82754aa92..605e8a56eb 100644 --- a/runescape-client/src/main/java/class108.java +++ b/runescape-client/src/main/java/PlayerProvider.java @@ -1,9 +1,11 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("dg") -public interface class108 { +@Implements("PlayerProvider") +public interface PlayerProvider { @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)Ldw;", diff --git a/runescape-client/src/main/java/ReflectionCheck.java b/runescape-client/src/main/java/ReflectionCheck.java index 9dc668f5cd..2fe0e1a4ff 100644 --- a/runescape-client/src/main/java/ReflectionCheck.java +++ b/runescape-client/src/main/java/ReflectionCheck.java @@ -64,7 +64,7 @@ static void method2396() { signature = "(Ldg;S)V", garbageValue = "-25430" ) - public static final void method2397(class108 var0) { + public static final void method2397(PlayerProvider var0) { PcmPlayer.pcmPlayerProvider = var0; } } diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index 08798c7376..a89ce5b197 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -200,7 +200,7 @@ public static final Sprite getItemSprite(int var0, int var1, int var2, int var3, } if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { - class51.ItemDefinition_fontPlain11.draw(GrandExchangeOfferOwnWorldComparator.method1385(var1), 0, 9, 16776960, 1); + WorldMapSection3.ItemDefinition_fontPlain11.draw(GrandExchangeOfferOwnWorldComparator.method1385(var1), 0, 9, 16776960, 1); } if (!var5) { diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index e83563f8df..abf1afa54a 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -35,12 +36,13 @@ public class Strings { signature = "(IS)Lii;", garbageValue = "18624" ) - public static ServerBuild method4219(int var0) { - ServerBuild[] var1 = Language.method3751(); + @Export("ServerBuild_get") + public static GameBuild ServerBuild_get(int var0) { + GameBuild[] var1 = Language.method3751(); for (int var2 = 0; var2 < var1.length; ++var2) { - ServerBuild var3 = var1[var2]; - if (var0 == var3.field3101) { + GameBuild var3 = var1[var2]; + if (var0 == var3.buildId) { return var3; } } diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index bff9bd753e..6cb1a19756 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -46,7 +46,7 @@ static final int method3503() { return ScriptEvent.Client_plane; } else { int var0 = 3; - if (class74.cameraPitch < 310) { + if (ApproximateRouteStrategy.cameraPitch < 310) { int var1; int var2; if (Client.oculusOrbState == 1) { diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 810836e27d..1bc92a84b7 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -81,7 +81,7 @@ static void method3498() { class348.field4061 = new byte[4][104][104]; Tiles.field539 = new byte[4][104][104]; Tiles.field540 = new byte[4][104][104]; - class51.field404 = new int[4][105][105]; + WorldMapSection3.field404 = new int[4][105][105]; SoundCache.field1462 = new byte[4][105][105]; Tiles.field545 = new int[105][105]; GrandExchangeOfferAgeComparator.Tiles_hue = new int[104]; diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java index ff7fe25831..f154ad6bc5 100644 --- a/runescape-client/src/main/java/VerticalAlignment.java +++ b/runescape-client/src/main/java/VerticalAlignment.java @@ -60,7 +60,7 @@ public int rsOrdinal() { @Export("playSoundJingle") static void playSoundJingle(int var0, int var1) { if (Client.musicVolume != 0 && var0 != -1) { - class74.method1321(WorldMapRegion.archive11, var0, 0, Client.musicVolume, false); + ApproximateRouteStrategy.method1321(WorldMapRegion.archive11, var0, 0, Client.musicVolume, false); Client.field915 = true; } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 6e42af08ae..84f050de55 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -1715,7 +1715,7 @@ static int method4183(int var0, Script var1, boolean var2) { class2.setTapToDrop(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1); return 1; } else if (var0 == ScriptOpcodes.GETTAPTODROP) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class51.getTapToDrop() ? 1 : 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection3.getTapToDrop() ? 1 : 0; return 1; } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { Interpreter.Interpreter_intStackSize -= 2; diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index 087068699e..4d96e6396a 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -128,7 +128,7 @@ WorldMapSection readWorldMapSection(Buffer var1) { var4 = new WorldMapSection0(); break; case 1: - var4 = new class51(); + var4 = new WorldMapSection3(); break; case 2: var4 = new WorldMapSection1(); diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index 115fd274e5..3ec560fa7c 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -391,7 +391,7 @@ public static final void method867(int var0, boolean var1, int var2) { ) static int method865(int var0, Script var1, boolean var2) { if (var0 == ScriptOpcodes.GETWINDOWMODE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class74.getWindowedMode(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ApproximateRouteStrategy.getWindowedMode(); return 1; } else { int var3; diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java index 9f41777b09..cce5eac7cb 100644 --- a/runescape-client/src/main/java/WorldMapIcon_1.java +++ b/runescape-client/src/main/java/WorldMapIcon_1.java @@ -144,7 +144,7 @@ static void setWindowedMode(int var0) { Client.isResizable = false; } - if (class74.getWindowedMode() == 1) { + if (ApproximateRouteStrategy.getWindowedMode() == 1) { WorldMapSection1.client.setMaxCanvasSize(765, 503); } else { WorldMapSection1.client.setMaxCanvasSize(7680, 2160); @@ -152,7 +152,7 @@ static void setWindowedMode(int var0) { if (Client.gameState >= 25) { PacketBufferNode var1 = FaceNormal.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class74.getWindowedMode()); + var1.packetBuffer.writeByte(ApproximateRouteStrategy.getWindowedMode()); var1.packetBuffer.writeShort(WorldMapLabel.canvasWidth); var1.packetBuffer.writeShort(Varps.canvasHeight); Client.packetWriter.addNode(var1); diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 7a9c00fe70..7ac5c2b62c 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -53,7 +53,8 @@ public final class WorldMapManager { @Export("regions") WorldMapRegion[][] regions; @ObfuscatedName("q") - HashMap field359; + @Export("scaleHandlers") + HashMap scaleHandlers; @ObfuscatedName("z") @ObfuscatedSignature( signature = "[Lle;" @@ -112,7 +113,7 @@ public final class WorldMapManager { public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { this.loaded = false; this.loadStarted = false; - this.field359 = new HashMap(); + this.scaleHandlers = new HashMap(); this.pixelsPerTile = 0; this.mapSceneSprites = var1; this.fonts = var2; @@ -219,10 +220,10 @@ public final void drawTiles(int var1, int var2, int var3, int var4, int var5, in float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); int var15 = (int)Math.ceil((double)var14); this.pixelsPerTile = var15; - if (!this.field359.containsKey(var15)) { - class49 var16 = new class49(var15); + if (!this.scaleHandlers.containsKey(var15)) { + WorldMapScaleHandler var16 = new WorldMapScaleHandler(var15); var16.init(); - this.field359.put(var15, var16); + this.scaleHandlers.put(var15, var16); } int var23 = var13.width + var13.x - 1; @@ -232,7 +233,7 @@ public final void drawTiles(int var1, int var2, int var3, int var4, int var5, in int var19; for (var18 = var13.x; var18 <= var23; ++var18) { for (var19 = var13.y; var19 <= var17; ++var19) { - this.regions[var18][var19].drawTile(var15, (class49)this.field359.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); + this.regions[var18][var19].drawTile(var15, (WorldMapScaleHandler)this.scaleHandlers.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); } } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index e9bb03ba96..3037fb001a 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -298,7 +298,7 @@ boolean loadGeography(AbstractArchive var1) { garbageValue = "828020907" ) @Export("drawTile") - void drawTile(int var1, class49 var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { + void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { this.pixelsPerTile = var1; if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { int var7 = this.regionX; @@ -384,7 +384,7 @@ void flashElements(HashSet var1, int var2, int var3) { signature = "(Lah;[Lle;Lam;I)V", garbageValue = "-1199825986" ) - void method531(class49 var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method531(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { int var4; int var5; for (var4 = 0; var4 < 64; ++var4) { @@ -407,7 +407,7 @@ void method531(class49 var1, IndexedSprite[] var2, WorldMapSprite var3) { signature = "(Lah;[Lle;Lam;B)V", garbageValue = "-33" ) - void method532(class49 var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method532(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { Iterator var4 = this.worldMapData1List.iterator(); WorldMapData_1 var5; @@ -443,7 +443,7 @@ void method532(class49 var1, IndexedSprite[] var2, WorldMapSprite var3) { signature = "(IILab;Lah;[Lle;I)V", garbageValue = "642220126" ) - void method533(int var1, int var2, AbstractWorldMapData var3, class49 var4, IndexedSprite[] var5) { + void method533(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { this.method527(var1, var2, var3); this.method518(var1, var2, var3, var5); } @@ -454,7 +454,7 @@ void method533(int var1, int var2, AbstractWorldMapData var3, class49 var4, Inde garbageValue = "700550528" ) @Export("drawTileGround") - void drawTileGround(int var1, int var2, AbstractWorldMapData var3, class49 var4, WorldMapSprite var5) { + void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) { int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; int var7 = var3.floorOverlayIds[0][var1][var2] - 1; if (var6 == -1 && var7 == -1) { @@ -483,7 +483,7 @@ void drawTileGround(int var1, int var2, AbstractWorldMapData var3, class49 var4, signature = "(IILab;Lah;B)V", garbageValue = "7" ) - void method535(int var1, int var2, AbstractWorldMapData var3, class49 var4) { + void method535(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { for (int var5 = 1; var5 < var3.planes; ++var5) { int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; if (var6 > -1) { diff --git a/runescape-client/src/main/java/class49.java b/runescape-client/src/main/java/WorldMapScaleHandler.java similarity index 98% rename from runescape-client/src/main/java/class49.java rename to runescape-client/src/main/java/WorldMapScaleHandler.java index 406492c62a..f3878f6db8 100644 --- a/runescape-client/src/main/java/class49.java +++ b/runescape-client/src/main/java/WorldMapScaleHandler.java @@ -1,10 +1,12 @@ 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; @ObfuscatedName("ah") -public class class49 { +@Implements("WorldMapScaleHandler") +public class WorldMapScaleHandler { @ObfuscatedName("lo") @ObfuscatedGetter( intValue = 863785417 @@ -21,7 +23,7 @@ public class class49 { @Export("tileTemplates") byte[][][] tileTemplates; - class49(int var1) { + WorldMapScaleHandler(int var1) { this.pixelsPerTile = var1; } diff --git a/runescape-client/src/main/java/WorldMapSection0.java b/runescape-client/src/main/java/WorldMapSection0.java index f85706d489..19b31f505b 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -220,8 +220,8 @@ static final void worldToScreen(int var0, int var1, int var2) { var0 -= WorldMapRectangle.cameraX; var3 -= GrandExchangeOfferWorldComparator.cameraY; var1 -= class200.cameraZ; - int var4 = Rasterizer3D.Rasterizer3D_sine[class74.cameraPitch]; - int var5 = Rasterizer3D.Rasterizer3D_cosine[class74.cameraPitch]; + int var4 = Rasterizer3D.Rasterizer3D_sine[ApproximateRouteStrategy.cameraPitch]; + int var5 = Rasterizer3D.Rasterizer3D_cosine[ApproximateRouteStrategy.cameraPitch]; int var6 = Rasterizer3D.Rasterizer3D_sine[WorldMapIcon_1.cameraYaw]; int var7 = Rasterizer3D.Rasterizer3D_cosine[WorldMapIcon_1.cameraYaw]; int var8 = var0 * var7 + var6 * var1 >> 16; diff --git a/runescape-client/src/main/java/class51.java b/runescape-client/src/main/java/WorldMapSection3.java similarity index 97% rename from runescape-client/src/main/java/class51.java rename to runescape-client/src/main/java/WorldMapSection3.java index 01e3e524c3..a7368dacd5 100644 --- a/runescape-client/src/main/java/class51.java +++ b/runescape-client/src/main/java/WorldMapSection3.java @@ -1,10 +1,12 @@ 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; @ObfuscatedName("aw") -public class class51 implements WorldMapSection { +@Implements("WorldMapSection3") +public class WorldMapSection3 implements WorldMapSection { @ObfuscatedName("n") @ObfuscatedSignature( signature = "Lkx;" @@ -64,7 +66,7 @@ public class class51 implements WorldMapSection { ) int field395; - class51() { + WorldMapSection3() { } @ObfuscatedName("x") diff --git a/runescape-client/src/main/java/class105.java b/runescape-client/src/main/java/class105.java index 02a76db8aa..807069bc62 100644 --- a/runescape-client/src/main/java/class105.java +++ b/runescape-client/src/main/java/class105.java @@ -25,7 +25,7 @@ public class class105 { public static void method2394(AbstractArchive var0, String var1, String var2, int var3, boolean var4) { int var5 = var0.getGroupId(var1); int var6 = var0.getFileId(var5, var2); - class74.method1321(var0, var5, var6, var3, var4); + ApproximateRouteStrategy.method1321(var0, var5, var6, var3, var4); } @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/class169.java b/runescape-client/src/main/java/class169.java index c626fa93fd..184f59f11b 100644 --- a/runescape-client/src/main/java/class169.java +++ b/runescape-client/src/main/java/class169.java @@ -63,7 +63,8 @@ public int rsOrdinal() { } @ObfuscatedName("x") - public static final void method3541(long var0) { + @Export("sleepExact") + public static final void sleepExact(long var0) { if (var0 > 0L) { if (0L == var0 % 10L) { long var2 = var0 - 1L; diff --git a/runescape-client/src/main/java/class198.java b/runescape-client/src/main/java/class198.java index 237c6101eb..bc53377969 100644 --- a/runescape-client/src/main/java/class198.java +++ b/runescape-client/src/main/java/class198.java @@ -8,7 +8,7 @@ public class class198 { @ObfuscatedSignature( signature = "Lii;" ) - static ServerBuild field2353; + static GameBuild field2353; @ObfuscatedName("jk") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java index 8d446462a9..22a45b8d3e 100644 --- a/runescape-client/src/main/java/class22.java +++ b/runescape-client/src/main/java/class22.java @@ -345,7 +345,8 @@ static final void method252() { if (!var12) { if (Client.musicVolume != 0 && Client.currentTrackGroupId != -1) { - class74.method1321(AbstractWorldMapIcon.archive6, Client.currentTrackGroupId, 0, Client.musicVolume, false); + ApproximateRouteStrategy + .method1321(AbstractWorldMapIcon.archive6, Client.currentTrackGroupId, 0, Client.musicVolume, false); } Client.field915 = false; @@ -460,7 +461,8 @@ static final void changeGameOptions(int var0) { if (var3 != Client.musicVolume) { if (Client.musicVolume == 0 && Client.currentTrackGroupId != -1) { - class74.method1321(AbstractWorldMapIcon.archive6, Client.currentTrackGroupId, 0, var3, false); + ApproximateRouteStrategy + .method1321(AbstractWorldMapIcon.archive6, Client.currentTrackGroupId, 0, var3, false); Client.field915 = false; } else if (var3 == 0) { Client.method1496(); diff --git a/runescape-client/src/main/java/class237.java b/runescape-client/src/main/java/class237.java index fd1b8e7bd0..99724e9a55 100644 --- a/runescape-client/src/main/java/class237.java +++ b/runescape-client/src/main/java/class237.java @@ -205,7 +205,7 @@ static void load() { GrandExchangeOffer.ItemDefinition_modelArchive = var5; class169.ItemDefinition_inMembersWorld = var6; class336.ItemDefinition_fileCount = PrivateChatMode.ItemDefinition_archive.getGroupFileCount(10); - class51.ItemDefinition_fontPlain11 = var7; + WorldMapSection3.ItemDefinition_fontPlain11 = var7; Archive var8 = GrandExchangeOffer.archive2; Archive var9 = ArchiveDiskAction.archive0; Archive var10 = DirectByteArrayCopier.archive1; diff --git a/runescape-client/src/main/java/class7.java b/runescape-client/src/main/java/class7.java index f97c7ed524..4c45159576 100644 --- a/runescape-client/src/main/java/class7.java +++ b/runescape-client/src/main/java/class7.java @@ -38,11 +38,12 @@ public enum class7 implements Enumerated { @ObfuscatedGetter( intValue = -32487403 ) - final int field31; + @Export("index") + final int index; class7(int var3, int var4) { this.field30 = var3; - this.field31 = var4; + this.index = var4; } @ObfuscatedName("d") @@ -52,7 +53,7 @@ public enum class7 implements Enumerated { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field31; + return this.index; } @ObfuscatedName("m")