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

devtools

Browse Source
This commit is contained in:
therealunull
2020-12-14 09:08:42 -05:00
parent aa44329202
commit a55f9502e2
115 changed files with 5376 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,7 +183,7 @@ public class ApproximateRouteStrategy extends RouteStrategy {
return 1; // L: 2120
} else if (var0 == ScriptOpcodes.CLAN_ISSELF) {
var3 = Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]; // L: 2123
if (WorldMapArea.clanChat != null && var3 < WorldMapArea.clanChat.getSize() && WorldMapArea.clanChat.get(var3).getUsername().equals(PlayerAppearance.localPlayer.username)) { // L: 2124
if (WorldMapArea.clanChat != null && var3 < WorldMapArea.clanChat.getSize() && WorldMapArea.clanChat.get(var3).getUsername().equals(PlayerComposition.localPlayer.username)) { // L: 2124
Interpreter.Interpreter_intStack[++VarcInt.Interpreter_intStackSize - 1] = 1; // L: 2125
} else {
Interpreter.Interpreter_intStack[++VarcInt.Interpreter_intStackSize - 1] = 0; // L: 2127

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

@@ -85,7 +85,7 @@ public class ArchiveDiskActionHandler implements Runnable {
}
}
} catch (Exception var13) { // L: 114
PlayerAppearance.RunException_sendStackTrace((String)null, var13); // L: 115
PlayerComposition.RunException_sendStackTrace((String)null, var13); // L: 115
}
} // L: 117

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

@@ -394,7 +394,7 @@ public enum AttackOption implements Enumerated {
}
var24.append("").append(var7); // L: 376
PlayerAppearance.RunException_sendStackTrace(var24.toString(), var27); // L: 377
PlayerComposition.RunException_sendStackTrace(var24.toString(), var27); // L: 377
}
} finally {
if (Interpreter.field1104) { // L: 381
@@ -438,7 +438,7 @@ public enum AttackOption implements Enumerated {
garbageValue = "1150447373"
)
static void method2138() {
if (PlayerAppearance.localPlayer.x >> 7 == Client.destinationX && PlayerAppearance.localPlayer.y >> 7 == Client.destinationY) { // L: 4702
if (PlayerComposition.localPlayer.x >> 7 == Client.destinationX && PlayerComposition.localPlayer.y >> 7 == Client.destinationY) { // L: 4702
Client.destinationX = 0; // L: 4703
}

20
runescape-client/src/main/java/BZip2Decompressor.java
View File

@@ -47,7 +47,7 @@ public final class BZip2Decompressor {
int var3 = var0.su_rNToGo; // L: 41
int var4 = var0.nblocks_used; // L: 42
int var5 = var0.su_ch2; // L: 43
int[] var6 = TileItemPile.BZip2Decompressor_block; // L: 44
int[] var6 = ItemLayer.BZip2Decompressor_block; // L: 44
int var7 = var0.field3779; // L: 45
byte[] var8 = var0.outputArray; // L: 46
int var9 = var0.next_out; // L: 47
@@ -157,7 +157,7 @@ public final class BZip2Decompressor {
var0.su_rNToGo = var3; // L: 137
var0.nblocks_used = var4; // L: 138
var0.su_ch2 = var5; // L: 139
TileItemPile.BZip2Decompressor_block = var6; // L: 140
ItemLayer.BZip2Decompressor_block = var6; // L: 140
var0.field3779 = var7; // L: 141
var0.outputArray = var8; // L: 142
var0.next_out = var9; // L: 143
@@ -193,8 +193,8 @@ public final class BZip2Decompressor {
int[] var24 = null; // L: 171
int[] var25 = null; // L: 172
var0.blockSize100k = -1205153797; // L: 173
if (TileItemPile.BZip2Decompressor_block == null) { // L: 174
TileItemPile.BZip2Decompressor_block = new int[var0.blockSize100k * 1124970976];
if (ItemLayer.BZip2Decompressor_block == null) { // L: 174
ItemLayer.BZip2Decompressor_block = new int[var0.blockSize100k * 1124970976];
}
boolean var26 = true; // L: 175
@@ -430,7 +430,7 @@ public final class BZip2Decompressor {
}
var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; // L: 396
TileItemPile.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397
ItemLayer.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397
++var47; // L: 398
if (var45 == 0) { // L: 399
++var43; // L: 400
@@ -489,7 +489,7 @@ public final class BZip2Decompressor {
var10000 = var0.unzftab; // L: 332
for (var10000[var1 & 255] += var48; var48 > 0; --var48) { // L: 333 336
TileItemPile.BZip2Decompressor_block[var47] = var1 & 255; // L: 334
ItemLayer.BZip2Decompressor_block[var47] = var1 & 255; // L: 334
++var47; // L: 335
}
}
@@ -509,16 +509,16 @@ public final class BZip2Decompressor {
}
for (var36 = 0; var36 < var47; ++var36) { // L: 426
var1 = (byte)(TileItemPile.BZip2Decompressor_block[var36] & 255); // L: 427
var10000 = TileItemPile.BZip2Decompressor_block; // L: 428
var1 = (byte)(ItemLayer.BZip2Decompressor_block[var36] & 255); // L: 427
var10000 = ItemLayer.BZip2Decompressor_block; // L: 428
int var10001 = var0.cftab[var1 & 255];
var10000[var10001] |= var36 << 8;
var10002 = var0.cftab[var1 & 255]++; // L: 429
}
var0.field3779 = TileItemPile.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431
var0.field3779 = ItemLayer.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431
var0.nblocks_used = 0; // L: 432
var0.field3779 = TileItemPile.BZip2Decompressor_block[var0.field3779]; // L: 433
var0.field3779 = ItemLayer.BZip2Decompressor_block[var0.field3779]; // L: 433
var0.su_ch2 = (byte)(var0.field3779 & 255); // L: 434
var0.field3779 >>= 8; // L: 436
++var0.nblocks_used; // L: 437

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

@@ -164,7 +164,7 @@ public final class Canvas extends java.awt.Canvas {
FriendLoginUpdate.pcmPlayer1 = UserComparator6.method3526(GameShell.taskHandler, 1, 2048); // L: 1829
WorldMapManager.pcmStreamMixer = new PcmStreamMixer(); // L: 1830
FriendLoginUpdate.pcmPlayer1.setStream(WorldMapManager.pcmStreamMixer); // L: 1831
TileItemPile.decimator = new Decimator(22050, PcmPlayer.field1443); // L: 1832
ItemLayer.decimator = new Decimator(22050, PcmPlayer.field1443); // L: 1832
Login.Login_loadingText = "Prepared sound engine"; // L: 1833
Login.Login_loadingPercent = 35; // L: 1834
Client.titleLoadingStage = 50; // L: 1835

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

@@ -230,7 +230,7 @@ public final class Client extends GameShell implements Usernamed {
descriptor = "Lhh;"
)
@Export("playerAppearance")
static PlayerAppearance playerAppearance;
static PlayerComposition playerComposition;
@ObfuscatedName("sk")
@ObfuscatedGetter(
intValue = -1302699221
@@ -1544,7 +1544,7 @@ public final class Client extends GameShell implements Usernamed {
viewportWidth = 0; // L: 626
viewportHeight = 0; // L: 627
viewportZoom = 0; // L: 628
playerAppearance = new PlayerAppearance(); // L: 630
playerComposition = new PlayerComposition(); // L: 630
field813 = -1; // L: 631
field911 = -1; // L: 632
platformInfoProvider = new DesktopPlatformInfoProvider(); // L: 634
@@ -1600,9 +1600,9 @@ public final class Client extends GameShell implements Usernamed {
class278.port1 = gameBuild == 0 ? 43594 : worldId + 40000; // L: 870
Players.port2 = gameBuild == 0 ? 443 : worldId + 50000; // L: 871
ArchiveDiskAction.port3 = class278.port1; // L: 872
PlayerAppearance.field2551 = class224.field2569; // L: 873
PlayerComposition.field2551 = class224.field2569; // L: 873
WorldMapScaleHandler.field366 = class224.field2565; // L: 874
PlayerAppearance.field2557 = class224.field2566; // L: 875
PlayerComposition.field2557 = class224.field2566; // L: 875
WorldMapCacheName.field331 = class224.field2567; // L: 876
GrandExchangeOfferAgeComparator.urlRequester = new UrlRequester(); // L: 877
this.setUpKeyboard(); // L: 878
@@ -2064,7 +2064,7 @@ public final class Client extends GameShell implements Usernamed {
GrandExchangeOfferWorldComparator.field52 = null; // L: 1238
Tiles.field511 = null; // L: 1239
class92.field1173 = null; // L: 1240
VarbitDefinition.Tiles_hue = null; // L: 1241
VarbitComposition.Tiles_hue = null; // L: 1241
ArchiveDiskActionHandler.Tiles_saturation = null; // L: 1242
class92.Tiles_lightness = null; // L: 1243
UserComparator7.Tiles_hueMultiplier = null; // L: 1244
@@ -2222,7 +2222,7 @@ public final class Client extends GameShell implements Usernamed {
JagexCache.JagexCache_dat2File.close(); // L: 1335
for (int var4 = 0; var4 < MusicPatchPcmStream.idxCount; ++var4) { // L: 1336
PlayerAppearance.JagexCache_idxFiles[var4].close();
PlayerComposition.JagexCache_idxFiles[var4].close();
}
JagexCache.JagexCache_idx255File.close(); // L: 1337
@@ -2325,33 +2325,33 @@ public final class Client extends GameShell implements Usernamed {
ObjectSound.field1077 = WorldMapScaleHandler.field365.toLowerCase(); // L: 770
try {
TileItemPile.userHomeDirectory = System.getProperty("user.home"); // L: 772
if (TileItemPile.userHomeDirectory != null) { // L: 773
TileItemPile.userHomeDirectory = TileItemPile.userHomeDirectory + "/";
ItemLayer.userHomeDirectory = System.getProperty("user.home"); // L: 772
if (ItemLayer.userHomeDirectory != null) { // L: 773
ItemLayer.userHomeDirectory = ItemLayer.userHomeDirectory + "/";
}
} catch (Exception var17) { // L: 775
}
try {
if (ObjectSound.field1077.startsWith("win")) { // L: 777
if (TileItemPile.userHomeDirectory == null) { // L: 778
TileItemPile.userHomeDirectory = System.getenv("USERPROFILE");
if (ItemLayer.userHomeDirectory == null) { // L: 778
ItemLayer.userHomeDirectory = System.getenv("USERPROFILE");
}
} else if (TileItemPile.userHomeDirectory == null) { // L: 781
TileItemPile.userHomeDirectory = System.getenv("HOME");
} else if (ItemLayer.userHomeDirectory == null) { // L: 781
ItemLayer.userHomeDirectory = System.getenv("HOME");
}
if (TileItemPile.userHomeDirectory != null) { // L: 783
TileItemPile.userHomeDirectory = TileItemPile.userHomeDirectory + "/";
if (ItemLayer.userHomeDirectory != null) { // L: 783
ItemLayer.userHomeDirectory = ItemLayer.userHomeDirectory + "/";
}
} catch (Exception var16) { // L: 785
}
if (TileItemPile.userHomeDirectory == null) { // L: 786
TileItemPile.userHomeDirectory = "~/";
if (ItemLayer.userHomeDirectory == null) { // L: 786
ItemLayer.userHomeDirectory = "~/";
}
GraphicsObject.field1117 = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", TileItemPile.userHomeDirectory, "/tmp/", ""}; // L: 787
GraphicsObject.field1117 = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", ItemLayer.userHomeDirectory, "/tmp/", ""}; // L: 787
DynamicObject.field1318 = new String[]{".jagex_cache_" + JagexCache.cacheGamebuild, ".file_store_" + JagexCache.cacheGamebuild}; // L: 788
label144:
@@ -2407,13 +2407,13 @@ public final class Client extends GameShell implements Usernamed {
WorldMapData_0.method237(); // L: 828
JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(ModelData0.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 829
JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(ModelData0.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 830
PlayerAppearance.JagexCache_idxFiles = new BufferedFile[MusicPatchPcmStream.idxCount]; // L: 831
PlayerComposition.JagexCache_idxFiles = new BufferedFile[MusicPatchPcmStream.idxCount]; // L: 831
for (int var14 = 0; var14 < MusicPatchPcmStream.idxCount; ++var14) { // L: 832
PlayerAppearance.JagexCache_idxFiles[var14] = new BufferedFile(new AccessFile(ModelData0.getFile("main_file_cache.idx" + var14), "rw", 1048576L), 6000, 0); // L: 833
PlayerComposition.JagexCache_idxFiles[var14] = new BufferedFile(new AccessFile(ModelData0.getFile("main_file_cache.idx" + var14), "rw", 1048576L), 6000, 0); // L: 833
}
} catch (Exception var19) { // L: 837
PlayerAppearance.RunException_sendStackTrace((String)null, var19); // L: 838
PlayerComposition.RunException_sendStackTrace((String)null, var19); // L: 838
}
WorldMapIcon_0.client = this; // L: 840
@@ -3641,16 +3641,16 @@ public final class Client extends GameShell implements Usernamed {
boolean var31 = staffModLevel >= 2; // L: 3235
if (var31 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 3237
var4 = PlayerAppearance.localPlayer.plane - mouseWheelRotation; // L: 3238
var4 = PlayerComposition.localPlayer.plane - mouseWheelRotation; // L: 3238
if (var4 < 0) { // L: 3239
var4 = 0;
} else if (var4 > 3) { // L: 3240
var4 = 3;
}
if (var4 != PlayerAppearance.localPlayer.plane) { // L: 3241
var5 = PlayerAppearance.localPlayer.pathX[0] + NetFileRequest.baseX; // L: 3242
var6 = PlayerAppearance.localPlayer.pathY[0] + class41.baseY; // L: 3243
if (var4 != PlayerComposition.localPlayer.plane) { // L: 3241
var5 = PlayerComposition.localPlayer.pathX[0] + NetFileRequest.baseX; // L: 3242
var6 = PlayerComposition.localPlayer.pathY[0] + class41.baseY; // L: 3243
PacketBufferNode var27 = ItemContainer.getPacketBufferNode(ClientPacket.field2269, packetWriter.isaacCipher); // L: 3246
var27.packetBuffer.method5578(var5); // L: 3247
var27.packetBuffer.method5587(0); // L: 3248
@@ -3685,7 +3685,7 @@ public final class Client extends GameShell implements Usernamed {
if (var41 == null) { // L: 3284
this.menu(); // L: 3294
if (WorldMapRectangle.worldMap != null) { // L: 3296
WorldMapRectangle.worldMap.method6370(GameObject.Client_plane, (PlayerAppearance.localPlayer.x >> 7) + NetFileRequest.baseX, (PlayerAppearance.localPlayer.y >> 7) + class41.baseY, false); // L: 3297
WorldMapRectangle.worldMap.method6370(GameObject.Client_plane, (PlayerComposition.localPlayer.x >> 7) + NetFileRequest.baseX, (PlayerComposition.localPlayer.y >> 7) + class41.baseY, false); // L: 3297
WorldMapRectangle.worldMap.loadCache(); // L: 3298
}
@@ -3808,8 +3808,8 @@ public final class Client extends GameShell implements Usernamed {
int var28;
if (oculusOrbState == 0) { // L: 3405
var4 = PlayerAppearance.localPlayer.x; // L: 3406
var5 = PlayerAppearance.localPlayer.y; // L: 3407
var4 = PlayerComposition.localPlayer.x; // L: 3406
var5 = PlayerComposition.localPlayer.y; // L: 3407
if (SecureRandomFuture.oculusOrbFocalPointX - var4 < -500 || SecureRandomFuture.oculusOrbFocalPointX - var4 > 500 || Decimator.oculusOrbFocalPointY - var5 < -500 || Decimator.oculusOrbFocalPointY - var5 > 500) { // L: 3408
SecureRandomFuture.oculusOrbFocalPointX = var4; // L: 3409
Decimator.oculusOrbFocalPointY = var5; // L: 3410
@@ -3858,19 +3858,19 @@ public final class Client extends GameShell implements Usernamed {
field918 += (var10 - field918) / 80; // L: 3432
}
PacketWriter.field1341 = SecureRandomFuture.getTileHeight(PlayerAppearance.localPlayer.x, PlayerAppearance.localPlayer.y, GameObject.Client_plane) - camFollowHeight; // L: 3433
PacketWriter.field1341 = SecureRandomFuture.getTileHeight(PlayerComposition.localPlayer.x, PlayerComposition.localPlayer.y, GameObject.Client_plane) - camFollowHeight; // L: 3433
} else if (oculusOrbState == 1) { // L: 3435
if (field649 && PlayerAppearance.localPlayer != null) { // L: 3437
var4 = PlayerAppearance.localPlayer.pathX[0]; // L: 3438
var5 = PlayerAppearance.localPlayer.pathY[0]; // L: 3439
if (field649 && PlayerComposition.localPlayer != null) { // L: 3437
var4 = PlayerComposition.localPlayer.pathX[0]; // L: 3438
var5 = PlayerComposition.localPlayer.pathY[0]; // L: 3439
if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 3440
SecureRandomFuture.oculusOrbFocalPointX = PlayerAppearance.localPlayer.x; // L: 3441
var6 = SecureRandomFuture.getTileHeight(PlayerAppearance.localPlayer.x, PlayerAppearance.localPlayer.y, GameObject.Client_plane) - camFollowHeight; // L: 3442
SecureRandomFuture.oculusOrbFocalPointX = PlayerComposition.localPlayer.x; // L: 3441
var6 = SecureRandomFuture.getTileHeight(PlayerComposition.localPlayer.x, PlayerComposition.localPlayer.y, GameObject.Client_plane) - camFollowHeight; // L: 3442
if (var6 < PacketWriter.field1341) { // L: 3443
PacketWriter.field1341 = var6;
}
Decimator.oculusOrbFocalPointY = PlayerAppearance.localPlayer.y; // L: 3444
Decimator.oculusOrbFocalPointY = PlayerComposition.localPlayer.y; // L: 3444
field649 = false; // L: 3445
}
}
@@ -4278,7 +4278,7 @@ public final class Client extends GameShell implements Usernamed {
}
}
FriendsList.method5222(GameObject.Client_plane, PlayerAppearance.localPlayer.x, PlayerAppearance.localPlayer.y, field850); // L: 4280
FriendsList.method5222(GameObject.Client_plane, PlayerComposition.localPlayer.x, PlayerComposition.localPlayer.y, field850); // L: 4280
field850 = 0; // L: 4281
} // L: 4282
@@ -4503,7 +4503,7 @@ public final class Client extends GameShell implements Usernamed {
var16 = var3.readInt(); // L: 5768
var51 = CollisionMap.getWidget(var16); // L: 5769
var51.modelType = 3; // L: 5770
var51.modelId = PlayerAppearance.localPlayer.appearance.getChatHeadId(); // L: 5771
var51.modelId = PlayerComposition.localPlayer.appearance.getChatHeadId(); // L: 5771
CollisionMap.invalidateWidget(var51); // L: 5772
var1.serverPacket = null; // L: 5773
return true; // L: 5774
@@ -5637,18 +5637,18 @@ public final class Client extends GameShell implements Usernamed {
return true; // L: 6629
}
PlayerAppearance.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * 1148115103 * -61586593 : -1) + "," + (var1.field1336 != null ? var1.field1336.id * 1148115103 * -61586593 : -1) + "," + (var1.field1337 != null ? var1.field1337.id * 1148115103 * -61586593 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 6631
PlayerComposition.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * 1148115103 * -61586593 : -1) + "," + (var1.field1336 != null ? var1.field1336.id * 1148115103 * -61586593 : -1) + "," + (var1.field1337 != null ? var1.field1337.id * 1148115103 * -61586593 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 6631
WorldMapRectangle.logOut(); // L: 6632
} catch (IOException var35) { // L: 6634
LoginScreenAnimation.method1903(); // L: 6635
} catch (Exception var36) {
var17 = "" + (var1.serverPacket != null ? var1.serverPacket.id * 1148115103 * -61586593 : -1) + "," + (var1.field1336 != null ? var1.field1336.id * 1148115103 * -61586593 : -1) + "," + (var1.field1337 != null ? var1.field1337.id * 1148115103 * -61586593 : -1) + "," + var1.serverPacketLength + "," + (PlayerAppearance.localPlayer.pathX[0] + NetFileRequest.baseX) + "," + (PlayerAppearance.localPlayer.pathY[0] + class41.baseY) + ","; // L: 6638
var17 = "" + (var1.serverPacket != null ? var1.serverPacket.id * 1148115103 * -61586593 : -1) + "," + (var1.field1336 != null ? var1.field1336.id * 1148115103 * -61586593 : -1) + "," + (var1.field1337 != null ? var1.field1337.id * 1148115103 * -61586593 : -1) + "," + var1.serverPacketLength + "," + (PlayerComposition.localPlayer.pathX[0] + NetFileRequest.baseX) + "," + (PlayerComposition.localPlayer.pathY[0] + class41.baseY) + ","; // L: 6638
for (var18 = 0; var18 < var1.serverPacketLength && var18 < 50; ++var18) { // L: 6639
var17 = var17 + var3.array[var18] + ",";
}
PlayerAppearance.RunException_sendStackTrace(var17, var36); // L: 6640
PlayerComposition.RunException_sendStackTrace(var17, var36); // L: 6640
WorldMapRectangle.logOut(); // L: 6641
}
@@ -5943,7 +5943,7 @@ public final class Client extends GameShell implements Usernamed {
)
@Export("username")
public Username username() {
return PlayerAppearance.localPlayer != null ? PlayerAppearance.localPlayer.username : null; // L: 11178
return PlayerComposition.localPlayer != null ? PlayerComposition.localPlayer.username : null; // L: 11178
}
@ObfuscatedName("x")

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

@@ -111,18 +111,18 @@ public class Coord {
)
@Export("getVarbit")
public static int getVarbit(int var0) {
VarbitDefinition var2 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0); // L: 26
VarbitDefinition var1;
VarbitComposition var2 = (VarbitComposition) VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 26
VarbitComposition var1;
if (var2 != null) { // L: 27
var1 = var2; // L: 28
} else {
byte[] var3 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0); // L: 31
var2 = new VarbitDefinition(); // L: 32
byte[] var3 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 31
var2 = new VarbitComposition(); // L: 32
if (var3 != null) { // L: 33
var2.decode(new Buffer(var3));
}
VarbitDefinition.VarbitDefinition_cached.put(var2, (long)var0); // L: 34
VarbitComposition.VarbitDefinition_cached.put(var2, (long)var0); // L: 34
var1 = var2; // L: 35
}

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

@@ -52,7 +52,7 @@ public class DefaultsGroup {
Client.players[var0] = null;
}
PlayerAppearance.localPlayer = null; // L: 2774
PlayerComposition.localPlayer = null; // L: 2774
for (var0 = 0; var0 < Client.npcs.length; ++var0) { // L: 2775
NPC var1 = Client.npcs[var0]; // L: 2776

44
runescape-client/src/main/java/DirectByteArrayCopier.java
View File

@@ -63,7 +63,7 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
GrandExchangeOfferWorldComparator.field52 = new int[4][105][105]; // L: 53
Tiles.field511 = new byte[4][105][105]; // L: 54
class92.field1173 = new int[105][105]; // L: 55
VarbitDefinition.Tiles_hue = new int[104]; // L: 56
VarbitComposition.Tiles_hue = new int[104]; // L: 56
ArchiveDiskActionHandler.Tiles_saturation = new int[104]; // L: 57
class92.Tiles_lightness = new int[104]; // L: 58
UserComparator7.Tiles_hueMultiplier = new int[104]; // L: 59
@@ -83,16 +83,16 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 10874
if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 10875
int var5 = Client.camAngleY & 2047; // L: 10876
int var6 = PlayerAppearance.localPlayer.x / 32 + 48; // L: 10877
int var7 = 464 - PlayerAppearance.localPlayer.y / 32; // L: 10878
int var6 = PlayerComposition.localPlayer.x / 32 + 48; // L: 10877
int var7 = 464 - PlayerComposition.localPlayer.y / 32; // L: 10878
class25.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 10879
int var8;
int var10;
int var17;
for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 10880
var17 = Client.mapIconXs[var8] * 4 + 2 - PlayerAppearance.localPlayer.x / 32; // L: 10881
var10 = Client.mapIconYs[var8] * 4 + 2 - PlayerAppearance.localPlayer.y / 32; // L: 10882
var17 = Client.mapIconXs[var8] * 4 + 2 - PlayerComposition.localPlayer.x / 32; // L: 10881
var10 = Client.mapIconYs[var8] * 4 + 2 - PlayerComposition.localPlayer.y / 32; // L: 10882
class25.drawSpriteOnMinimap(var1, var2, var17, var10, Client.mapIcons[var8], var4); // L: 10883
}
@@ -102,8 +102,8 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
for (var17 = 0; var17 < 104; ++var17) { // L: 10886
NodeDeque var15 = Client.groundItems[GameObject.Client_plane][var8][var17]; // L: 10887
if (var15 != null) { // L: 10888
var11 = var8 * 4 + 2 - PlayerAppearance.localPlayer.x / 32; // L: 10889
var12 = var17 * 4 + 2 - PlayerAppearance.localPlayer.y / 32; // L: 10890
var11 = var8 * 4 + 2 - PlayerComposition.localPlayer.x / 32; // L: 10889
var12 = var17 * 4 + 2 - PlayerComposition.localPlayer.y / 32; // L: 10890
class25.drawSpriteOnMinimap(var1, var2, var11, var12, Actor.mapDotSprites[0], var4); // L: 10891
}
}
@@ -118,8 +118,8 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
}
if (var19 != null && var19.drawMapDot && var19.isInteractable) { // L: 10900
var11 = var9.x / 32 - PlayerAppearance.localPlayer.x / 32; // L: 10901
var12 = var9.y / 32 - PlayerAppearance.localPlayer.y / 32; // L: 10902
var11 = var9.x / 32 - PlayerComposition.localPlayer.x / 32; // L: 10901
var12 = var9.y / 32 - PlayerComposition.localPlayer.y / 32; // L: 10902
class25.drawSpriteOnMinimap(var1, var2, var11, var12, Actor.mapDotSprites[1], var4); // L: 10903
}
}
@@ -130,11 +130,11 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
for (var10 = 0; var10 < var8; ++var10) { // L: 10909
Player var16 = Client.players[var18[var10]]; // L: 10910
if (var16 != null && var16.isVisible() && !var16.isHidden && var16 != PlayerAppearance.localPlayer) { // L: 10911
var12 = var16.x / 32 - PlayerAppearance.localPlayer.x / 32; // L: 10912
int var13 = var16.y / 32 - PlayerAppearance.localPlayer.y / 32; // L: 10913
if (var16 != null && var16.isVisible() && !var16.isHidden && var16 != PlayerComposition.localPlayer) { // L: 10911
var12 = var16.x / 32 - PlayerComposition.localPlayer.x / 32; // L: 10912
int var13 = var16.y / 32 - PlayerComposition.localPlayer.y / 32; // L: 10913
boolean var14 = false; // L: 10914
if (PlayerAppearance.localPlayer.team != 0 && var16.team != 0 && var16.team == PlayerAppearance.localPlayer.team) { // L: 10915
if (PlayerComposition.localPlayer.team != 0 && var16.team != 0 && var16.team == PlayerComposition.localPlayer.team) { // L: 10915
var14 = true;
}
@@ -154,35 +154,35 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 10923
NPC var20 = Client.npcs[Client.hintArrowNpcIndex]; // L: 10924
if (var20 != null) { // L: 10925
var11 = var20.x / 32 - PlayerAppearance.localPlayer.x / 32; // L: 10926
var12 = var20.y / 32 - PlayerAppearance.localPlayer.y / 32; // L: 10927
var11 = var20.x / 32 - PlayerComposition.localPlayer.x / 32; // L: 10926
var12 = var20.y / 32 - PlayerComposition.localPlayer.y / 32; // L: 10927
AbstractWorldMapData.worldToMinimap(var1, var2, var11, var12, GrandExchangeOfferUnitPriceComparator.mapMarkerSpritePixels[1], var4); // L: 10928
}
}
if (Client.hintArrowType == 2) { // L: 10931
var10 = Client.hintArrowX * 4 - NetFileRequest.baseX * 4 + 2 - PlayerAppearance.localPlayer.x / 32; // L: 10932
var11 = Client.hintArrowY * 4 - class41.baseY * 4 + 2 - PlayerAppearance.localPlayer.y / 32; // L: 10933
var10 = Client.hintArrowX * 4 - NetFileRequest.baseX * 4 + 2 - PlayerComposition.localPlayer.x / 32; // L: 10932
var11 = Client.hintArrowY * 4 - class41.baseY * 4 + 2 - PlayerComposition.localPlayer.y / 32; // L: 10933
AbstractWorldMapData.worldToMinimap(var1, var2, var10, var11, GrandExchangeOfferUnitPriceComparator.mapMarkerSpritePixels[1], var4); // L: 10934
}
if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 10936
Player var21 = Client.players[Client.hintArrowPlayerIndex]; // L: 10937
if (var21 != null) { // L: 10938
var11 = var21.x / 32 - PlayerAppearance.localPlayer.x / 32; // L: 10939
var12 = var21.y / 32 - PlayerAppearance.localPlayer.y / 32; // L: 10940
var11 = var21.x / 32 - PlayerComposition.localPlayer.x / 32; // L: 10939
var12 = var21.y / 32 - PlayerComposition.localPlayer.y / 32; // L: 10940
AbstractWorldMapData.worldToMinimap(var1, var2, var11, var12, GrandExchangeOfferUnitPriceComparator.mapMarkerSpritePixels[1], var4); // L: 10941
}
}
}
if (Client.destinationX != 0) { // L: 10945
var10 = Client.destinationX * 4 + 2 - PlayerAppearance.localPlayer.x / 32; // L: 10946
var11 = Client.destinationY * 4 + 2 - PlayerAppearance.localPlayer.y / 32; // L: 10947
var10 = Client.destinationX * 4 + 2 - PlayerComposition.localPlayer.x / 32; // L: 10946
var11 = Client.destinationY * 4 + 2 - PlayerComposition.localPlayer.y / 32; // L: 10947
class25.drawSpriteOnMinimap(var1, var2, var10, var11, GrandExchangeOfferUnitPriceComparator.mapMarkerSpritePixels[0], var4); // L: 10948
}
if (!PlayerAppearance.localPlayer.isHidden) { // L: 10950
if (!PlayerComposition.localPlayer.isHidden) { // L: 10950
Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215);
}
} else {

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

@@ -84,7 +84,7 @@ public class FaceNormal {
} else if (var0 < 3400) { // L: 414
return Language.method3709(var0, var1, var2);
} else if (var0 < 3500) { // L: 415
return TileItemPile.method2850(var0, var1, var2);
return ItemLayer.method2850(var0, var1, var2);
} else if (var0 < 3700) { // L: 416
return ApproximateRouteStrategy.method1302(var0, var1, var2);
} else if (var0 < 4000) { // L: 417

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

@@ -82,7 +82,7 @@ public final class FloorDecoration {
for (int var6 = 0; var6 < var2; ++var6) { // L: 8292
Player var7 = Client.players[var3[var6]]; // L: 8293
if (var7 != null && var7 != PlayerAppearance.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 8294
if (var7 != null && var7 != PlayerComposition.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 8294
PacketBufferNode var8;
if (var0 == 1) { // L: 8295
var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher); // L: 8297
@@ -124,14 +124,14 @@ public final class FloorDecoration {
)
@Export("addPlayerToMenu")
static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) {
if (PlayerAppearance.localPlayer != var0) { // L: 8826
if (PlayerComposition.localPlayer != var0) { // L: 8826
if (Client.menuOptionsCount < 400) { // L: 8827
String var4;
int var7;
if (var0.skillLevel == 0) { // L: 8829
String var5 = var0.actions[0] + var0.username + var0.actions[1]; // L: 8830
var7 = var0.combatLevel; // L: 8832
int var8 = PlayerAppearance.localPlayer.combatLevel; // L: 8833
int var8 = PlayerComposition.localPlayer.combatLevel; // L: 8833
int var9 = var8 - var7; // L: 8835
String var6;
if (var9 < -9) { // L: 8836
@@ -175,12 +175,12 @@ public final class FloorDecoration {
continue;
}
if (Client.playerAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > PlayerAppearance.localPlayer.combatLevel) { // L: 8889
if (Client.playerAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > PlayerComposition.localPlayer.combatLevel) { // L: 8889
var11 = 2000; // L: 8890
}
if (PlayerAppearance.localPlayer.team != 0 && var0.team != 0) { // L: 8892
if (var0.team == PlayerAppearance.localPlayer.team) { // L: 8893
if (PlayerComposition.localPlayer.team != 0 && var0.team != 0) { // L: 8892
if (var0.team == PlayerComposition.localPlayer.team) { // L: 8893
var11 = 2000;
} else {
var11 = 0; // L: 8894

8
runescape-client/src/main/java/FontName.java
View File

@@ -586,18 +586,18 @@ public class FontName {
}
} else if (var10.modelType == 5) { // L: 9263
if (var10.modelId == 0) { // L: 9264
var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1);
var41 = Client.playerComposition.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1);
} else {
var41 = PlayerAppearance.localPlayer.getModel(); // L: 9265
var41 = PlayerComposition.localPlayer.getModel(); // L: 9265
}
} else if (var20 == -1) { // L: 9267
var41 = var10.getModel((SequenceDefinition)null, -1, var36, PlayerAppearance.localPlayer.appearance); // L: 9268
var41 = var10.getModel((SequenceDefinition)null, -1, var36, PlayerComposition.localPlayer.appearance); // L: 9268
if (var41 == null && Widget.field2603) { // L: 9269
CollisionMap.invalidateWidget(var10);
}
} else {
SequenceDefinition var47 = ParamDefinition.SequenceDefinition_get(var20); // L: 9272
var41 = var10.getModel(var47, var10.modelFrame, var36, PlayerAppearance.localPlayer.appearance); // L: 9273
var41 = var10.getModel(var47, var10.modelFrame, var36, PlayerComposition.localPlayer.appearance); // L: 9273
if (var41 == null && Widget.field2603) { // L: 9274
CollisionMap.invalidateWidget(var10);
}

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

@@ -96,7 +96,7 @@ public class Frames extends DualNode {
if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1145
int var4;
if (var0 == 1928) { // L: 1162
var6 = var2 ? PlayerAppearance.field2561 : VarcInt.field3264; // L: 1163
var6 = var2 ? PlayerComposition.field2561 : VarcInt.field3264; // L: 1163
var4 = Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]; // L: 1164
if (var4 >= 1 && var4 <= 10) { // L: 1165
class3.widgetDefaultMenuAction(var4, var6.id, var6.childIndex, var6.itemId, ""); // L: 1168
@@ -124,7 +124,7 @@ public class Frames extends DualNode {
if (var0 >= 2000) { // L: 1150
var6 = CollisionMap.getWidget(Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]); // L: 1151
} else {
var6 = var2 ? PlayerAppearance.field2561 : VarcInt.field3264; // L: 1153
var6 = var2 ? PlayerComposition.field2561 : VarcInt.field3264; // L: 1153
}
if (var6.onResize == null) { // L: 1154

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

@@ -135,7 +135,7 @@ public class FriendSystem {
final boolean isFriended(Username var1, boolean var2) {
if (var1 == null) { // L: 71
return false;
} else if (var1.equals(PlayerAppearance.localPlayer.username)) { // L: 72
} else if (var1.equals(PlayerComposition.localPlayer.username)) { // L: 72
return true;
} else {
return this.friendsList.isFriended(var1, var2); // L: 73
@@ -168,7 +168,7 @@ public class FriendSystem {
if (var2.hasCleanName()) { // L: 86
if (this.friendsListIsFull()) { // L: 87
Calendar.method3985(); // L: 88
} else if (PlayerAppearance.localPlayer.username.equals(var2)) { // L: 91
} else if (PlayerComposition.localPlayer.username.equals(var2)) { // L: 91
ServerPacket.method3668(); // L: 92
} else if (this.isFriended(var2, false)) { // L: 95
class219.method4003(var1); // L: 96
@@ -212,7 +212,7 @@ public class FriendSystem {
var10000 = null; // L: 153
var3 = "Your ignore list is full. Max of 100 for free users, and 400 for members";
class234.addGameMessage(30, "", var3); // L: 155
} else if (PlayerAppearance.localPlayer.username.equals(var2)) { // L: 160
} else if (PlayerComposition.localPlayer.username.equals(var2)) { // L: 160
var10000 = null; // L: 162
var3 = "You can't add yourself to your own ignore list";
class234.addGameMessage(30, "", var3); // L: 164

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

@@ -191,7 +191,7 @@ public class FriendsList extends UserList {
if (var4.soundEffectId >= 0) { // L: 75
SoundEffect var7 = SoundEffect.readSoundEffect(class227.archive4, var4.soundEffectId, 0); // L: 76
if (var7 != null) { // L: 77
RawSound var8 = var7.toRawSound().resample(TileItemPile.decimator); // L: 78
RawSound var8 = var7.toRawSound().resample(ItemLayer.decimator); // L: 78
RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); // L: 79
var9.setNumLoops(-1); // L: 80
WorldMapManager.pcmStreamMixer.addSubStream(var9); // L: 81
@@ -207,7 +207,7 @@ public class FriendsList extends UserList {
int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); // L: 89
SoundEffect var12 = SoundEffect.readSoundEffect(class227.archive4, var4.soundEffectIds[var11], 0); // L: 90
if (var12 != null) { // L: 91
RawSound var13 = var12.toRawSound().resample(TileItemPile.decimator); // L: 92
RawSound var13 = var12.toRawSound().resample(ItemLayer.decimator); // L: 92
RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); // L: 93
var10.setNumLoops(0); // L: 94
WorldMapManager.pcmStreamMixer.addSubStream(var10); // L: 95

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

@@ -472,7 +472,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
taskHandler.newThreadTask(this, 1); // L: 235
} catch (Exception var5) { // L: 237
PlayerAppearance.RunException_sendStackTrace((String)null, var5); // L: 238
PlayerComposition.RunException_sendStackTrace((String)null, var5); // L: 238
this.error("crash"); // L: 239
}
@@ -960,7 +960,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
this.post(this.canvas); // L: 332
}
} catch (Exception var7) { // L: 335
PlayerAppearance.RunException_sendStackTrace((String)null, var7); // L: 336
PlayerComposition.RunException_sendStackTrace((String)null, var7); // L: 336
this.error("crash"); // L: 337
}

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

@@ -207,7 +207,7 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
Interpreter.Interpreter_stringStackSize -= 2; // L: 2668
var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 2669
var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 2670
if (PlayerAppearance.localPlayer.appearance != null && PlayerAppearance.localPlayer.appearance.isFemale) { // L: 2671
if (PlayerComposition.localPlayer.appearance != null && PlayerComposition.localPlayer.appearance.isFemale) { // L: 2671
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4;
} else {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; // L: 2672

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

@@ -75,7 +75,7 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator {
garbageValue = "-613147121"
)
static int method200(int var0, Script var1, boolean var2) {
Widget var3 = var2 ? PlayerAppearance.field2561 : VarcInt.field3264; // L: 1041
Widget var3 = var2 ? PlayerComposition.field2561 : VarcInt.field3264; // L: 1041
if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1042
Interpreter.Interpreter_intStack[++VarcInt.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1043
return 1; // L: 1044

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

@@ -342,7 +342,7 @@ public class HealthBarDefinition extends DualNode {
}
if (var6 == 8) { // L: 9634
var7 = PlayerAppearance.localPlayer.combatLevel;
var7 = PlayerComposition.localPlayer.combatLevel;
}
if (var6 == 9) { // L: 9635
@@ -400,11 +400,11 @@ public class HealthBarDefinition extends DualNode {
}
if (var6 == 18) { // L: 9668
var7 = (PlayerAppearance.localPlayer.x >> 7) + NetFileRequest.baseX;
var7 = (PlayerComposition.localPlayer.x >> 7) + NetFileRequest.baseX;
}
if (var6 == 19) { // L: 9669
var7 = (PlayerAppearance.localPlayer.y >> 7) + class41.baseY;
var7 = (PlayerComposition.localPlayer.y >> 7) + class41.baseY;
}
if (var6 == 20) { // L: 9670

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

@@ -104,26 +104,26 @@ public class HealthBarUpdate extends Node {
if (var1 >= 300 && var1 <= 313) { // L: 10848
var2 = (var1 - 300) / 2; // L: 10849
var3 = var1 & 1; // L: 10850
Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 10851
Client.playerComposition.changeAppearance(var2, var3 == 1); // L: 10851
}
if (var1 >= 314 && var1 <= 323) { // L: 10853
var2 = (var1 - 314) / 2; // L: 10854
var3 = var1 & 1; // L: 10855
Client.playerAppearance.method4043(var2, var3 == 1); // L: 10856
Client.playerComposition.method4043(var2, var3 == 1); // L: 10856
}
if (var1 == 324) {
Client.playerAppearance.changeSex(false); // L: 10858
Client.playerComposition.changeSex(false); // L: 10858
}
if (var1 == 325) { // L: 10859
Client.playerAppearance.changeSex(true);
Client.playerComposition.changeSex(true);
}
if (var1 == 326) { // L: 10860
PacketBufferNode var4 = ItemContainer.getPacketBufferNode(ClientPacket.field2239, Client.packetWriter.isaacCipher); // L: 10862
Client.playerAppearance.write(var4.packetBuffer); // L: 10863
Client.playerComposition.write(var4.packetBuffer); // L: 10863
Client.packetWriter.addNode(var4); // L: 10864
return true; // L: 10865
} else {

7
runescape-client/src/main/java/TileItemPile.java → runescape-client/src/main/java/ItemLayer.java
View File

@@ -6,8 +6,9 @@ import net.runelite.mapping.ObfuscatedSignature;
import net.runelite.rs.ScriptOpcodes;
@ObfuscatedName("dz")
@Implements("TileItemPile")
public final class TileItemPile {
@Implements("ItemLayer")
public final class ItemLayer
{
@ObfuscatedName("qq")
@ObfuscatedSignature(
descriptor = "Ldn;"
@@ -69,7 +70,7 @@ public final class TileItemPile {
@Export("height")
int height;
TileItemPile() {
ItemLayer() {
} // L: 13
@ObfuscatedName("ag")

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

@@ -250,18 +250,18 @@ public class KitDefinition extends DualNode {
garbageValue = "-1929348115"
)
public static void method4491(int var0, int var1) {
VarbitDefinition var3 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0); // L: 48
VarbitDefinition var2;
VarbitComposition var3 = (VarbitComposition) VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 48
VarbitComposition var2;
if (var3 != null) { // L: 49
var2 = var3; // L: 50
} else {
byte[] var4 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0); // L: 53
var3 = new VarbitDefinition(); // L: 54
byte[] var4 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 53
var3 = new VarbitComposition(); // L: 54
if (var4 != null) { // L: 55
var3.decode(new Buffer(var4));
}
VarbitDefinition.VarbitDefinition_cached.put(var3, (long)var0); // L: 56
VarbitComposition.VarbitDefinition_cached.put(var3, (long)var0); // L: 56
var2 = var3; // L: 57
}

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

@@ -216,8 +216,8 @@ public class Language implements Enumerated {
int var5;
if (var0 == ScriptOpcodes.COORD) { // L: 1826
var3 = GameObject.Client_plane; // L: 1827
var4 = (PlayerAppearance.localPlayer.x >> 7) + NetFileRequest.baseX; // L: 1828
var5 = (PlayerAppearance.localPlayer.y >> 7) + class41.baseY; // L: 1829
var4 = (PlayerComposition.localPlayer.x >> 7) + NetFileRequest.baseX; // L: 1828
var5 = (PlayerComposition.localPlayer.y >> 7) + class41.baseY; // L: 1829
Interpreter.Interpreter_intStack[++VarcInt.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 1830
return 1; // L: 1831
} else if (var0 == ScriptOpcodes.COORDX) { // L: 1833

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

@@ -182,7 +182,7 @@ public class LoginPacket implements class190 {
}
for (var11 = 0; var11 < 104; ++var11) { // L: 540
VarbitDefinition.Tiles_hue[var11] = 0; // L: 541
VarbitComposition.Tiles_hue[var11] = 0; // L: 541
ArchiveDiskActionHandler.Tiles_saturation[var11] = 0; // L: 542
class92.Tiles_lightness[var11] = 0; // L: 543
UserComparator7.Tiles_hueMultiplier[var11] = 0; // L: 544
@@ -197,7 +197,7 @@ public class LoginPacket implements class190 {
var14 = Tiles.field514[var2][var13][var12] & 255; // L: 551
if (var14 > 0) { // L: 552
FloorUnderlayDefinition var44 = WorldMapElement.method4405(var14 - 1); // L: 553
var10000 = VarbitDefinition.Tiles_hue; // L: 554
var10000 = VarbitComposition.Tiles_hue; // L: 554
var10000[var12] += var44.hue;
var10000 = ArchiveDiskActionHandler.Tiles_saturation; // L: 555
var10000[var12] += var44.saturation;
@@ -214,7 +214,7 @@ public class LoginPacket implements class190 {
var15 = Tiles.field514[var2][var14][var12] & 255; // L: 563
if (var15 > 0) { // L: 564
FloorUnderlayDefinition var45 = WorldMapElement.method4405(var15 - 1); // L: 565
var10000 = VarbitDefinition.Tiles_hue; // L: 566
var10000 = VarbitComposition.Tiles_hue; // L: 566
var10000[var12] -= var45.hue;
var10000 = ArchiveDiskActionHandler.Tiles_saturation; // L: 567
var10000[var12] -= var45.saturation;
@@ -237,7 +237,7 @@ public class LoginPacket implements class190 {
for (var17 = -5; var17 < 109; ++var17) { // L: 580
var18 = var17 + 5; // L: 581
if (var18 >= 0 && var18 < 104) { // L: 582
var12 += VarbitDefinition.Tiles_hue[var18]; // L: 583
var12 += VarbitComposition.Tiles_hue[var18]; // L: 583
var13 += ArchiveDiskActionHandler.Tiles_saturation[var18]; // L: 584
var14 += class92.Tiles_lightness[var18]; // L: 585
var15 += UserComparator7.Tiles_hueMultiplier[var18]; // L: 586
@@ -246,7 +246,7 @@ public class LoginPacket implements class190 {
var19 = var17 - 5; // L: 589
if (var19 >= 0 && var19 < 104) { // L: 590
var12 -= VarbitDefinition.Tiles_hue[var19]; // L: 591
var12 -= VarbitComposition.Tiles_hue[var19]; // L: 591
var13 -= ArchiveDiskActionHandler.Tiles_saturation[var19]; // L: 592
var14 -= class92.Tiles_lightness[var19]; // L: 593
var15 -= UserComparator7.Tiles_hueMultiplier[var19]; // L: 594

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

@@ -63,7 +63,7 @@ public class Messages {
garbageValue = "-729014462"
)
static int method2283(int var0, Script var1, boolean var2) {
Widget var3 = var2 ? PlayerAppearance.field2561 : VarcInt.field3264; // L: 1012
Widget var3 = var2 ? PlayerComposition.field2561 : VarcInt.field3264; // L: 1012
if (var0 == ScriptOpcodes.CC_GETX) { // L: 1013
Interpreter.Interpreter_intStack[++VarcInt.Interpreter_intStackSize - 1] = var3.x; // L: 1014
return 1; // L: 1015

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

@@ -131,7 +131,7 @@ public enum ModeWhere implements Enumerated {
var0 -= 1000; // L: 948
var3 = CollisionMap.getWidget(Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]); // L: 949
} else {
var3 = var2 ? PlayerAppearance.field2561 : VarcInt.field3264; // L: 951
var3 = var2 ? PlayerComposition.field2561 : VarcInt.field3264; // L: 951
}
String var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 952
@@ -301,7 +301,7 @@ public enum ModeWhere implements Enumerated {
var4.idleSequence = var4.definition.idleSequence; // L: 7303
var4.turnLeftSequence = var4.definition.turnLeftSequence; // L: 7304
var4.turnRightSequence = var4.definition.turnRightSequence; // L: 7305
var4.method2106(PlayerAppearance.localPlayer.pathX[0] + var6, PlayerAppearance.localPlayer.pathY[0] + var9, var8 == 1); // L: 7306
var4.method2106(PlayerComposition.localPlayer.pathX[0] + var6, PlayerComposition.localPlayer.pathY[0] + var9, var8 == 1); // L: 7306
continue; // L: 7307
}
}

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

@@ -288,7 +288,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
break;
}
} catch (Exception var12) { // L: 154
PlayerAppearance.RunException_sendStackTrace((String)null, var12); // L: 155
PlayerComposition.RunException_sendStackTrace((String)null, var12); // L: 155
}
} // L: 157

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

@@ -30,7 +30,7 @@ public final class Player extends Actor {
descriptor = "Lhh;"
)
@Export("appearance")
PlayerAppearance appearance;
PlayerComposition appearance;
@ObfuscatedName("x")
@ObfuscatedGetter(
intValue = -1265111393
@@ -278,7 +278,7 @@ public final class Player extends Actor {
this.username = new Username(var1.readStringCp1252NullTerminated(), GrandExchangeOfferUnitPriceComparator.loginType); // L: 99
this.clearIsFriend(); // L: 100
this.clearIsInClanChat(); // L: 101
if (this == PlayerAppearance.localPlayer) { // L: 102
if (this == PlayerComposition.localPlayer) { // L: 102
RunException.localPlayerName = this.username.getName();
}
@@ -290,7 +290,7 @@ public final class Player extends Actor {
}
if (this.appearance == null) { // L: 107
this.appearance = new PlayerAppearance();
this.appearance = new PlayerComposition();
}
this.appearance.update(var4, var9, var2 == 1, var3); // L: 108

3
runescape-client/src/main/java/PlayerAppearance.java → runescape-client/src/main/java/PlayerComposition.java
View File

@@ -12,7 +12,8 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("hh")
@Implements("PlayerAppearance")
public class PlayerAppearance {
public class PlayerComposition
{
@ObfuscatedName("n")
public static short[] field2551;
@ObfuscatedName("l")

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

@@ -207,7 +207,7 @@ public class Players {
Client.meslayerContinueWidget = null; // L: 2736
Client.menuOptionsCount = 0; // L: 2738
Client.isMenuOpen = false; // L: 2739
Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2741
Client.playerComposition.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2741
for (var0 = 0; var0 < 8; ++var0) { // L: 2742
Client.playerMenuActions[var0] = null; // L: 2743

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

@@ -381,7 +381,7 @@ public class Scene {
)
@Export("newGroundItemPile")
public void newGroundItemPile(int var1, int var2, int var3, int var4, Renderable var5, long var6, Renderable var8, Renderable var9) {
TileItemPile var10 = new TileItemPile(); // L: 202
ItemLayer var10 = new ItemLayer(); // L: 202
var10.first = var5; // L: 203
var10.x = var2 * 128 + 64; // L: 204
var10.y = var3 * 128 + 64; // L: 205
@@ -408,7 +408,7 @@ public class Scene {
this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); // L: 222
}
this.tiles[var1][var2][var3].tileItemPile = var10; // L: 223
this.tiles[var1][var2][var3].itemLayer = var10; // L: 223
} // L: 224
@ObfuscatedName("l")
@@ -713,7 +713,7 @@ public class Scene {
public void removeGroundItemPile(int var1, int var2, int var3) {
Tile var4 = this.tiles[var1][var2][var3]; // L: 407
if (var4 != null) {
var4.tileItemPile = null; // L: 409
var4.itemLayer = null; // L: 409
}
} // L: 408 410
@@ -1467,7 +1467,7 @@ public class Scene {
var22.renderable.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var22.x - Scene_cameraX, var22.tileHeight - Scene_cameraY, var22.y - Scene_cameraZ, var22.tag);
}
TileItemPile var23 = var3.tileItemPile; // L: 994
ItemLayer var23 = var3.itemLayer; // L: 994
if (var23 != null && var23.height == 0) { // L: 995
if (var23.second != null) { // L: 996
var23.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
@@ -1685,7 +1685,7 @@ public class Scene {
var3.drawSecondary = false; // L: 1130
--tileUpdateCount; // L: 1131
TileItemPile var32 = var3.tileItemPile; // L: 1132
ItemLayer var32 = var3.itemLayer; // L: 1132
if (var32 != null && var32.height != 0) { // L: 1133
if (var32.second != null) { // L: 1134
var32.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag);

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

@@ -50,7 +50,7 @@ public class ScriptFrame {
var4 = CollisionMap.getWidget(Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]); // L: 778
var3 = false; // L: 779
} else {
var4 = var2 ? PlayerAppearance.field2561 : VarcInt.field3264; // L: 781
var4 = var2 ? PlayerComposition.field2561 : VarcInt.field3264; // L: 781
}
int var11;

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

@@ -115,7 +115,7 @@ public class SecureRandomFuture {
var6 = -var4.targetIndex - 1; // L: 4326
Player var36;
if (var6 == Client.localPlayerIndex) { // L: 4327
var36 = PlayerAppearance.localPlayer;
var36 = PlayerComposition.localPlayer;
} else {
var36 = Client.players[var6]; // L: 4328
}
@@ -196,8 +196,8 @@ public class SecureRandomFuture {
class69.cameraZ = var8 - var14; // L: 4377
Skeleton.cameraPitch = var28; // L: 4378
AbstractArchive.cameraYaw = var5; // L: 4379
if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (oculusOrbFocalPointX >> 7 != PlayerAppearance.localPlayer.x >> 7 || Decimator.oculusOrbFocalPointY >> 7 != PlayerAppearance.localPlayer.y >> 7)) { // L: 4380 4381
var15 = PlayerAppearance.localPlayer.plane; // L: 4382
if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (oculusOrbFocalPointX >> 7 != PlayerComposition.localPlayer.x >> 7 || Decimator.oculusOrbFocalPointY >> 7 != PlayerComposition.localPlayer.y >> 7)) { // L: 4380 4381
var15 = PlayerComposition.localPlayer.plane; // L: 4382
var16 = (oculusOrbFocalPointX >> 7) + NetFileRequest.baseX; // L: 4383
var17 = (Decimator.oculusOrbFocalPointY >> 7) + class41.baseY; // L: 4384
PacketBufferNode var18 = ItemContainer.getPacketBufferNode(ClientPacket.field2269, Client.packetWriter.isaacCipher); // L: 4387
@@ -220,8 +220,8 @@ public class SecureRandomFuture {
var7 = oculusOrbFocalPointX >> 7; // L: 4411
var8 = Decimator.oculusOrbFocalPointY >> 7; // L: 4412
} else {
var7 = PlayerAppearance.localPlayer.x >> 7; // L: 4415
var8 = PlayerAppearance.localPlayer.y >> 7; // L: 4416
var7 = PlayerComposition.localPlayer.x >> 7; // L: 4415
var8 = PlayerComposition.localPlayer.y >> 7; // L: 4416
}
var9 = Player.cameraX >> 7; // L: 4418
@@ -313,8 +313,8 @@ public class SecureRandomFuture {
}
}
if (PlayerAppearance.localPlayer.x >= 0 && PlayerAppearance.localPlayer.y >= 0 && PlayerAppearance.localPlayer.x < 13312 && PlayerAppearance.localPlayer.y < 13312) { // L: 4468
if ((Tiles.Tiles_renderFlags[GameObject.Client_plane][PlayerAppearance.localPlayer.x >> 7][PlayerAppearance.localPlayer.y >> 7] & 4) != 0) { // L: 4472
if (PlayerComposition.localPlayer.x >= 0 && PlayerComposition.localPlayer.y >= 0 && PlayerComposition.localPlayer.x < 13312 && PlayerComposition.localPlayer.y < 13312) { // L: 4468
if ((Tiles.Tiles_renderFlags[GameObject.Client_plane][PlayerComposition.localPlayer.x >> 7][PlayerComposition.localPlayer.y >> 7] & 4) != 0) { // L: 4472
var6 = GameObject.Client_plane;
}
@@ -409,7 +409,7 @@ public class SecureRandomFuture {
continue;
}
if (var32 == PlayerAppearance.localPlayer) { // L: 4537
if (var32 == PlayerComposition.localPlayer) { // L: 4537
var15 = var30; // L: 4538
continue; // L: 4539
}
@@ -421,7 +421,7 @@ public class SecureRandomFuture {
}
if (Client.renderSelf && var15 != -1) { // L: 4545
AbstractWorldMapIcon.drawActor2d(PlayerAppearance.localPlayer, var15, var0, var1, var2, var3); // L: 4546
AbstractWorldMapIcon.drawActor2d(PlayerComposition.localPlayer, var15, var0, var1, var2, var3); // L: 4546
}
if (var34) { // L: 4548

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

@@ -30,7 +30,7 @@ public class SoundSystem implements Runnable {
}
}
} catch (Exception var4) { // L: 17
PlayerAppearance.RunException_sendStackTrace((String)null, var4); // L: 18
PlayerComposition.RunException_sendStackTrace((String)null, var4); // L: 18
}
} // L: 20

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

@@ -65,8 +65,8 @@ public final class Tile extends Node {
@ObfuscatedSignature(
descriptor = "Ldz;"
)
@Export("tileItemPile")
TileItemPile tileItemPile;
@Export("itemLayer")
ItemLayer itemLayer;
@ObfuscatedName("u")
@ObfuscatedGetter(
intValue = 418075799

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

@@ -180,7 +180,7 @@ public final class TileItem extends Renderable
int var8;
if (var0.combatLevel != 0) { // L: 8725
var7 = var0.combatLevel; // L: 8728
var8 = PlayerAppearance.localPlayer.combatLevel; // L: 8729
var8 = PlayerComposition.localPlayer.combatLevel; // L: 8729
int var9 = var8 - var7; // L: 8731
String var6;
if (var9 < -9) { // L: 8732
@@ -253,7 +253,7 @@ public final class TileItem extends Renderable
if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) { // L: 8801
short var12 = 0; // L: 8802
if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { // L: 8803
if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var0.combatLevel > PlayerAppearance.localPlayer.combatLevel) { // L: 8804
if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var0.combatLevel > PlayerComposition.localPlayer.combatLevel) { // L: 8804
var12 = 2000; // L: 8805
}

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

@@ -123,7 +123,7 @@ public class UrlRequester implements Runnable {
}
} catch (Exception var17) {
PlayerAppearance.RunException_sendStackTrace((String)null, var17);
PlayerComposition.RunException_sendStackTrace((String)null, var17);
}
}

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

@@ -112,7 +112,7 @@ public class UserComparator4 implements Comparator {
var9 = var1.method5572(); // L: 6657
if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 6658
var10 = var7 + 1; // L: 6659
if (PlayerAppearance.localPlayer.pathX[0] >= var4 - var10 && PlayerAppearance.localPlayer.pathX[0] <= var10 + var4 && PlayerAppearance.localPlayer.pathY[0] >= var5 - var10 && PlayerAppearance.localPlayer.pathY[0] <= var5 + var10 && Timer.clientPreferences.areaSoundEffectsVolume != 0 && var8 > 0 && Client.soundEffectCount < 50) { // L: 6660 6661
if (PlayerComposition.localPlayer.pathX[0] >= var4 - var10 && PlayerComposition.localPlayer.pathX[0] <= var10 + var4 && PlayerComposition.localPlayer.pathY[0] >= var5 - var10 && PlayerComposition.localPlayer.pathY[0] <= var5 + var10 && Timer.clientPreferences.areaSoundEffectsVolume != 0 && var8 > 0 && Client.soundEffectCount < 50) { // L: 6660 6661
Client.soundEffectIds[Client.soundEffectCount] = var2; // L: 6662
Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8; // L: 6663
Client.queuedSoundEffectDelays[Client.soundEffectCount] = var9; // L: 6664
@@ -324,7 +324,7 @@ public class UserComparator4 implements Comparator {
byte var16 = var1.readByte(); // L: 6850
Player var17;
if (var13 == Client.localPlayerIndex) { // L: 6852
var17 = PlayerAppearance.localPlayer;
var17 = PlayerComposition.localPlayer;
} else {
var17 = Client.players[var13]; // L: 6853
}

8
runescape-client/src/main/java/UserComparator5.java
View File

@@ -171,8 +171,8 @@ public class UserComparator5 extends AbstractUserComparator {
int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 3795
int var9 = var4 * var8 + var7 * var5 >> 11; // L: 3796
int var10 = var8 * var5 - var7 * var4 >> 11; // L: 3797
int var11 = var9 + PlayerAppearance.localPlayer.x >> 7; // L: 3798
int var12 = PlayerAppearance.localPlayer.y - var10 >> 7; // L: 3799
int var11 = var9 + PlayerComposition.localPlayer.x >> 7; // L: 3798
int var12 = PlayerComposition.localPlayer.y - var10 >> 7; // L: 3799
PacketBufferNode var13 = ItemContainer.getPacketBufferNode(ClientPacket.field2272, Client.packetWriter.isaacCipher); // L: 3801
var13.packetBuffer.writeByte(18); // L: 3802
var13.packetBuffer.method5739(var11 + NetFileRequest.baseX); // L: 3803
@@ -185,8 +185,8 @@ public class UserComparator5 extends AbstractUserComparator {
var13.packetBuffer.writeByte(0); // L: 3810
var13.packetBuffer.writeByte(0); // L: 3811
var13.packetBuffer.writeByte(89); // L: 3812
var13.packetBuffer.writeShort(PlayerAppearance.localPlayer.x); // L: 3813
var13.packetBuffer.writeShort(PlayerAppearance.localPlayer.y); // L: 3814
var13.packetBuffer.writeShort(PlayerComposition.localPlayer.x); // L: 3813
var13.packetBuffer.writeShort(PlayerComposition.localPlayer.y); // L: 3814
var13.packetBuffer.writeByte(63); // L: 3815
Client.packetWriter.addNode(var13); // L: 3816
Client.destinationX = var11; // L: 3817

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

@@ -64,7 +64,7 @@ public class UserComparator9 extends AbstractUserComparator {
var0 -= 1000; // L: 735
var3 = CollisionMap.getWidget(Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]); // L: 736
} else {
var3 = var2 ? PlayerAppearance.field2561 : VarcInt.field3264; // L: 738
var3 = var2 ? PlayerComposition.field2561 : VarcInt.field3264; // L: 738
}
CollisionMap.invalidateWidget(var3); // L: 739
@@ -75,7 +75,7 @@ public class UserComparator9 extends AbstractUserComparator {
return 1; // L: 763
} else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 765
var3.modelType = 3; // L: 766
var3.modelId = PlayerAppearance.localPlayer.appearance.getChatHeadId(); // L: 767
var3.modelId = PlayerComposition.localPlayer.appearance.getChatHeadId(); // L: 767
return 1; // L: 768
} else {
return 2; // L: 770

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

@@ -23,7 +23,7 @@ public class Username implements Comparable {
)
public Username(String var1, LoginType var2) {
this.name = var1; // L: 11
this.cleanName = VarbitDefinition.method4525(var1, var2); // L: 12
this.cleanName = VarbitComposition.method4525(var1, var2); // L: 12
} // L: 13
@ObfuscatedName("h")

4
runescape-client/src/main/java/VarbitDefinition.java → runescape-client/src/main/java/VarbitComposition.java
View File

@@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("iv")
@Implements("VarbitDefinition")
public class VarbitDefinition extends DualNode {
@Implements("VarbitComposition")
public class VarbitComposition extends DualNode {
@ObfuscatedName("h")
@ObfuscatedSignature(
descriptor = "Lib;"

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

@@ -1363,7 +1363,7 @@ public class Widget extends Node {
garbageValue = "-2117213889"
)
@Export("getModel")
public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerAppearance var4) {
public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerComposition var4) {
field2603 = false; // L: 578
int var5;
int var6;

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

@@ -109,7 +109,7 @@ public class WorldMapCacheName {
static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) {
ArchiveDisk var4 = null; // L: 2195
if (JagexCache.JagexCache_dat2File != null) { // L: 2196
var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, PlayerAppearance.JagexCache_idxFiles[var0], 1000000);
var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, PlayerComposition.JagexCache_idxFiles[var0], 1000000);
}
return new Archive(var4, class7.masterDisk, var0, var1, var2, var3); // L: 2197

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

@@ -232,7 +232,7 @@ public class WorldMapData_0 extends AbstractWorldMapData {
)
public static void method237() {
try {
File var0 = new File(TileItemPile.userHomeDirectory, "random.dat"); // L: 212
File var0 = new File(ItemLayer.userHomeDirectory, "random.dat"); // L: 212
int var2;
if (var0.exists()) { // L: 213
JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 214

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

@@ -188,7 +188,7 @@ public class WorldMapData_1 extends AbstractWorldMapData {
var4 = Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]; // L: 553
var3 = CollisionMap.getWidget(var4); // L: 554
} else {
var3 = var2 ? PlayerAppearance.field2561 : VarcInt.field3264; // L: 556
var3 = var2 ? PlayerComposition.field2561 : VarcInt.field3264; // L: 556
}
if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 557

8
runescape-client/src/main/java/WorldMapID.java
View File

@@ -62,7 +62,7 @@ public class WorldMapID {
return 1; // L: 1330
} else if (var0 == ScriptOpcodes.ANIM) {
VarcInt.Interpreter_intStackSize -= 2; // L: 1333
Tiles.performPlayerAnimation(PlayerAppearance.localPlayer, Interpreter.Interpreter_intStack[VarcInt.Interpreter_intStackSize], Interpreter.Interpreter_intStack[VarcInt.Interpreter_intStackSize + 1]); // L: 1334
Tiles.performPlayerAnimation(PlayerComposition.localPlayer, Interpreter.Interpreter_intStack[VarcInt.Interpreter_intStackSize], Interpreter.Interpreter_intStack[VarcInt.Interpreter_intStackSize + 1]); // L: 1334
return 1; // L: 1335
} else if (var0 == ScriptOpcodes.IF_CLOSE) {
if (!Interpreter.field1103) { // L: 1338
@@ -119,7 +119,7 @@ public class WorldMapID {
VarcInt.Interpreter_intStackSize -= 2; // L: 1387
var10 = Interpreter.Interpreter_intStack[VarcInt.Interpreter_intStackSize]; // L: 1388
var16 = Interpreter.Interpreter_intStack[VarcInt.Interpreter_intStackSize + 1]; // L: 1389
Widget var13 = var2 ? PlayerAppearance.field2561 : VarcInt.field3264; // L: 1390
Widget var13 = var2 ? PlayerComposition.field2561 : VarcInt.field3264; // L: 1390
class13.clickWidget(var13, var10, var16); // L: 1391
return 1; // L: 1392
} else if (var0 == ScriptOpcodes.MOUSECAM) {
@@ -256,7 +256,7 @@ public class WorldMapID {
return 1; // L: 1534
} else if (var0 == 3140) {
Client.field810 = 3; // L: 1537
Client.field811 = var2 ? PlayerAppearance.field2561.id * -437932207 * 653064625 : VarcInt.field3264.id * -437932207 * 653064625; // L: 1538
Client.field811 = var2 ? PlayerComposition.field2561.id * -437932207 * 653064625 : VarcInt.field3264.id * -437932207 * 653064625; // L: 1538
return 1; // L: 1539
} else {
boolean var11;
@@ -556,7 +556,7 @@ public class WorldMapID {
var0.method1803(); // L: 3902
}
if (PlayerAppearance.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 3904 3905
if (PlayerComposition.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 3904 3905
var0.sequence = -1; // L: 3906
var0.spotAnimation = -1; // L: 3907
var0.field984 = 0; // L: 3908

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

@@ -591,7 +591,7 @@ public final class WorldMapManager {
if (var2.overheadText.charAt(0) == '~') { // L: 480
var2.overheadText = var2.overheadText.substring(1); // L: 481
class234.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 482
} else if (var2 == PlayerAppearance.localPlayer) { // L: 484
} else if (var2 == PlayerComposition.localPlayer) { // L: 484
class234.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 485
}
@@ -627,7 +627,7 @@ public final class WorldMapManager {
var2.overheadTextEffect = var5 & 255; // L: 510
var2.overheadTextCyclesRemaining = 150; // L: 511
var2.isAutoChatting = var7; // L: 512
var2.field953 = var2 != PlayerAppearance.localPlayer && var6.isUser && "" != Client.field871 && var11.toLowerCase().indexOf(Client.field871) == -1; // L: 513
var2.field953 = var2 != PlayerComposition.localPlayer && var6.isUser && "" != Client.field871 && var11.toLowerCase().indexOf(Client.field871) == -1; // L: 513
if (var6.isPrivileged) { // L: 515
var12 = var7 ? 91 : 1;
} else {
@@ -929,13 +929,13 @@ public final class WorldMapManager {
if (Client.soundLocations[var0] != 0) { // L: 3646
int var3 = (Client.soundLocations[var0] & 255) * 128; // L: 3647
int var4 = Client.soundLocations[var0] >> 16 & 255; // L: 3648
int var5 = var4 * 128 + 64 - PlayerAppearance.localPlayer.x; // L: 3649
int var5 = var4 * 128 + 64 - PlayerComposition.localPlayer.x; // L: 3649
if (var5 < 0) { // L: 3650
var5 = -var5;
}
int var6 = Client.soundLocations[var0] >> 8 & 255; // L: 3651
int var7 = var6 * 128 + 64 - PlayerAppearance.localPlayer.y; // L: 3652
int var7 = var6 * 128 + 64 - PlayerComposition.localPlayer.y; // L: 3652
if (var7 < 0) { // L: 3653
var7 = -var7;
}
@@ -956,7 +956,7 @@ public final class WorldMapManager {
}
if (var2 > 0) { // L: 3663
RawSound var9 = var1.toRawSound().resample(TileItemPile.decimator); // L: 3664
RawSound var9 = var1.toRawSound().resample(ItemLayer.decimator); // L: 3664
RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var2); // L: 3665
var10.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); // L: 3666
pcmStreamMixer.addSubStream(var10); // L: 3667

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

@@ -57,7 +57,7 @@ public final class WorldMapRectangle {
garbageValue = "470419605"
)
static int method331(int var0, Script var1, boolean var2) {
Widget var3 = var2 ? PlayerAppearance.field2561 : VarcInt.field3264; // L: 1124
Widget var3 = var2 ? PlayerComposition.field2561 : VarcInt.field3264; // L: 1124
if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1125
Interpreter.Interpreter_intStack[++VarcInt.Interpreter_intStackSize - 1] = ServerPacket.Widget_unpackTargetMask(FaceNormal.getWidgetFlags(var3)); // L: 1126
return 1; // L: 1127
@@ -122,14 +122,14 @@ public final class WorldMapRectangle {
SequenceDefinition.SequenceDefinition_cached.clear(); // L: 2876
SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 2877
WallDecoration.method3379(); // L: 2879
VarbitDefinition.VarbitDefinition_cached.clear(); // L: 2881
VarbitComposition.VarbitDefinition_cached.clear(); // L: 2881
WorldMapID.method601(); // L: 2883
HealthBarDefinition.method4509(); // L: 2884
VarcInt.method4426(); // L: 2885
StructDefinition.StructDefinition_cached.clear(); // L: 2887
StudioGame.method4185(); // L: 2889
WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 2891
PlayerAppearance.PlayerAppearance_cachedModels.clear(); // L: 2894
PlayerComposition.PlayerAppearance_cachedModels.clear(); // L: 2894
Widget.Widget_cachedSprites.clear(); // L: 2897
Widget.Widget_cachedModels.clear(); // L: 2898
Widget.Widget_cachedFonts.clear(); // L: 2899

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

@@ -951,7 +951,7 @@ public class WorldMapRegion {
var4 = "_wip";
}
File var5 = new File(TileItemPile.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 194
File var5 = new File(ItemLayer.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 194
AccessFile var6;
if (!var2 && var5.exists()) { // L: 195
try {

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

@@ -40,7 +40,7 @@ public class class200 {
garbageValue = "101"
)
public static void method3712(AbstractArchive var0) {
VarbitDefinition.VarbitDefinition_archive = var0; // L: 17
VarbitComposition.VarbitDefinition_archive = var0; // L: 17
} // L: 18
@ObfuscatedName("t")
@@ -56,7 +56,7 @@ public class class200 {
var3 = Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]; // L: 503
var4 = CollisionMap.getWidget(var3); // L: 504
} else {
var4 = var2 ? PlayerAppearance.field2561 : VarcInt.field3264; // L: 506
var4 = var2 ? PlayerComposition.field2561 : VarcInt.field3264; // L: 506
}
if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 507

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

@@ -21,9 +21,9 @@ public class class204 {
)
static void method3721(int var0, Coord var1, boolean var2) {
WorldMapArea var3 = Actor.getWorldMap().getMapArea(var0); // L: 3917
int var4 = PlayerAppearance.localPlayer.plane; // L: 3918
int var5 = (PlayerAppearance.localPlayer.x >> 7) + NetFileRequest.baseX; // L: 3919
int var6 = (PlayerAppearance.localPlayer.y >> 7) + class41.baseY; // L: 3920
int var4 = PlayerComposition.localPlayer.plane; // L: 3918
int var5 = (PlayerComposition.localPlayer.x >> 7) + NetFileRequest.baseX; // L: 3919
int var6 = (PlayerComposition.localPlayer.y >> 7) + class41.baseY; // L: 3920
Coord var7 = new Coord(var4, var5, var6); // L: 3921
Actor.getWorldMap().method6485(var3, var7, var1, var2); // L: 3922
} // L: 3923

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

@@ -157,7 +157,7 @@ public class class231 {
var12.isIf3 = true; // L: 452
var6.children[var11] = var12; // L: 453
if (var2) { // L: 454
PlayerAppearance.field2561 = var12;
PlayerComposition.field2561 = var12;
} else {
VarcInt.field3264 = var12; // L: 455
}
@@ -169,7 +169,7 @@ public class class231 {
} else {
Widget var3;
if (var0 == ScriptOpcodes.CC_DELETE) { // L: 459
var3 = var2 ? PlayerAppearance.field2561 : VarcInt.field3264; // L: 460
var3 = var2 ? PlayerComposition.field2561 : VarcInt.field3264; // L: 460
Widget var10 = CollisionMap.getWidget(var3.id); // L: 461
var10.children[var3.childIndex] = null; // L: 462
CollisionMap.invalidateWidget(var10); // L: 463
@@ -185,7 +185,7 @@ public class class231 {
if (var3 != null) { // L: 487
Interpreter.Interpreter_intStack[++VarcInt.Interpreter_intStackSize - 1] = 1; // L: 488
if (var2) { // L: 489
PlayerAppearance.field2561 = var3;
PlayerComposition.field2561 = var3;
} else {
VarcInt.field3264 = var3; // L: 490
}
@@ -205,7 +205,7 @@ public class class231 {
if (var5 != null && var4 != -1) { // L: 477
Interpreter.Interpreter_intStack[++VarcInt.Interpreter_intStackSize - 1] = 1; // L: 478
if (var2) { // L: 479
PlayerAppearance.field2561 = var5;
PlayerComposition.field2561 = var5;
} else {
VarcInt.field3264 = var5; // L: 480
}
@@ -225,8 +225,8 @@ public class class231 {
)
static final void method4153() {
Client.field762 = 0; // L: 5231
int var0 = (PlayerAppearance.localPlayer.x >> 7) + NetFileRequest.baseX; // L: 5232
int var1 = (PlayerAppearance.localPlayer.y >> 7) + class41.baseY; // L: 5233
int var0 = (PlayerComposition.localPlayer.x >> 7) + NetFileRequest.baseX; // L: 5232
int var1 = (PlayerComposition.localPlayer.y >> 7) + class41.baseY; // L: 5233
if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { // L: 5234
Client.field762 = 1;
}

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

@@ -268,8 +268,8 @@ public class class258 {
return 2; // L: 3178
}
} else {
if (PlayerAppearance.localPlayer != null && PlayerAppearance.localPlayer.username != null) { // L: 3136
var3 = PlayerAppearance.localPlayer.username.getName();
if (PlayerComposition.localPlayer != null && PlayerComposition.localPlayer.username != null) { // L: 3136
var3 = PlayerComposition.localPlayer.username.getName();
} else {
var3 = ""; // L: 3137
}

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

@@ -10,7 +10,7 @@ public class class277 {
garbageValue = "-1829984749"
)
static int method5005(int var0, Script var1, boolean var2) {
Widget var3 = var2 ? PlayerAppearance.field2561 : VarcInt.field3264; // L: 1106
Widget var3 = var2 ? PlayerComposition.field2561 : VarcInt.field3264; // L: 1106
if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1107
Interpreter.Interpreter_intStack[++VarcInt.Interpreter_intStackSize - 1] = var3.itemId; // L: 1108
return 1; // L: 1109

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

@@ -27,7 +27,7 @@ public class class279 {
Client.field911 = var0.spriteId; // L: 10753
}
if (Client.playerAppearance.isFemale) { // L: 10755
if (Client.playerComposition.isFemale) { // L: 10755
var0.spriteId2 = Client.field813;
} else {
var0.spriteId2 = Client.field911; // L: 10756
@@ -39,7 +39,7 @@ public class class279 {
Client.field911 = var0.spriteId; // L: 10762
}
if (Client.playerAppearance.isFemale) { // L: 10764
if (Client.playerComposition.isFemale) { // L: 10764
var0.spriteId2 = Client.field911;
} else {
var0.spriteId2 = Client.field813; // L: 10765

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

@@ -165,7 +165,7 @@ public class class3 implements Enumerated {
static boolean method42(Player var0) {
if (Client.drawPlayerNames == 0) { // L: 4799
return false;
} else if (PlayerAppearance.localPlayer != var0) { // L: 4800
} else if (PlayerComposition.localPlayer != var0) { // L: 4800
boolean var1 = (Client.drawPlayerNames & 4) != 0; // L: 4803
boolean var2 = var1; // L: 4805
if (!var1) { // L: 4806

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

@@ -31,7 +31,7 @@ public final class class307 {
static final void updatePlayer(PacketBuffer var0) {
var0.importIndex(); // L: 37
int var1 = Client.localPlayerIndex; // L: 38
Player var2 = PlayerAppearance.localPlayer = Client.players[var1] = new Player(); // L: 39
Player var2 = PlayerComposition.localPlayer = Client.players[var1] = new Player(); // L: 39
var2.index = var1; // L: 40
int var3 = var0.readBits(30); // L: 41
byte var4 = (byte)(var3 >> 28); // L: 42

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

@@ -370,7 +370,7 @@ public class class51 implements WorldMapSection {
)
static void method832() {
if (Client.renderSelf) { // L: 4708
ClientPreferences.addPlayerToScene(PlayerAppearance.localPlayer, false); // L: 4709
ClientPreferences.addPlayerToScene(PlayerComposition.localPlayer, false); // L: 4709
}
} // L: 4711

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

@@ -41,8 +41,8 @@ public final class class52 {
int var3;
if (var0 == 6600) { // L: 3536
var3 = GameObject.Client_plane; // L: 3537
int var15 = (PlayerAppearance.localPlayer.x >> 7) + NetFileRequest.baseX; // L: 3538
int var8 = (PlayerAppearance.localPlayer.y >> 7) + class41.baseY; // L: 3539
int var15 = (PlayerComposition.localPlayer.x >> 7) + NetFileRequest.baseX; // L: 3538
int var8 = (PlayerComposition.localPlayer.y >> 7) + class41.baseY; // L: 3539
Actor.getWorldMap().method6370(var3, var15, var8, true); // L: 3540
return 1; // L: 3541
} else {

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

@@ -39,7 +39,7 @@ public class class58 {
)
public static File method917(String var0, String var1, int var2) {
String var3 = var2 == 0 ? "" : "" + var2; // L: 40
JagexCache.JagexCache_locationFile = new File(TileItemPile.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); // L: 41
JagexCache.JagexCache_locationFile = new File(ItemLayer.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); // L: 41
String var4 = null; // L: 42
String var5 = null; // L: 43
boolean var6 = false; // L: 44
@@ -149,7 +149,7 @@ public class class58 {
}
if (var4 == null) { // L: 133
var4 = TileItemPile.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; // L: 134
var4 = ItemLayer.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; // L: 134
var6 = true; // L: 135
}