ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

whole bunch of refactoring client

Browse Source
This commit is contained in:
ThatGamerBlue
2020-04-11 13:00:01 +01:00
parent 5fdefb98f6
commit bb255a6da2
58 changed files with 225 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runescape-client/src/main/java/AbstractByteArrayCopier.java
View File

@@ -55,7 +55,7 @@ public abstract class AbstractByteArrayCopier {
if (var1) {
class206.rasterProvider.drawFull(0, 0);
} else {
class49.method848(var3, var4, var5, var6);
WorldMapScaleHandler.method848(var3, var4, var5, var6);
}
}

6
runescape-client/src/main/java/AbstractUserComparator.java
View File

@@ -63,7 +63,8 @@ public abstract class AbstractUserComparator implements Comparator {
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 @@ public abstract class AbstractUserComparator implements Comparator {
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;

6
runescape-client/src/main/java/class74.java → runescape-client/src/main/java/ApproximateRouteStrategy.java
View File

@@ -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")

2
runescape-client/src/main/java/ArchiveDiskActionHandler.java
View File

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

2
runescape-client/src/main/java/Buffer.java
View File

@@ -80,7 +80,7 @@ public class Buffer extends Node {
@Export("releaseArray")
public void releaseArray() {
if (this.array != null) {
class51.ByteArrayPool_release(this.array);
WorldMapSection3.ByteArrayPool_release(this.array);
}
this.array = null;

2
runescape-client/src/main/java/ChatChannel.java
View File

@@ -171,6 +171,6 @@ public class ChatChannel {
}
}
MusicPatchNode.method3922(class49.menuWidth / 2 + WorldMapDecoration.menuX, PacketBufferNode.menuY);
MusicPatchNode.method3922(WorldMapScaleHandler.menuWidth / 2 + WorldMapDecoration.menuX, PacketBufferNode.menuY);
}
}

59
runescape-client/src/main/java/Client.java
View File

@@ -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 @@ public final class Client extends GameShell implements Usernamed {
}
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 class Client extends GameShell implements Usernamed {
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 class Client extends GameShell implements Usernamed {
gameBuild = Integer.parseInt(var2);
break;
case 17:
class201.field2390 = var2;
ModeWhere.worldListURL = var2;
}
}
}
@@ -2289,7 +2289,7 @@ public final class Client extends GameShell implements Usernamed {
this.startThread(765, 503, 189);
}
} catch (RuntimeException var38) {
throw class51.newRunException(var38, "client.init(" + ')');
throw WorldMapSection3.newRunException(var38, "client.init(" + ')');
}
}
@@ -3167,7 +3167,7 @@ public final class Client extends GameShell implements Usernamed {
}
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 @@ public final class Client extends GameShell implements Usernamed {
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 @@ public final class Client extends GameShell implements Usernamed {
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 @@ public final class Client extends GameShell implements Usernamed {
} 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 @@ public final class Client extends GameShell implements Usernamed {
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 @@ public final class Client extends GameShell implements Usernamed {
}
if (ServerPacket.field2152 == var1.serverPacket) {
class74.method1328(var3.readStringCp1252NullTerminated());
ApproximateRouteStrategy.method1328(var3.readStringCp1252NullTerminated());
var1.serverPacket = null;
return true;
}
@@ -4806,14 +4807,14 @@ public final class Client extends GameShell implements Usernamed {
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 @@ public final class Client extends GameShell implements Usernamed {
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 @@ public final class Client extends GameShell implements Usernamed {
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 @@ public final class Client extends GameShell implements Usernamed {
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) {

1
runescape-client/src/main/java/ClientPreferences.java
View File

@@ -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);
}
}

18
runescape-client/src/main/java/Coord.java
View File

@@ -240,7 +240,7 @@ public class Coord {
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 @@ public class Coord {
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 @@ public class Coord {
}
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 @@ public class Coord {
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 @@ public class Coord {
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;

2
runescape-client/src/main/java/Decimator.java
View File

@@ -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;

2
runescape-client/src/main/java/DevicePcmPlayerProvider.java
View File

@@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("bd")
@Implements("DevicePcmPlayerProvider")
public class DevicePcmPlayerProvider implements class108 {
public class DevicePcmPlayerProvider implements PlayerProvider {
DevicePcmPlayerProvider() {
}

27
runescape-client/src/main/java/ServerBuild.java → runescape-client/src/main/java/GameBuild.java
View File

@@ -5,32 +5,32 @@ import net.runelite.mapping.ObfuscatedName;
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;
}
}

6
runescape-client/src/main/java/GameShell.java
View File

@@ -245,7 +245,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
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 abstract class GameShell extends Applet implements Runnable, FocusListene
public final void destroy() {
if (this == gameShell && !isKilled) {
stopTimeMs = class217.currentTimeMillis();
class169.method3541(5000L);
class169.sleepExact(5000L);
this.kill();
}
}
@@ -892,7 +892,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
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);

2
runescape-client/src/main/java/GrandExchangeEvent.java
View File

@@ -588,7 +588,7 @@ public class GrandExchangeEvent {
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;

38
runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java
View File

@@ -961,7 +961,7 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
}
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 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
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 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
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 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
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 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
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 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
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 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
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 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
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;
}
}

25
runescape-client/src/main/java/Language.java
View File

@@ -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 @@ public class Language implements Enumerated {
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 @@ public class Language implements Enumerated {
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 class Language implements Enumerated {
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;
}
}

2
runescape-client/src/main/java/LoginPacket.java
View File

@@ -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];

2
runescape-client/src/main/java/MilliClock.java
View File

@@ -128,7 +128,7 @@ public class MilliClock extends Clock {
this.field2021 = var2;
}
class169.method3541((long)this.field2021);
class169.sleepExact((long)this.field2021);
for (var5 = 0; this.field2023 < 256; this.field2023 += this.field2020) {
++var5;

18
runescape-client/src/main/java/class201.java → runescape-client/src/main/java/ModeWhere.java
View File

@@ -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 enum class201 implements Enumerated {
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")

2
runescape-client/src/main/java/MouseRecorder.java
View File

@@ -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;

2
runescape-client/src/main/java/MusicPatchNode.java
View File

@@ -253,7 +253,7 @@ public class MusicPatchNode extends Node {
WorldMapDecoration.menuX = var7;
PacketBufferNode.menuY = var8;
class49.menuWidth = var2;
WorldMapScaleHandler.menuWidth = var2;
WorldMapData_1.menuHeight = Client.menuOptionsCount * 15 + 22;
}
}

2
runescape-client/src/main/java/MusicPatchPcmStream.java
View File

@@ -306,7 +306,7 @@ public class MusicPatchPcmStream extends PcmStream {
}
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);

2
runescape-client/src/main/java/NanoClock.java
View File

@@ -41,7 +41,7 @@ public class NanoClock extends Clock {
var5 = var3;
}
class169.method3541(var5 / 1000000L);
class169.sleepExact(var5 / 1000000L);
long var7 = System.nanoTime();
int var9;

2
runescape-client/src/main/java/NetSocket.java
View File

@@ -102,7 +102,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
if (this.task != null) {
while (this.task.status == 0) {
class169.method3541(1L);
class169.sleepExact(1L);
}
if (this.task.status == 1) {

26
runescape-client/src/main/java/PacketBuffer.java
View File

@@ -268,7 +268,7 @@ public class PacketBuffer extends Buffer {
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 @@ public class PacketBuffer extends Buffer {
}
if (var8.modelClipped) {
var10000 = class51.field404[var0][var1];
var10000 = WorldMapSection3.field404[var0][var1];
var10000[var2] |= 585;
}
} else if (var4 == 1) {
@@ -301,7 +301,7 @@ public class PacketBuffer extends Buffer {
}
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 @@ public class PacketBuffer extends Buffer {
}
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 @@ public class PacketBuffer extends Buffer {
}
if (var8.modelClipped) {
var10000 = class51.field404[var0][var1];
var10000 = WorldMapSection3.field404[var0][var1];
var10000[var2] |= 1170;
}
}
@@ -375,24 +375,24 @@ public class PacketBuffer extends Buffer {
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;
}
}

2
runescape-client/src/main/java/PcmPlayer.java
View File

@@ -29,7 +29,7 @@ public class PcmPlayer {
signature = "Ldg;"
)
@Export("pcmPlayerProvider")
static class108 pcmPlayerProvider;
static PlayerProvider pcmPlayerProvider;
@ObfuscatedName("u")
@Export("samples")
protected int[] samples;

2
runescape-client/src/main/java/PlayerAppearance.java
View File

@@ -543,7 +543,7 @@ public class PlayerAppearance {
var32 = false;
}
var20 = class201.method3760(var29, var3, var32);
var20 = ModeWhere.method3760(var29, var3, var32);
switch(var20) {
case 0:
return;

4
runescape-client/src/main/java/class108.java → runescape-client/src/main/java/PlayerProvider.java
View File

@@ -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;",

2
runescape-client/src/main/java/ReflectionCheck.java
View File

@@ -64,7 +64,7 @@ public class ReflectionCheck extends Node {
signature = "(Ldg;S)V",
garbageValue = "-25430"
)
public static final void method2397(class108 var0) {
public static final void method2397(PlayerProvider var0) {
PcmPlayer.pcmPlayerProvider = var0;
}
}

2
runescape-client/src/main/java/SecureRandomFuture.java
View File

@@ -200,7 +200,7 @@ public class SecureRandomFuture {
}
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) {

10
runescape-client/src/main/java/Strings.java
View File

@@ -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;
}
}

2
runescape-client/src/main/java/UserComparator8.java
View File

@@ -46,7 +46,7 @@ public class UserComparator8 extends AbstractUserComparator {
return ScriptEvent.Client_plane;
} else {
int var0 = 3;
if (class74.cameraPitch < 310) {
if (ApproximateRouteStrategy.cameraPitch < 310) {
int var1;
int var2;
if (Client.oculusOrbState == 1) {

2
runescape-client/src/main/java/UserComparator9.java
View File

@@ -81,7 +81,7 @@ public class UserComparator9 extends AbstractUserComparator {
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];

2
runescape-client/src/main/java/VerticalAlignment.java
View File

@@ -60,7 +60,7 @@ public enum VerticalAlignment implements Enumerated {
@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;
}

2
runescape-client/src/main/java/Widget.java
View File

@@ -1715,7 +1715,7 @@ public class Widget extends Node {
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;

2
runescape-client/src/main/java/WorldMapArea.java
View File

@@ -128,7 +128,7 @@ public class WorldMapArea {
var4 = new WorldMapSection0();
break;
case 1:
var4 = new class51();
var4 = new WorldMapSection3();
break;
case 2:
var4 = new WorldMapSection1();

2
runescape-client/src/main/java/WorldMapEvent.java
View File

@@ -391,7 +391,7 @@ public class WorldMapEvent {
)
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;

4
runescape-client/src/main/java/WorldMapIcon_1.java
View File

@@ -144,7 +144,7 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon {
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 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon {
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);

13
runescape-client/src/main/java/WorldMapManager.java
View File

@@ -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 class WorldMapManager {
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 class WorldMapManager {
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);
}
}

12
runescape-client/src/main/java/WorldMapRegion.java
View File

@@ -298,7 +298,7 @@ public class WorldMapRegion {
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 @@ public class WorldMapRegion {
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 @@ public class WorldMapRegion {
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 @@ public class WorldMapRegion {
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 @@ public class WorldMapRegion {
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 @@ public class WorldMapRegion {
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) {

6
runescape-client/src/main/java/class49.java → runescape-client/src/main/java/WorldMapScaleHandler.java
View File

@@ -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;
}

4
runescape-client/src/main/java/WorldMapSection0.java
View File

@@ -220,8 +220,8 @@ public class WorldMapSection0 implements WorldMapSection {
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;

6
runescape-client/src/main/java/class51.java → runescape-client/src/main/java/WorldMapSection3.java
View File

@@ -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")

2
runescape-client/src/main/java/class105.java
View File

@@ -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")

3
runescape-client/src/main/java/class169.java
View File

@@ -63,7 +63,8 @@ public enum class169 implements Enumerated {
}
@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;

2
runescape-client/src/main/java/class198.java
View File

@@ -8,7 +8,7 @@ public class class198 {
@ObfuscatedSignature(
signature = "Lii;"
)
static ServerBuild field2353;
static GameBuild field2353;
@ObfuscatedName("jk")
@ObfuscatedSignature(

6
runescape-client/src/main/java/class22.java
View File

@@ -345,7 +345,8 @@ public class class22 {
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 @@ public class class22 {
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();

2
runescape-client/src/main/java/class237.java
View File

@@ -205,7 +205,7 @@ public class class237 {
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;

7
runescape-client/src/main/java/class7.java
View File

@@ -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")