From 5d506e9bdad7ec90298c363d594e92f68ee9b426 Mon Sep 17 00:00:00 2001 From: Lucas Date: Sat, 6 Jul 2019 14:26:03 +0200 Subject: [PATCH] More rs-client refactoring --- .../src/main/java/AbstractIndexCache.java | 8 +- runescape-client/src/main/java/Actor.java | 2 +- .../src/main/java/AudioFilter.java | 12 +- runescape-client/src/main/java/Buffer.java | 11 +- runescape-client/src/main/java/Canvas.java | 24 ++-- runescape-client/src/main/java/ClanChat.java | 4 +- runescape-client/src/main/java/Client.java | 117 +++++++++--------- .../src/main/java/ClientParameter.java | 4 +- .../main/java/DevicePcmPlayerProvider.java | 14 +-- .../src/main/java/DynamicObject.java | 10 +- .../src/main/java/EnumDefinition.java | 4 +- runescape-client/src/main/java/FontName.java | 2 +- .../src/main/java/FriendsList.java | 2 +- runescape-client/src/main/java/GameShell.java | 12 +- .../src/main/java/GrandExchangeEvent.java | 4 +- .../src/main/java/GrandExchangeEvents.java | 4 +- .../src/main/java/GrandExchangeOffer.java | 2 +- .../src/main/java/HealthBarDefinition.java | 6 +- .../src/main/java/HitSplatDefinition.java | 12 +- .../src/main/java/Instrument.java | 4 +- .../src/main/java/InvDefinition.java | 2 +- .../src/main/java/ItemDefinition.java | 64 +++++----- .../src/main/java/KitDefinition.java | 51 ++++---- .../src/main/java/MenuAction.java | 4 +- .../src/main/java/MidiFileReader.java | 4 +- runescape-client/src/main/java/ModelData.java | 50 ++++---- .../src/main/java/MusicTrack.java | 2 +- .../src/main/java/NPCDefinition.java | 46 +++---- .../src/main/java/ObjectDefinition.java | 40 +++--- runescape-client/src/main/java/Occluder.java | 14 +-- .../java/{class68.java => PendingSpawn.java} | 34 +++-- runescape-client/src/main/java/Player.java | 18 +-- .../src/main/java/PlayerAppearance.java | 10 +- .../src/main/java/ScriptEvent.java | 8 +- .../src/main/java/SecureRandomCallable.java | 4 +- .../src/main/java/SequenceDefinition.java | 18 +-- .../src/main/java/SoundEffect.java | 4 +- .../src/main/java/SoundEnvelope.java | 4 +- .../main/java/SpotAnimationDefinition.java | 18 +-- runescape-client/src/main/java/Texture.java | 4 +- .../src/main/java/VarbitDefinition.java | 2 +- runescape-client/src/main/java/Varcs.java | 12 +- .../src/main/java/VarpDefinition.java | 2 +- runescape-client/src/main/java/Widget.java | 74 +++++------ .../src/main/java/WorldComparator.java | 4 +- .../src/main/java/WorldMapAreaData.java | 8 +- .../{class25.java => WorldMapDecoration.java} | 22 ++-- ...ss231.java => WorldMapDecorationType.java} | 13 +- .../src/main/java/WorldMapElement.java | 2 +- .../src/main/java/WorldMapIcon1.java | 2 +- .../src/main/java/WorldMapRegion.java | 54 ++++---- .../src/main/java/WorldMapSection0.java | 8 +- .../src/main/java/WorldMapSection1.java | 12 +- .../src/main/java/WorldMapSection2.java | 8 +- .../src/main/java/WorldMapSection3.java | 16 +-- runescape-client/src/main/java/class1.java | 8 +- runescape-client/src/main/java/class13.java | 20 +-- runescape-client/src/main/java/class15.java | 10 +- runescape-client/src/main/java/class16.java | 8 +- runescape-client/src/main/java/class171.java | 8 +- runescape-client/src/main/java/class21.java | 12 +- runescape-client/src/main/java/class238.java | 4 +- runescape-client/src/main/java/class258.java | 26 ++-- runescape-client/src/main/java/class39.java | 10 +- runescape-client/src/main/java/class40.java | 4 +- runescape-client/src/main/java/class50.java | 6 +- 66 files changed, 519 insertions(+), 493 deletions(-) rename runescape-client/src/main/java/{class68.java => PendingSpawn.java} (88%) rename runescape-client/src/main/java/{class25.java => WorldMapDecoration.java} (84%) rename runescape-client/src/main/java/{class231.java => WorldMapDecorationType.java} (93%) diff --git a/runescape-client/src/main/java/AbstractIndexCache.java b/runescape-client/src/main/java/AbstractIndexCache.java index c6c7ff1a91..8ba4da29ff 100644 --- a/runescape-client/src/main/java/AbstractIndexCache.java +++ b/runescape-client/src/main/java/AbstractIndexCache.java @@ -121,7 +121,7 @@ public abstract class AbstractIndexCache { if (var3 >= 7) { this.archiveCount = var2.method50(); } else { - this.archiveCount = var2.method43(); + this.archiveCount = var2.readUnsignedShort(); } int var5 = 0; @@ -137,7 +137,7 @@ public abstract class AbstractIndexCache { } } else { for (var7 = 0; var7 < this.archiveCount; ++var7) { - this.archiveIds[var7] = var5 += var2.method43(); + this.archiveIds[var7] = var5 += var2.readUnsignedShort(); if (this.archiveIds[var7] > var6) { var6 = this.archiveIds[var7]; } @@ -169,7 +169,7 @@ public abstract class AbstractIndexCache { } for (var7 = 0; var7 < this.archiveCount; ++var7) { - this.recordCounts[this.archiveIds[var7]] = var2.method43(); + this.recordCounts[this.archiveIds[var7]] = var2.readUnsignedShort(); } int var8; @@ -203,7 +203,7 @@ public abstract class AbstractIndexCache { this.recordIds[var8] = new int[var9]; for (var11 = 0; var11 < var9; ++var11) { - var12 = this.recordIds[var8][var11] = var5 += var2.method43(); + var12 = this.recordIds[var8][var11] = var5 += var2.readUnsignedShort(); if (var12 > var10) { var10 = var12; } diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index 1f1be493c2..8c6154c075 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -919,7 +919,7 @@ public abstract class Actor extends Entity { var13 = class204.getWidgetChild(var1, var0); if (var13 != null) { Player.method1281(); - class25.method350(var1, var0, class211.method4107(class1.getWidgetClickMask(var13)), var13.itemId); + WorldMapDecoration.method350(var1, var0, class211.method4107(class1.getWidgetClickMask(var13)), var13.itemId); Client.isItemSelected = 0; Client.selectedSpellActionName = class198.method3745(var13); if (Client.selectedSpellActionName == null) { diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index 660e6931f5..a1a4b514f1 100644 --- a/runescape-client/src/main/java/AudioFilter.java +++ b/runescape-client/src/main/java/AudioFilter.java @@ -104,24 +104,24 @@ public class AudioFilter { this.field36[0] = var3 >> 4; this.field36[1] = var3 & 15; if (var3 != 0) { - this.field39[0] = var1.method43(); - this.field39[1] = var1.method43(); + this.field39[0] = var1.readUnsignedShort(); + this.field39[1] = var1.readUnsignedShort(); int var4 = var1.readUnsignedByte(); int var5; int var6; for (var5 = 0; var5 < 2; ++var5) { for (var6 = 0; var6 < this.field36[var5]; ++var6) { - this.field37[var5][0][var6] = var1.method43(); - this.field38[var5][0][var6] = var1.method43(); + this.field37[var5][0][var6] = var1.readUnsignedShort(); + this.field38[var5][0][var6] = var1.readUnsignedShort(); } } for (var5 = 0; var5 < 2; ++var5) { for (var6 = 0; var6 < this.field36[var5]; ++var6) { if ((var4 & 1 << var5 * 4 << var6) != 0) { - this.field37[var5][1][var6] = var1.method43(); - this.field38[var5][1][var6] = var1.method43(); + this.field37[var5][1][var6] = var1.readUnsignedShort(); + this.field38[var5][1][var6] = var1.readUnsignedShort(); } else { this.field37[var5][1][var6] = this.field37[var5][0][var6]; this.field38[var5][1][var6] = this.field38[var5][0][var6]; diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index 0c263a1b47..57e9334b33 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -295,7 +295,8 @@ public class Buffer extends Node { signature = "(B)I", garbageValue = "-86" ) - public int method43() { + @Export("readUnsignedShort") + public int readUnsignedShort() { this.index += 2; return (this.array[this.index - 1] & 255) + ((this.array[this.index - 2] & 255) << 8); } @@ -502,7 +503,7 @@ public class Buffer extends Node { ) public int method47() { int var1 = this.array[this.index] & 255; - return var1 < 128 ? this.readUnsignedByte() - 64 : this.method43() - 49152; + return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; } @ObfuscatedName("ae") @@ -512,7 +513,7 @@ public class Buffer extends Node { ) public int method48() { int var1 = this.array[this.index] & 255; - return var1 < 128 ? this.readUnsignedByte() : this.method43() - 32768; + return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; } @ObfuscatedName("at") @@ -538,7 +539,7 @@ public class Buffer extends Node { garbageValue = "103" ) public int method50() { - return this.array[this.index] < 0 ? this.readInt() & Integer.MAX_VALUE : this.method43(); + return this.array[this.index] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); } @ObfuscatedName("ap") @@ -550,7 +551,7 @@ public class Buffer extends Node { if (this.array[this.index] < 0) { return this.readInt() & Integer.MAX_VALUE; } else { - int var1 = this.method43(); + int var1 = this.readUnsignedShort(); return var1 == 32767 ? -1 : var1; } } diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index 6b70aefc8e..9f34fbbd37 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -235,27 +235,27 @@ public final class Canvas extends java.awt.Canvas { garbageValue = "-1032035944" ) static final void method855() { - for (class68 var0 = (class68)Client.field214.last(); var0 != null; var0 = (class68)Client.field214.previous()) { - if (var0.field910 > 0) { - --var0.field910; + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0.hitpoints > 0) { + --var0.hitpoints; } - if (var0.field910 == 0) { + if (var0.hitpoints == 0) { if (var0.field903 < 0 || VarbitDefinition.method4910(var0.field903, var0.field905)) { - ParamKeyDefinition.method4933(var0.field911, var0.field906, var0.field913, var0.field901, var0.field903, var0.field904, var0.field905); + ParamKeyDefinition.method4933(var0.level, var0.type, var0.x, var0.y, var0.field903, var0.field904, var0.field905); var0.remove(); } } else { - if (var0.field909 > 0) { - --var0.field909; + if (var0.delay > 0) { + --var0.delay; } - if (var0.field909 == 0 && var0.field913 >= 1 && var0.field901 >= 1 && var0.field913 <= 102 && var0.field901 <= 102 && (var0.field899 < 0 || VarbitDefinition.method4910(var0.field899, var0.field908))) { - ParamKeyDefinition.method4933(var0.field911, var0.field906, var0.field913, var0.field901, var0.field899, var0.field907, var0.field908); - var0.field909 = -1; - if (var0.field903 == var0.field899 && var0.field903 == -1) { + if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102 && (var0.id < 0 || VarbitDefinition.method4910(var0.id, var0.field908))) { + ParamKeyDefinition.method4933(var0.level, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field908); + var0.delay = -1; + if (var0.field903 == var0.id && var0.field903 == -1) { var0.remove(); - } else if (var0.field899 == var0.field903 && var0.field904 == var0.field907 && var0.field908 == var0.field905) { + } else if (var0.id == var0.field903 && var0.field904 == var0.orientation && var0.field908 == var0.field905) { var0.remove(); } } diff --git a/runescape-client/src/main/java/ClanChat.java b/runescape-client/src/main/java/ClanChat.java index 68f78b31e8..f8ffae22d0 100644 --- a/runescape-client/src/main/java/ClanChat.java +++ b/runescape-client/src/main/java/ClanChat.java @@ -133,7 +133,7 @@ public class ClanChat extends UserList { for (int var12 = 0; var12 < var7; ++var12) { ClanMate var13 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); - int var10 = var1.method43(); + int var10 = var1.readUnsignedShort(); var13.set(var10, ++this.field97 - 1); var13.rank = var1.readByte(); var1.readStringCp1252NullTerminated(); @@ -150,7 +150,7 @@ public class ClanChat extends UserList { ) public final void method78(Buffer var1) { Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); - int var3 = var1.method43(); + int var3 = var1.readUnsignedShort(); byte var4 = var1.readByte(); boolean var5 = false; if (var4 == -128) { diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 4f5a6cb4e3..1b4b6b2170 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -1139,7 +1139,8 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedSignature( signature = "Lje;" ) - static NodeDeque field214; + @Export("pendingSpawns") + static NodeDeque pendingSpawns; @ObfuscatedName("kk") @ObfuscatedSignature( signature = "Lje;" @@ -1417,7 +1418,7 @@ public final class Client extends GameShell implements Usernamed { field181 = 2; } else { if (field181 != 0) { - class68.drawLoadingMessage("Loading - please wait.
(100%)", true); + PendingSpawn.drawLoadingMessage("Loading - please wait.
(100%)", true); } class13.playPcmPlayers(); @@ -1917,7 +1918,7 @@ public final class Client extends GameShell implements Usernamed { var50 = 0; if (var49 != -2) { - var50 = Rasterizer3D.Rasterizer3D_colorPalette[class25.method348(var49, 96)]; + var50 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapDecoration.method348(var49, 96)]; } if (var43.rgb2 != -1) { @@ -1930,10 +1931,10 @@ public final class Client extends GameShell implements Usernamed { } var49 = WorldMapAreaData.method712(var51, var43.saturation2, var52); - var50 = Rasterizer3D.Rasterizer3D_colorPalette[class25.method348(var49, 96)]; + var50 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapDecoration.method348(var49, 96)]; } - var60.addTile(var6, var12, var18, var41, var66, var69, var30, var31, var32, var33, class15.method183(var38, var34), class15.method183(var38, var35), class15.method183(var38, var36), class15.method183(var38, var37), class25.method348(var48, var34), class25.method348(var48, var35), class25.method348(var48, var36), class25.method348(var48, var37), var40, var50); + var60.addTile(var6, var12, var18, var41, var66, var69, var30, var31, var32, var33, class15.method183(var38, var34), class15.method183(var38, var35), class15.method183(var38, var36), class15.method183(var38, var37), WorldMapDecoration.method348(var48, var34), WorldMapDecoration.method348(var48, var35), WorldMapDecoration.method348(var48, var36), WorldMapDecoration.method348(var48, var37), var40, var50); } } } @@ -2283,23 +2284,23 @@ public final class Client extends GameShell implements Usernamed { } var3 = (field178 * 50 - field177 * 50) / field178; - class68.drawLoadingMessage("Loading - please wait.
(" + var3 + "%)", false); + PendingSpawn.drawLoadingMessage("Loading - please wait.
(" + var3 + "%)", false); } else if (field181 == 2) { if (field179 > field180) { field180 = field179; } var3 = (field180 * 50 - field179 * 50) / field180 + 50; - class68.drawLoadingMessage("Loading - please wait.
(" + var3 + "%)", false); + PendingSpawn.drawLoadingMessage("Loading - please wait.
(" + var3 + "%)", false); } else { - class68.drawLoadingMessage("Loading - please wait.", false); + PendingSpawn.drawLoadingMessage("Loading - please wait.", false); } } else if (gameState == 30) { this.drawLoggedIn(); } else if (gameState == 40) { - class68.drawLoadingMessage("Connection lost
Please wait - attempting to reestablish", false); + PendingSpawn.drawLoadingMessage("Connection lost
Please wait - attempting to reestablish", false); } else if (gameState == 45) { - class68.drawLoadingMessage("Please wait...", false); + PendingSpawn.drawLoadingMessage("Please wait...", false); } } else { IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12); @@ -2807,7 +2808,7 @@ public final class Client extends GameShell implements Usernamed { if (ModelData0.NetCache_currentResponse == null) { NetCache.NetCache_responseHeaderBuffer.index = 0; var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); - var12 = NetCache.NetCache_responseHeaderBuffer.method43(); + var12 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); int var14 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); var13 = NetCache.NetCache_responseHeaderBuffer.readInt(); long var15 = (long)(var12 + (var11 << 16)); @@ -3323,7 +3324,7 @@ public final class Client extends GameShell implements Usernamed { var8.packetBuffer.writeInt(Skeleton.indexCache1.hash); var8.packetBuffer.writeInt(ObjectSound.indexCache2.hash); var8.packetBuffer.writeInt(WorldMapIcon1.indexCache3.hash); - var8.packetBuffer.writeInt(class25.indexCache4.hash); + var8.packetBuffer.writeInt(WorldMapDecoration.indexCache4.hash); var8.packetBuffer.writeInt(SecureRandomFuture.indexCache5.hash); var8.packetBuffer.writeInt(UserComparator3.indexCache6.hash); var8.packetBuffer.writeInt(class40.indexCache7.hash); @@ -3452,7 +3453,7 @@ public final class Client extends GameShell implements Usernamed { packetWriter.serverPacket0Length = packetWriter.serverPacket0.length; ((AbstractSocket)var1).read(var2.array, 0, 2); var2.index = 0; - packetWriter.serverPacket0Length = var2.method43(); + packetWriter.serverPacket0Length = var2.readUnsignedShort(); try { Client var25 = TextureProvider.client; @@ -3479,7 +3480,7 @@ public final class Client extends GameShell implements Usernamed { var2.index = 0; ((AbstractSocket)var1).read(var2.array, 0, 2); var2.index = 0; - IndexCacheLoader.field407 = var2.method43(); + IndexCacheLoader.field407 = var2.readUnsignedShort(); loginState = 15; } @@ -3518,7 +3519,7 @@ public final class Client extends GameShell implements Usernamed { ((AbstractSocket)var1).read(var2.array, 0, 2); var2.index = 0; - packetWriter.serverPacket0Length = var2.method43(); + packetWriter.serverPacket0Length = var2.readUnsignedShort(); } if (((AbstractSocket)var1).available() >= packetWriter.serverPacket0Length) { @@ -3930,7 +3931,7 @@ public final class Client extends GameShell implements Usernamed { } if (rootWidgetGroup != -1) { - class231.method4517(rootWidgetGroup, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0); + WorldMapDecorationType.method4517(rootWidgetGroup, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0); } ++cycleCntr; @@ -4009,7 +4010,7 @@ public final class Client extends GameShell implements Usernamed { } else if (menuOptionsCount > 0) { var4 = field205; var9 = field206; - class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var4, var9); + WorldMapDecorationType.processTempMenuAction(UnitPriceComparator.tempMenuAction, var4, var9); UnitPriceComparator.tempMenuAction = null; } @@ -4338,7 +4339,7 @@ public final class Client extends GameShell implements Usernamed { class39.drawMenuActionTextAt(field216, field217); } } else { - var1 = class25.menuX; + var1 = WorldMapDecoration.menuX; var2 = GameShell.menuY; var3 = class214.menuWidth; var4 = AbstractWorldMapIcon.menuHeight; @@ -4372,7 +4373,7 @@ public final class Client extends GameShell implements Usernamed { var11.draw(var12, var1 + 3, var9, var10, 0); } - var7 = class25.menuX; + var7 = WorldMapDecoration.menuX; var9 = GameShell.menuY; var10 = class214.menuWidth; int var15 = AbstractWorldMapIcon.menuHeight; @@ -4428,7 +4429,7 @@ public final class Client extends GameShell implements Usernamed { if (var13.stream1 == null) { if (var13.soundEffectId >= 0) { var14 = null; - var16 = SoundEffect.readSoundEffect(class25.indexCache4, var13.soundEffectId, 0); + var16 = SoundEffect.readSoundEffect(WorldMapDecoration.indexCache4, var13.soundEffectId, 0); if (var16 != null) { var17 = var16.toRawSound().resample(MilliClock.decimator); var19 = RawPcmStream.createRawPcmStream(var17, 100, var6); @@ -4445,7 +4446,7 @@ public final class Client extends GameShell implements Usernamed { if (var13.soundEffectIds != null && (var13.field655 -= var4) <= 0) { var7 = (int)(Math.random() * (double)var13.soundEffectIds.length); var14 = null; - var16 = SoundEffect.readSoundEffect(class25.indexCache4, var13.soundEffectIds[var7], 0); + var16 = SoundEffect.readSoundEffect(WorldMapDecoration.indexCache4, var13.soundEffectIds[var7], 0); if (var16 != null) { var17 = var16.toRawSound().resample(MilliClock.decimator); var19 = RawPcmStream.createRawPcmStream(var17, 100, var6); @@ -4541,7 +4542,7 @@ public final class Client extends GameShell implements Usernamed { var1.getSocket().read(var3.array, 0, 2); var3.index = 0; - var1.serverPacket0Length = var3.method43(); + var1.serverPacket0Length = var3.readUnsignedShort(); } if (!var2.isAvailable(var1.serverPacket0Length)) { @@ -4565,7 +4566,7 @@ public final class Client extends GameShell implements Usernamed { isCameraLocked = true; class3.field1146 = var3.readUnsignedByte(); MusicPatchPcmStream.field602 = var3.readUnsignedByte(); - AbstractWorldMapIcon.field4 = var3.method43(); + AbstractWorldMapIcon.field4 = var3.readUnsignedShort(); ClientPacket.field221 = var3.readUnsignedByte(); class30.field1148 = var3.readUnsignedByte(); if (class30.field1148 >= 100) { @@ -4663,7 +4664,7 @@ public final class Client extends GameShell implements Usernamed { int var13; if (ServerPacket.field859 == var1.serverPacket0) { var37 = var3.readInt(); - var6 = var3.method43(); + var6 = var3.readUnsignedShort(); if (var37 < -70000) { var6 += 32768; } @@ -4682,10 +4683,10 @@ public final class Client extends GameShell implements Usernamed { } PlayerType.clearItemContainer(var6); - var10 = var3.method43(); + var10 = var3.readUnsignedShort(); for (var11 = 0; var11 < var10; ++var11) { - var12 = var3.method43(); + var12 = var3.readUnsignedShort(); var13 = var3.readUnsignedByte(); if (var13 == 255) { var13 = var3.method73(); @@ -4821,7 +4822,7 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field825 == var1.serverPacket0) { hintArrowType = var3.readUnsignedByte(); if (hintArrowType == 1) { - hintArrowNpcIndex = var3.method43(); + hintArrowNpcIndex = var3.readUnsignedShort(); } if (hintArrowType >= 2 && hintArrowType <= 6) { @@ -4851,13 +4852,13 @@ public final class Client extends GameShell implements Usernamed { } hintArrowType = 2; - hintArrowX = var3.method43(); - hintArrowY = var3.method43(); + hintArrowX = var3.readUnsignedShort(); + hintArrowY = var3.readUnsignedShort(); hintArrowHeight = var3.readUnsignedByte(); } if (hintArrowType == 10) { - hintArrowPlayerIndex = var3.method43(); + hintArrowPlayerIndex = var3.readUnsignedShort(); } var1.serverPacket0 = null; @@ -4899,7 +4900,7 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field809 == var1.serverPacket0) { var37 = var3.readInt(); - var6 = var3.method43(); + var6 = var3.readUnsignedShort(); if (var6 == 65535) { var6 = -1; } @@ -5008,7 +5009,7 @@ public final class Client extends GameShell implements Usernamed { } var5 = var3.method73(); - var10 = var3.method43(); + var10 = var3.readUnsignedShort(); if (var10 == 65535) { var10 = -1; } @@ -5114,7 +5115,7 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field833 == var1.serverPacket0) { var37 = var3.readInt(); - var6 = var3.method43(); + var6 = var3.readUnsignedShort(); if (var37 < -70000) { var6 += 32768; } @@ -5127,7 +5128,7 @@ public final class Client extends GameShell implements Usernamed { for (; var3.index < var1.serverPacket0Length; WorldMapManager.itemContainerSetItem(var6, var10, var11 - 1, var12)) { var10 = var3.method48(); - var11 = var3.method43(); + var11 = var3.readUnsignedShort(); var12 = 0; if (var11 != 0) { var12 = var3.readUnsignedByte(); @@ -5153,9 +5154,9 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field854 == var1.serverPacket0) { - var37 = var3.method43(); + var37 = var3.readUnsignedShort(); var6 = var3.readUnsignedByte(); - var5 = var3.method43(); + var5 = var3.readUnsignedShort(); Ignored.queueSoundEffect(var37, var6, var5); var1.serverPacket0 = null; return true; @@ -5199,7 +5200,7 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field836 == var1.serverPacket0) { World var43 = new World(); var43.host = var3.readStringCp1252NullTerminated(); - var43.id = var3.method43(); + var43.id = var3.readUnsignedShort(); var6 = var3.readInt(); var43.properties = var6; GameShell.updateGameState(45); @@ -5297,7 +5298,7 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field861 == var1.serverPacket0) { - rebootTimer = var3.method43() * 30; + rebootTimer = var3.readUnsignedShort() * 30; field124 = cycleCntr; var1.serverPacket0 = null; return true; @@ -5316,9 +5317,9 @@ public final class Client extends GameShell implements Usernamed { } } - for (class68 var45 = (class68)field214.last(); var45 != null; var45 = (class68)field214.previous()) { - if (var45.field913 >= WorldMapSection3.field1089 && var45.field913 < WorldMapSection3.field1089 + 8 && var45.field901 >= Canvas.field95 && var45.field901 < Canvas.field95 + 8 && var45.field911 == SoundSystem.plane) { - var45.field910 = 0; + for (PendingSpawn var45 = (PendingSpawn) pendingSpawns.last(); var45 != null; var45 = (PendingSpawn) pendingSpawns.previous()) { + if (var45.x >= WorldMapSection3.field1089 && var45.x < WorldMapSection3.field1089 + 8 && var45.y >= Canvas.field95 && var45.y < Canvas.field95 + 8 && var45.level == SoundSystem.plane) { + var45.hitpoints = 0; } } @@ -5354,7 +5355,7 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field843 == var1.serverPacket0) { var21 = var3.readStringCp1252NullTerminated(); var25 = var3.readLong(); - var27 = (long)var3.method43(); + var27 = (long)var3.readUnsignedShort(); var19 = (long)var3.readMedium(); var29 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte()); var23 = (var27 << 32) + var19; @@ -5426,7 +5427,7 @@ public final class Client extends GameShell implements Usernamed { isCameraLocked = true; GrandExchangeOffer.field376 = var3.readUnsignedByte(); KeyHandler.field445 = var3.readUnsignedByte(); - IndexStoreAction.field410 = var3.method43(); + IndexStoreAction.field410 = var3.readUnsignedShort(); VertexNormal.field946 = var3.readUnsignedByte(); class171.field1116 = var3.readUnsignedByte(); if (class171.field1116 >= 100) { @@ -5575,8 +5576,8 @@ public final class Client extends GameShell implements Usernamed { WidgetGroupParent var50; if (ServerPacket.field845 == var1.serverPacket0) { var37 = var3.index + var1.serverPacket0Length; - var6 = var3.method43(); - var5 = var3.method43(); + var6 = var3.readUnsignedShort(); + var5 = var3.readUnsignedShort(); if (var6 != rootWidgetGroup) { rootWidgetGroup = var6; this.method87(false); @@ -5590,7 +5591,7 @@ public final class Client extends GameShell implements Usernamed { for (; var5-- > 0; var50.keep = true) { var10 = var3.readInt(); - var11 = var3.method43(); + var11 = var3.readUnsignedShort(); var12 = var3.readUnsignedByte(); var50 = (WidgetGroupParent)widgetGroupParents.get((long)var10); if (var50 != null && var11 != var50.group) { @@ -5615,8 +5616,8 @@ public final class Client extends GameShell implements Usernamed { while (var3.index < var37) { var10 = var3.readInt(); - var11 = var3.method43(); - var12 = var3.method43(); + var11 = var3.readUnsignedShort(); + var12 = var3.readUnsignedShort(); var13 = var3.readInt(); for (int var51 = var11; var51 <= var12; ++var51) { @@ -5669,7 +5670,7 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field793 == var1.serverPacket0) { - var37 = var3.method43(); + var37 = var3.readUnsignedShort(); var6 = var3.readInt(); Varps.Varps_temp[var37] = var6; if (Varps.Varps_main[var37] != var6) { @@ -5763,7 +5764,7 @@ public final class Client extends GameShell implements Usernamed { if (ServerPacket.field799 == var1.serverPacket0) { var21 = var3.readStringCp1252NullTerminated(); - var25 = (long)var3.method43(); + var25 = (long)var3.readUnsignedShort(); var27 = (long)var3.readMedium(); var29 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte()); long var30 = (var25 << 32) + var27; @@ -5897,14 +5898,14 @@ public final class Client extends GameShell implements Usernamed { if (var12 != 1 && (AbstractRasterProvider.mouseCam || var12 != 4)) { var2 = MouseHandler.MouseHandler_x; var14 = MouseHandler.MouseHandler_y; - if (var2 < class25.menuX - 10 || var2 > class25.menuX + class214.menuWidth + 10 || var14 < GameShell.menuY - 10 || var14 > AbstractWorldMapIcon.menuHeight + GameShell.menuY + 10) { + if (var2 < WorldMapDecoration.menuX - 10 || var2 > WorldMapDecoration.menuX + class214.menuWidth + 10 || var14 < GameShell.menuY - 10 || var14 > AbstractWorldMapIcon.menuHeight + GameShell.menuY + 10) { isMenuOpen = false; - Players.method2112(class25.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight); + Players.method2112(WorldMapDecoration.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight); } } if (var12 == 1 || !AbstractRasterProvider.mouseCam && var12 == 4) { - var2 = class25.menuX; + var2 = WorldMapDecoration.menuX; var14 = GameShell.menuY; var7 = class214.menuWidth; var3 = MouseHandler.MouseHandler_lastPressedX; @@ -5923,7 +5924,7 @@ public final class Client extends GameShell implements Usernamed { } isMenuOpen = false; - Players.method2112(class25.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight); + Players.method2112(WorldMapDecoration.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight); } } else { var2 = menuOptionsCount - 1; @@ -5946,7 +5947,7 @@ public final class Client extends GameShell implements Usernamed { if (DevicePcmPlayerProvider.dragInventoryWidget != null && !field207 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { var12 = field205; var13 = field206; - class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var12, var13); + WorldMapDecorationType.processTempMenuAction(UnitPriceComparator.tempMenuAction, var12, var13); UnitPriceComparator.tempMenuAction = null; } @@ -6049,7 +6050,7 @@ public final class Client extends GameShell implements Usernamed { var9 = 0; } - class25.menuX = var8; + WorldMapDecoration.menuX = var8; GameShell.menuY = var9; class214.menuWidth = var3; AbstractWorldMapIcon.menuHeight = menuOptionsCount * 15 + 22; @@ -6191,7 +6192,7 @@ public final class Client extends GameShell implements Usernamed { } else if (menuOptionsCount > 0) { int var9 = widgetClickX + field110; var10 = widgetClickY + field111; - class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var9, var10); + WorldMapDecorationType.processTempMenuAction(UnitPriceComparator.tempMenuAction, var9, var10); UnitPriceComparator.tempMenuAction = null; } @@ -6368,7 +6369,7 @@ public final class Client extends GameShell implements Usernamed { field213 = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; combatTargetPlayerIndex = -1; groundItems = new NodeDeque[4][104][104]; - field214 = new NodeDeque(); + pendingSpawns = new NodeDeque(); projectiles = new NodeDeque(); graphicsObjects = new NodeDeque(); currentLevels = new int[25]; diff --git a/runescape-client/src/main/java/ClientParameter.java b/runescape-client/src/main/java/ClientParameter.java index f2c8156aea..3ca51f2f48 100644 --- a/runescape-client/src/main/java/ClientParameter.java +++ b/runescape-client/src/main/java/ClientParameter.java @@ -134,13 +134,13 @@ public class ClientParameter { byte[] var0 = FriendLoginUpdate.field356.getResponse(); Buffer var1 = new Buffer(var0); var1.readInt(); - World.worldsCount = var1.method43(); + World.worldsCount = var1.readUnsignedShort(); ItemContainer.worlds = new World[World.worldsCount]; World var2; for (int var3 = 0; var3 < World.worldsCount; var2.index = var3++) { var2 = ItemContainer.worlds[var3] = new World(); - var2.id = var1.method43(); + var2.id = var1.readUnsignedShort(); var2.properties = var1.readInt(); var2.host = var1.readStringCp1252NullTerminated(); var2.activity = var1.readStringCp1252NullTerminated(); diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index dfbf94b5c9..47738a89ea 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -72,32 +72,32 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { static void decodeSprite(byte[] var0) { Buffer var1 = new Buffer(var0); var1.index = var0.length - 2; - class328.indexedSpriteCount = var1.method43(); + class328.indexedSpriteCount = var1.readUnsignedShort(); class328.indexedSpriteOffsetXs = new int[class328.indexedSpriteCount]; class328.indexedSpriteOffsetYs = new int[class328.indexedSpriteCount]; VarbitDefinition.indexedSpriteWidths = new int[class328.indexedSpriteCount]; SecureRandomCallable.indexedSpriteHeights = new int[class328.indexedSpriteCount]; class328.spritePixels = new byte[class328.indexedSpriteCount][]; var1.index = var0.length - 7 - class328.indexedSpriteCount * 8; - class328.indexedSpriteWidth = var1.method43(); - class328.indexedSpriteHeight = var1.method43(); + class328.indexedSpriteWidth = var1.readUnsignedShort(); + class328.indexedSpriteHeight = var1.readUnsignedShort(); int var2 = (var1.readUnsignedByte() & 255) + 1; int var3; for (var3 = 0; var3 < class328.indexedSpriteCount; ++var3) { - class328.indexedSpriteOffsetXs[var3] = var1.method43(); + class328.indexedSpriteOffsetXs[var3] = var1.readUnsignedShort(); } for (var3 = 0; var3 < class328.indexedSpriteCount; ++var3) { - class328.indexedSpriteOffsetYs[var3] = var1.method43(); + class328.indexedSpriteOffsetYs[var3] = var1.readUnsignedShort(); } for (var3 = 0; var3 < class328.indexedSpriteCount; ++var3) { - VarbitDefinition.indexedSpriteWidths[var3] = var1.method43(); + VarbitDefinition.indexedSpriteWidths[var3] = var1.readUnsignedShort(); } for (var3 = 0; var3 < class328.indexedSpriteCount; ++var3) { - SecureRandomCallable.indexedSpriteHeights[var3] = var1.method43(); + SecureRandomCallable.indexedSpriteHeights[var3] = var1.readUnsignedShort(); } var1.index = var0.length - 7 - class328.indexedSpriteCount * 8 - (var2 - 1) * 3; diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index 31c8470632..905d5408e6 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -534,7 +534,7 @@ public class DynamicObject extends Entity { GameObject.field359 = var0; WorldMapLabelSize.field1041 = var1; GameShell.updateGameState(25); - class68.drawLoadingMessage("Loading - please wait.", true); + PendingSpawn.drawLoadingMessage("Loading - please wait.", true); int var3 = class50.baseX; int var4 = GraphicsObject.baseY; class50.baseX = (var0 - 6) * 8; @@ -611,10 +611,10 @@ public class DynamicObject extends Entity { } } - for (class68 var22 = (class68)Client.field214.last(); var22 != null; var22 = (class68)Client.field214.previous()) { - var22.field913 -= var5; - var22.field901 -= var6; - if (var22.field913 < 0 || var22.field901 < 0 || var22.field913 >= 104 || var22.field901 >= 104) { + for (PendingSpawn var22 = (PendingSpawn)Client.pendingSpawns.last(); var22 != null; var22 = (PendingSpawn)Client.pendingSpawns.previous()) { + var22.x -= var5; + var22.y -= var6; + if (var22.x < 0 || var22.y < 0 || var22.x >= 104 || var22.y >= 104) { var22.remove(); } } diff --git a/runescape-client/src/main/java/EnumDefinition.java b/runescape-client/src/main/java/EnumDefinition.java index c66cf81e96..dbd78a607c 100644 --- a/runescape-client/src/main/java/EnumDefinition.java +++ b/runescape-client/src/main/java/EnumDefinition.java @@ -90,7 +90,7 @@ public class EnumDefinition extends DualNode { } else { int var3; if (var2 == 5) { - this.size0 = var1.method43(); + this.size0 = var1.readUnsignedShort(); this.keys = new int[this.size0]; this.stringVals = new String[this.size0]; @@ -99,7 +99,7 @@ public class EnumDefinition extends DualNode { this.stringVals[var3] = var1.readStringCp1252NullTerminated(); } } else if (var2 == 6) { - this.size0 = var1.method43(); + this.size0 = var1.readUnsignedShort(); this.keys = new int[this.size0]; this.intVals = new int[this.size0]; diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index 3cebc659a2..acb0e22e88 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -480,7 +480,7 @@ public class FontName { AbstractIndexCache.indexCache0.method8(); Skeleton.indexCache1.method8(); WorldMapIcon1.indexCache3.method8(); - class25.indexCache4.method8(); + WorldMapDecoration.indexCache4.method8(); SecureRandomFuture.indexCache5.method8(); UserComparator3.indexCache6.method8(); class40.indexCache7.method8(); diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index 76ff494389..36110033cc 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -78,7 +78,7 @@ public class FriendsList extends UserList { boolean var3 = var1.readUnsignedByte() == 1; Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); - int var6 = var1.method43(); + int var6 = var1.readUnsignedShort(); int var7 = var1.readUnsignedByte(); int var8 = var1.readUnsignedByte(); boolean var9 = (var8 & 2) != 0; diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index 11d8c7dd6e..371bfe564f 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -745,9 +745,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene protected final void drawInitial(int var1, String var2, boolean var3) { try { Graphics var4 = this.canvas.getGraphics(); - if (class231.field1140 == null) { - class231.field1140 = new java.awt.Font("Helvetica", 1, 13); - class60.field1162 = this.canvas.getFontMetrics(class231.field1140); + if (WorldMapDecorationType.field1140 == null) { + WorldMapDecorationType.field1140 = new java.awt.Font("Helvetica", 1, 13); + class60.field1162 = this.canvas.getFontMetrics(WorldMapDecorationType.field1140); } if (var3) { @@ -769,7 +769,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene var6.setColor(Color.black); var6.drawRect(1, 1, 301, 31); var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); - var6.setFont(class231.field1140); + var6.setFont(WorldMapDecorationType.field1140); var6.setColor(Color.white); var6.drawString(var2, (304 - class60.field1162.stringWidth(var2)) / 2, 22); var4.drawImage(PlayerType.field730, SoundCache.canvasWidth / 2 - 152, Huffman.canvasHeight / 2 - 18, (ImageObserver)null); @@ -782,7 +782,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene var4.setColor(Color.black); var4.drawRect(var7 + 1, var8 + 1, 301, 31); var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); - var4.setFont(class231.field1140); + var4.setFont(WorldMapDecorationType.field1140); var4.setColor(Color.white); var4.drawString(var2, var7 + (304 - class60.field1162.stringWidth(var2)) / 2, var8 + 22); } @@ -799,7 +799,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene ) protected final void method113() { PlayerType.field730 = null; - class231.field1140 = null; + WorldMapDecorationType.field1140 = null; class60.field1162 = null; } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index fc5e9170a5..c4665c6534 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -37,7 +37,7 @@ public class GrandExchangeEvent { GrandExchangeEvent(Buffer var1, byte var2, int var3) { this.string1 = var1.readStringCp1252NullTerminated(); this.string2 = var1.readStringCp1252NullTerminated(); - this.world = var1.method43(); + this.world = var1.readUnsignedShort(); this.field370 = var1.readLong(); int var4 = var1.readInt(); int var5 = var1.readInt(); @@ -238,7 +238,7 @@ public class GrandExchangeEvent { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection2.getVarbit(var11); } else if (var13 == 27) { var11 = var6[var4]; - class68.method1695(var11, Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + PendingSpawn.method1695(var11, Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); } else if (var13 == 31) { RouteStrategy.Interpreter_intStackSize -= 2; if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index 78452aadf2..a880043184 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -39,7 +39,7 @@ public class GrandExchangeEvents { garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { - int var3 = var1.method43(); + int var3 = var1.readUnsignedShort(); boolean var4 = var1.readUnsignedByte() == 1; byte var5; if (var4) { @@ -48,7 +48,7 @@ public class GrandExchangeEvents { var5 = 0; } - int var6 = var1.method43(); + int var6 = var1.readUnsignedShort(); this.events = new ArrayList(var6); for (int var7 = 0; var7 < var6; ++var7) { diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index c98cd110d1..de854bdb16 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -62,7 +62,7 @@ public class GrandExchangeOffer { ) public GrandExchangeOffer(Buffer var1, boolean var2) { this.state = var1.readByte(); - this.id = var1.method43(); + this.id = var1.readUnsignedShort(); this.unitPrice = var1.readInt(); this.totalQuantity = var1.readInt(); this.currentQuantity = var1.readInt(); diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index a898b9a8d2..a60a84437d 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -132,7 +132,7 @@ public class HealthBarDefinition extends DualNode { @Export("readNext") void readNext(Buffer var1, int var2) { if (var2 == 1) { - var1.method43(); + var1.readUnsignedShort(); } else if (var2 == 2) { this.int1 = var1.readUnsignedByte(); } else if (var2 == 3) { @@ -140,7 +140,7 @@ public class HealthBarDefinition extends DualNode { } else if (var2 == 4) { this.int3 = 0; } else if (var2 == 5) { - this.int5 = var1.method43(); + this.int5 = var1.readUnsignedShort(); } else if (var2 == 6) { var1.readUnsignedByte(); } else if (var2 == 7) { @@ -148,7 +148,7 @@ public class HealthBarDefinition extends DualNode { } else if (var2 == 8) { this.spriteId2 = var1.method51(); } else if (var2 == 11) { - this.int3 = var1.method43(); + this.int3 = var1.readUnsignedShort(); } else if (var2 == 14) { this.width = var1.readUnsignedByte(); } else if (var2 == 15) { diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index a31e8cb465..4251fa3e2c 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -177,7 +177,7 @@ public class HitSplatDefinition extends DualNode { } else if (var2 == 8) { this.field395 = var1.readStringCp1252NullCircumfixed(); } else if (var2 == 9) { - this.field387 = var1.method43(); + this.field387 = var1.readUnsignedShort(); } else if (var2 == 10) { this.field393 = var1.method44(); } else if (var2 == 11) { @@ -187,21 +187,21 @@ public class HitSplatDefinition extends DualNode { } else if (var2 == 13) { this.field397 = var1.method44(); } else if (var2 == 14) { - this.field394 = var1.method43(); + this.field394 = var1.readUnsignedShort(); } else if (var2 == 17 || var2 == 18) { - this.transformVarbit = var1.method43(); + this.transformVarbit = var1.readUnsignedShort(); if (this.transformVarbit == 65535) { this.transformVarbit = -1; } - this.transformVarp = var1.method43(); + this.transformVarp = var1.readUnsignedShort(); if (this.transformVarp == 65535) { this.transformVarp = -1; } int var3 = -1; if (var2 == 18) { - var3 = var1.method43(); + var3 = var1.readUnsignedShort(); if (var3 == 65535) { var3 = -1; } @@ -211,7 +211,7 @@ public class HitSplatDefinition extends DualNode { this.transforms = new int[var4 + 2]; for (int var5 = 0; var5 <= var4; ++var5) { - this.transforms[var5] = var1.method43(); + this.transforms[var5] = var1.readUnsignedShort(); if (this.transforms[var5] == 65535) { this.transforms[var5] = -1; } diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java index d8f97202b4..60c864797e 100644 --- a/runescape-client/src/main/java/Instrument.java +++ b/runescape-client/src/main/java/Instrument.java @@ -377,8 +377,8 @@ public class Instrument { this.delayTime = var1.method48(); this.delayDecay = var1.method48(); - this.duration = var1.method43(); - this.offset = var1.method43(); + this.duration = var1.readUnsignedShort(); + this.offset = var1.readUnsignedShort(); this.filter = new AudioFilter(); this.field421 = new SoundEnvelope(); this.filter.method27(var1, this.field421); diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index c058dbea3e..0d3f76361b 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -48,7 +48,7 @@ public class InvDefinition extends DualNode { @Export("readNext") void readNext(Buffer var1, int var2) { if (var2 == 2) { - this.size = var1.method43(); + this.size = var1.readUnsignedShort(); } } diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index 2e9fc77fde..999e16be6f 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -359,22 +359,22 @@ public class ItemDefinition extends DualNode { @Export("readNext") void readNext(Buffer var1, int var2) { if (var2 == 1) { - this.field435 = var1.method43(); + this.field435 = var1.readUnsignedShort(); } else if (var2 == 2) { this.name = var1.readStringCp1252NullTerminated(); } else if (var2 == 4) { - this.zoom2d = var1.method43(); + this.zoom2d = var1.readUnsignedShort(); } else if (var2 == 5) { - this.xan2d = var1.method43(); + this.xan2d = var1.readUnsignedShort(); } else if (var2 == 6) { - this.yan2d = var1.method43(); + this.yan2d = var1.readUnsignedShort(); } else if (var2 == 7) { - this.offsetX2d = var1.method43(); + this.offsetX2d = var1.readUnsignedShort(); if (this.offsetX2d > 32767) { this.offsetX2d -= 65536; } } else if (var2 == 8) { - this.offsetY2d = var1.method43(); + this.offsetY2d = var1.readUnsignedShort(); if (this.offsetY2d > 32767) { this.offsetY2d -= 65536; } @@ -385,15 +385,15 @@ public class ItemDefinition extends DualNode { } else if (var2 == 16) { this.isMembersOnly = true; } else if (var2 == 23) { - this.maleModel = var1.method43(); + this.maleModel = var1.readUnsignedShort(); this.maleOffset = var1.readUnsignedByte(); } else if (var2 == 24) { - this.maleModel1 = var1.method43(); + this.maleModel1 = var1.readUnsignedShort(); } else if (var2 == 25) { - this.femaleModel = var1.method43(); + this.femaleModel = var1.readUnsignedShort(); this.femaleOffset = var1.readUnsignedByte(); } else if (var2 == 26) { - this.femaleModel1 = var1.method43(); + this.femaleModel1 = var1.readUnsignedShort(); } else if (var2 >= 30 && var2 < 35) { this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { @@ -410,8 +410,8 @@ public class ItemDefinition extends DualNode { this.recolorTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.method43(); - this.recolorTo[var4] = (short)var1.method43(); + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); + this.recolorTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 == 41) { var3 = var1.readUnsignedByte(); @@ -419,45 +419,45 @@ public class ItemDefinition extends DualNode { this.retextureTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.method43(); - this.retextureTo[var4] = (short)var1.method43(); + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 == 42) { this.shiftClickIndex0 = var1.readByte(); } else if (var2 == 65) { this.isTradable = true; } else if (var2 == 78) { - this.maleModel2 = var1.method43(); + this.maleModel2 = var1.readUnsignedShort(); } else if (var2 == 79) { - this.femaleModel2 = var1.method43(); + this.femaleModel2 = var1.readUnsignedShort(); } else if (var2 == 90) { - this.maleHeadModel = var1.method43(); + this.maleHeadModel = var1.readUnsignedShort(); } else if (var2 == 91) { - this.femaleHeadModel = var1.method43(); + this.femaleHeadModel = var1.readUnsignedShort(); } else if (var2 == 92) { - this.maleHeadModel2 = var1.method43(); + this.maleHeadModel2 = var1.readUnsignedShort(); } else if (var2 == 93) { - this.femaleHeadModel2 = var1.method43(); + this.femaleHeadModel2 = var1.readUnsignedShort(); } else if (var2 == 95) { - this.zan2d = var1.method43(); + this.zan2d = var1.readUnsignedShort(); } else if (var2 == 97) { - this.note = var1.method43(); + this.note = var1.readUnsignedShort(); } else if (var2 == 98) { - this.noteTemplate = var1.method43(); + this.noteTemplate = var1.readUnsignedShort(); } else if (var2 >= 100 && var2 < 110) { if (this.field436 == null) { this.field436 = new int[10]; this.field437 = new int[10]; } - this.field436[var2 - 100] = var1.method43(); - this.field437[var2 - 100] = var1.method43(); + this.field436[var2 - 100] = var1.readUnsignedShort(); + this.field437[var2 - 100] = var1.readUnsignedShort(); } else if (var2 == 110) { - this.resizeX = var1.method43(); + this.resizeX = var1.readUnsignedShort(); } else if (var2 == 111) { - this.resizeY = var1.method43(); + this.resizeY = var1.readUnsignedShort(); } else if (var2 == 112) { - this.resizeZ = var1.method43(); + this.resizeZ = var1.readUnsignedShort(); } else if (var2 == 113) { this.ambient = var1.readByte(); } else if (var2 == 114) { @@ -465,13 +465,13 @@ public class ItemDefinition extends DualNode { } else if (var2 == 115) { this.int1 = var1.readUnsignedByte(); } else if (var2 == 139) { - this.unnotedId = var1.method43(); + this.unnotedId = var1.readUnsignedShort(); } else if (var2 == 140) { - this.notedId = var1.method43(); + this.notedId = var1.readUnsignedShort(); } else if (var2 == 148) { - this.placeholder = var1.method43(); + this.placeholder = var1.readUnsignedShort(); } else if (var2 == 149) { - this.placeholderTemplate = var1.method43(); + this.placeholderTemplate = var1.readUnsignedShort(); } else if (var2 == 249) { this.params = AbstractIndexCache.readStringIntParameters(var1, this.params); } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index 920c77abf6..619b4d5fa9 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -33,9 +33,11 @@ public class KitDefinition extends DualNode { @ObfuscatedGetter( intValue = 1619779051 ) - public int field458; + @Export("bodypartID") + public int bodypartID; @ObfuscatedName("u") - int[] field459; + @Export("modelIDs") + int[] modelIDs; @ObfuscatedName("g") @Export("recolorFrom") short[] recolorFrom; @@ -52,12 +54,13 @@ public class KitDefinition extends DualNode { @Export("archives") int[] archives; @ObfuscatedName("k") - public boolean field460; + @Export("nonSelectable") + public boolean nonSelectable; KitDefinition() { - this.field458 = -1; + this.bodypartID = -1; this.archives = new int[]{-1, -1, -1, -1, -1}; - this.field460 = false; + this.nonSelectable = false; } @ObfuscatedName("f") @@ -85,27 +88,27 @@ public class KitDefinition extends DualNode { @Export("readNext") void readNext(Buffer var1, int var2) { if (var2 == 1) { - this.field458 = var1.readUnsignedByte(); + this.bodypartID = var1.readUnsignedByte(); } else { int var3; int var4; if (var2 == 2) { var3 = var1.readUnsignedByte(); - this.field459 = new int[var3]; + this.modelIDs = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.field459[var4] = var1.method43(); + this.modelIDs[var4] = var1.readUnsignedShort(); } } else if (var2 == 3) { - this.field460 = true; + this.nonSelectable = true; } else if (var2 == 40) { var3 = var1.readUnsignedByte(); this.recolorFrom = new short[var3]; this.recolorTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.method43(); - this.recolorTo[var4] = (short)var1.method43(); + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); + this.recolorTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 == 41) { var3 = var1.readUnsignedByte(); @@ -113,11 +116,11 @@ public class KitDefinition extends DualNode { this.retextureTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.method43(); - this.retextureTo[var4] = (short)var1.method43(); + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 >= 60 && var2 < 70) { - this.archives[var2 - 60] = var1.method43(); + this.archives[var2 - 60] = var1.readUnsignedShort(); } } @@ -128,14 +131,15 @@ public class KitDefinition extends DualNode { signature = "(I)Z", garbageValue = "-1250940659" ) - public boolean method159() { - if (this.field459 == null) { + @Export("ready") + public boolean ready() { + if (this.modelIDs == null) { return true; } else { boolean var1 = true; - for (int var2 = 0; var2 < this.field459.length; ++var2) { - if (!field456.tryLoadRecord(this.field459[var2], 0)) { + for (int var2 = 0; var2 < this.modelIDs.length; ++var2) { + if (!field456.tryLoadRecord(this.modelIDs[var2], 0)) { var1 = false; } } @@ -149,14 +153,15 @@ public class KitDefinition extends DualNode { signature = "(B)Ldw;", garbageValue = "0" ) - public ModelData method160() { - if (this.field459 == null) { + @Export("getModelData") + public ModelData getModelData() { + if (this.modelIDs == null) { return null; } else { - ModelData[] var1 = new ModelData[this.field459.length]; + ModelData[] var1 = new ModelData[this.modelIDs.length]; - for (int var2 = 0; var2 < this.field459.length; ++var2) { - var1[var2] = ModelData.method2788(field456, this.field459[var2], 0); + for (int var2 = 0; var2 < this.modelIDs.length; ++var2) { + var1[var2] = ModelData.method2788(field456, this.modelIDs[var2], 0); } ModelData var4; diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 677531848f..7dea34d004 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -106,7 +106,7 @@ public class MenuAction { } } - var5 = class214.menuWidth / 2 + class25.menuX; + var5 = class214.menuWidth / 2 + WorldMapDecoration.menuX; var6 = GameShell.menuY; int var7 = class2.fontBold12.stringWidth("Choose Option"); @@ -148,7 +148,7 @@ public class MenuAction { var14 = 0; } - class25.menuX = var13; + WorldMapDecoration.menuX = var13; GameShell.menuY = var14; class214.menuWidth = var7; AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22; diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index f0a41c3311..5998804d6f 100644 --- a/runescape-client/src/main/java/MidiFileReader.java +++ b/runescape-client/src/main/java/MidiFileReader.java @@ -47,8 +47,8 @@ public class MidiFileReader { void parse(byte[] var1) { this.buffer.array = var1; this.buffer.index = 10; - int var2 = this.buffer.method43(); - this.division = this.buffer.method43(); + int var2 = this.buffer.readUnsignedShort(); + this.division = this.buffer.readUnsignedShort(); this.field493 = 500000; this.trackStarts = new int[var2]; diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index fdcb9827d3..9ae3c76bc6 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -373,8 +373,8 @@ public class ModelData extends Entity { Buffer var7 = new Buffer(var1); Buffer var8 = new Buffer(var1); var2.index = var1.length - 23; - int var9 = var2.method43(); - int var10 = var2.method43(); + int var9 = var2.readUnsignedShort(); + int var10 = var2.readUnsignedShort(); int var11 = var2.readUnsignedByte(); int var12 = var2.readUnsignedByte(); int var13 = var2.readUnsignedByte(); @@ -382,11 +382,11 @@ public class ModelData extends Entity { int var15 = var2.readUnsignedByte(); int var16 = var2.readUnsignedByte(); int var17 = var2.readUnsignedByte(); - int var18 = var2.method43(); - int var19 = var2.method43(); - int var20 = var2.method43(); - int var21 = var2.method43(); - int var22 = var2.method43(); + int var18 = var2.readUnsignedShort(); + int var19 = var2.readUnsignedShort(); + int var20 = var2.readUnsignedShort(); + int var21 = var2.readUnsignedShort(); + int var22 = var2.readUnsignedShort(); int var23 = 0; int var24 = 0; int var25 = 0; @@ -565,7 +565,7 @@ public class ModelData extends Entity { var8.index = var35; for (var49 = 0; var49 < var10; ++var49) { - this.faceColors[var49] = (short)var2.method43(); + this.faceColors[var49] = (short)var2.readUnsignedShort(); if (var12 == 1) { this.field551[var49] = var3.readByte(); } @@ -583,7 +583,7 @@ public class ModelData extends Entity { } if (var16 == 1) { - this.faceTextures[var49] = (short)(var7.method43() - 1); + this.faceTextures[var49] = (short)(var7.readUnsignedShort() - 1); } if (this.textureCoords != null && this.faceTextures[var49] != -1) { @@ -651,9 +651,9 @@ public class ModelData extends Entity { for (var53 = 0; var53 < var11; ++var53) { var54 = this.textureRenderTypes[var53] & 255; if (var54 == 0) { - this.texTriangleX[var53] = (short)var2.method43(); - this.texTriangleY[var53] = (short)var2.method43(); - this.texTriangleZ[var53] = (short)var2.method43(); + this.texTriangleX[var53] = (short)var2.readUnsignedShort(); + this.texTriangleY[var53] = (short)var2.readUnsignedShort(); + this.texTriangleZ[var53] = (short)var2.readUnsignedShort(); } } @@ -661,9 +661,9 @@ public class ModelData extends Entity { var53 = var2.readUnsignedByte(); if (var53 != 0) { new ModelData0(); - var2.method43(); - var2.method43(); - var2.method43(); + var2.readUnsignedShort(); + var2.readUnsignedShort(); + var2.readUnsignedShort(); var2.readInt(); } @@ -679,18 +679,18 @@ public class ModelData extends Entity { Buffer var7 = new Buffer(var1); Buffer var8 = new Buffer(var1); var4.index = var1.length - 18; - int var9 = var4.method43(); - int var10 = var4.method43(); + int var9 = var4.readUnsignedShort(); + int var10 = var4.readUnsignedShort(); int var11 = var4.readUnsignedByte(); int var12 = var4.readUnsignedByte(); int var13 = var4.readUnsignedByte(); int var14 = var4.readUnsignedByte(); int var15 = var4.readUnsignedByte(); int var16 = var4.readUnsignedByte(); - int var17 = var4.method43(); - int var18 = var4.method43(); - int var19 = var4.method43(); - int var20 = var4.method43(); + int var17 = var4.readUnsignedShort(); + int var18 = var4.readUnsignedShort(); + int var19 = var4.readUnsignedShort(); + int var20 = var4.readUnsignedShort(); byte var21 = 0; int var22 = var21 + var9; int var23 = var22; @@ -821,7 +821,7 @@ public class ModelData extends Entity { var8.index = var25; for (var38 = 0; var38 < var10; ++var38) { - this.faceColors[var38] = (short)var4.method43(); + this.faceColors[var38] = (short)var4.readUnsignedShort(); if (var12 == 1) { var39 = var5.readUnsignedByte(); if ((var39 & 1) == 1) { @@ -912,9 +912,9 @@ public class ModelData extends Entity { for (var42 = 0; var42 < var11; ++var42) { this.textureRenderTypes[var42] = 0; - this.texTriangleX[var42] = (short)var4.method43(); - this.texTriangleY[var42] = (short)var4.method43(); - this.texTriangleZ[var42] = (short)var4.method43(); + this.texTriangleX[var42] = (short)var4.readUnsignedShort(); + this.texTriangleY[var42] = (short)var4.readUnsignedShort(); + this.texTriangleZ[var42] = (short)var4.readUnsignedShort(); } if (this.textureCoords != null) { diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index 57a5653b29..4147ba52f9 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -22,7 +22,7 @@ public class MusicTrack extends Node { MusicTrack(Buffer var1) { var1.index = var1.array.length - 3; int var2 = var1.readUnsignedByte(); - int var3 = var1.method43(); + int var3 = var1.readUnsignedShort(); int var4 = var2 * 10 + 14; var1.index = 0; int var5 = 0; diff --git a/runescape-client/src/main/java/NPCDefinition.java b/runescape-client/src/main/java/NPCDefinition.java index f62133beee..859d5d979e 100644 --- a/runescape-client/src/main/java/NPCDefinition.java +++ b/runescape-client/src/main/java/NPCDefinition.java @@ -256,25 +256,25 @@ public class NPCDefinition extends DualNode { this.archives = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.archives[var4] = var1.method43(); + this.archives[var4] = var1.readUnsignedShort(); } } else if (var2 == 2) { this.name = var1.readStringCp1252NullTerminated(); } else if (var2 == 12) { this.size = var1.readUnsignedByte(); } else if (var2 == 13) { - this.idleSequence = var1.method43(); + this.idleSequence = var1.readUnsignedShort(); } else if (var2 == 14) { - this.walkSequence = var1.method43(); + this.walkSequence = var1.readUnsignedShort(); } else if (var2 == 15) { - this.turnLeftSequence = var1.method43(); + this.turnLeftSequence = var1.readUnsignedShort(); } else if (var2 == 16) { - this.turnRightSequence = var1.method43(); + this.turnRightSequence = var1.readUnsignedShort(); } else if (var2 == 17) { - this.walkSequence = var1.method43(); - this.walkTurnSequence = var1.method43(); - this.walkTurnLeftSequence = var1.method43(); - this.walkTurnRightSequence = var1.method43(); + this.walkSequence = var1.readUnsignedShort(); + this.walkTurnSequence = var1.readUnsignedShort(); + this.walkTurnLeftSequence = var1.readUnsignedShort(); + this.walkTurnRightSequence = var1.readUnsignedShort(); } else if (var2 >= 30 && var2 < 35) { this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { @@ -286,8 +286,8 @@ public class NPCDefinition extends DualNode { this.recolorTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.method43(); - this.recolorTo[var4] = (short)var1.method43(); + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); + this.recolorTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 == 41) { var3 = var1.readUnsignedByte(); @@ -295,24 +295,24 @@ public class NPCDefinition extends DualNode { this.retextureTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.method43(); - this.retextureTo[var4] = (short)var1.method43(); + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 == 60) { var3 = var1.readUnsignedByte(); this.field636 = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.field636[var4] = var1.method43(); + this.field636[var4] = var1.readUnsignedShort(); } } else if (var2 == 93) { this.drawMapDot = false; } else if (var2 == 95) { - this.combatLevel = var1.method43(); + this.combatLevel = var1.readUnsignedShort(); } else if (var2 == 97) { - this.widthScale = var1.method43(); + this.widthScale = var1.readUnsignedShort(); } else if (var2 == 98) { - this.heightScale = var1.method43(); + this.heightScale = var1.readUnsignedShort(); } else if (var2 == 99) { this.isVisible = true; } else if (var2 == 100) { @@ -320,9 +320,9 @@ public class NPCDefinition extends DualNode { } else if (var2 == 101) { this.field638 = var1.readByte(); } else if (var2 == 102) { - this.headIconPrayer = var1.method43(); + this.headIconPrayer = var1.readUnsignedShort(); } else if (var2 == 103) { - this.field639 = var1.method43(); + this.field639 = var1.readUnsignedShort(); } else if (var2 != 106 && var2 != 118) { if (var2 == 107) { this.isInteractable = false; @@ -334,19 +334,19 @@ public class NPCDefinition extends DualNode { this.params = AbstractIndexCache.readStringIntParameters(var1, this.params); } } else { - this.transformVarbit = var1.method43(); + this.transformVarbit = var1.readUnsignedShort(); if (this.transformVarbit == 65535) { this.transformVarbit = -1; } - this.transformVarp = var1.method43(); + this.transformVarp = var1.readUnsignedShort(); if (this.transformVarp == 65535) { this.transformVarp = -1; } var3 = -1; if (var2 == 118) { - var3 = var1.method43(); + var3 = var1.readUnsignedShort(); if (var3 == 65535) { var3 = -1; } @@ -356,7 +356,7 @@ public class NPCDefinition extends DualNode { this.transforms = new int[var4 + 2]; for (int var5 = 0; var5 <= var4; ++var5) { - this.transforms[var5] = var1.method43(); + this.transforms[var5] = var1.readUnsignedShort(); if (this.transforms[var5] == 65535) { this.transforms[var5] = -1; } diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index 546c84679e..47fa02edef 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -351,7 +351,7 @@ public class ObjectDefinition extends DualNode { this.field644 = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.field644[var4] = var1.method43(); + this.field644[var4] = var1.readUnsignedShort(); this.field645[var4] = var1.readUnsignedByte(); } } @@ -368,7 +368,7 @@ public class ObjectDefinition extends DualNode { this.field644 = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.field644[var4] = var1.method43(); + this.field644[var4] = var1.readUnsignedShort(); } } } @@ -390,7 +390,7 @@ public class ObjectDefinition extends DualNode { } else if (var2 == 23) { this.modelClipped = true; } else if (var2 == 24) { - this.animationId = var1.method43(); + this.animationId = var1.readUnsignedShort(); if (this.animationId == 65535) { this.animationId = -1; } @@ -413,8 +413,8 @@ public class ObjectDefinition extends DualNode { this.recolorTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.method43(); - this.recolorTo[var4] = (short)var1.method43(); + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); + this.recolorTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 == 41) { var3 = var1.readUnsignedByte(); @@ -422,21 +422,21 @@ public class ObjectDefinition extends DualNode { this.retextureTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.method43(); - this.retextureTo[var4] = (short)var1.method43(); + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 == 62) { this.isRotated = true; } else if (var2 == 64) { this.clipped = false; } else if (var2 == 65) { - this.modelSizeX = var1.method43(); + this.modelSizeX = var1.readUnsignedShort(); } else if (var2 == 66) { - this.modelHeight = var1.method43(); + this.modelHeight = var1.readUnsignedShort(); } else if (var2 == 67) { - this.modelSizeY = var1.method43(); + this.modelSizeY = var1.readUnsignedShort(); } else if (var2 == 68) { - this.mapSceneId = var1.method43(); + this.mapSceneId = var1.readUnsignedShort(); } else if (var2 == 69) { var1.readUnsignedByte(); } else if (var2 == 70) { @@ -453,39 +453,39 @@ public class ObjectDefinition extends DualNode { this.int3 = var1.readUnsignedByte(); } else if (var2 != 77 && var2 != 92) { if (var2 == 78) { - this.ambientSoundId = var1.method43(); + this.ambientSoundId = var1.readUnsignedShort(); this.int4 = var1.readUnsignedByte(); } else if (var2 == 79) { - this.int5 = var1.method43(); - this.int6 = var1.method43(); + this.int5 = var1.readUnsignedShort(); + this.int6 = var1.readUnsignedShort(); this.int4 = var1.readUnsignedByte(); var3 = var1.readUnsignedByte(); this.field646 = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.field646[var4] = var1.method43(); + this.field646[var4] = var1.readUnsignedShort(); } } else if (var2 == 81) { this.clipType = var1.readUnsignedByte() * 256; } else if (var2 == 82) { - this.mapIconId = var1.method43(); + this.mapIconId = var1.readUnsignedShort(); } else if (var2 == 249) { this.params = AbstractIndexCache.readStringIntParameters(var1, this.params); } } else { - this.transformVarbit = var1.method43(); + this.transformVarbit = var1.readUnsignedShort(); if (this.transformVarbit == 65535) { this.transformVarbit = -1; } - this.transformConfigId = var1.method43(); + this.transformConfigId = var1.readUnsignedShort(); if (this.transformConfigId == 65535) { this.transformConfigId = -1; } var3 = -1; if (var2 == 92) { - var3 = var1.method43(); + var3 = var1.readUnsignedShort(); if (var3 == 65535) { var3 = -1; } @@ -495,7 +495,7 @@ public class ObjectDefinition extends DualNode { this.transforms = new int[var4 + 2]; for (int var5 = 0; var5 <= var4; ++var5) { - this.transforms[var5] = var1.method43(); + this.transforms[var5] = var1.readUnsignedShort(); if (this.transforms[var5] == 65535) { this.transforms[var5] = -1; } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index 144bc43c11..0569ab5f5c 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -140,14 +140,14 @@ public final class Occluder { Script var1 = new Script(); Buffer var2 = new Buffer(var0); var2.index = var2.array.length - 2; - int var3 = var2.method43(); + int var3 = var2.readUnsignedShort(); int var4 = var2.array.length - 2 - var3 - 12; var2.index = var4; int var5 = var2.readInt(); - var1.localIntCount = var2.method43(); - var1.localStringCount = var2.method43(); - var1.intArgumentCount = var2.method43(); - var1.stringArgumentCount = var2.method43(); + var1.localIntCount = var2.readUnsignedShort(); + var1.localStringCount = var2.readUnsignedShort(); + var1.intArgumentCount = var2.readUnsignedShort(); + var1.stringArgumentCount = var2.readUnsignedShort(); int var6 = var2.readUnsignedByte(); int var7; int var8; @@ -155,7 +155,7 @@ public final class Occluder { var1.switches = var1.method302(var6); for (var7 = 0; var7 < var6; ++var7) { - var8 = var2.method43(); + var8 = var2.readUnsignedShort(); IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? World.method1759(var8) : 1); var1.switches[var7] = var9; @@ -174,7 +174,7 @@ public final class Occluder { var1.stringOperands = new String[var5]; for (var7 = 0; var2.index < var4; var1.opcodes[var7++] = var8) { - var8 = var2.method43(); + var8 = var2.readUnsignedShort(); if (var8 == 3) { var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { diff --git a/runescape-client/src/main/java/class68.java b/runescape-client/src/main/java/PendingSpawn.java similarity index 88% rename from runescape-client/src/main/java/class68.java rename to runescape-client/src/main/java/PendingSpawn.java index 6d86c0cc52..8e4e90b17d 100644 --- a/runescape-client/src/main/java/class68.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -1,30 +1,36 @@ 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("bi") -public final class class68 extends Node { +@Implements("PendingSpawn") +public final class PendingSpawn extends Node { @ObfuscatedName("m") @ObfuscatedGetter( intValue = 1439936951 ) - int field911; + @Export("level") + int level; @ObfuscatedName("f") @ObfuscatedGetter( intValue = -1471611383 ) - int field906; + @Export("type") + int type; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 1059464897 ) - int field913; + @Export("x") + int x; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -1306474107 ) - int field901; + @Export("y") + int y; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -1889242993 @@ -44,12 +50,14 @@ public final class class68 extends Node { @ObfuscatedGetter( intValue = 1986990761 ) - int field899; + @Export("id") + int id; @ObfuscatedName("e") @ObfuscatedGetter( intValue = 1768602131 ) - int field907; + @Export("orientation") + int orientation; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 1989829133 @@ -59,16 +67,18 @@ public final class class68 extends Node { @ObfuscatedGetter( intValue = -715662659 ) - int field909; + @Export("delay") + int delay; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -2141472019 ) - int field910; + @Export("hitpoints") + int hitpoints; - class68() { - this.field909 = 0; - this.field910 = -1; + PendingSpawn() { + this.delay = 0; + this.hitpoints = -1; } @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 4c3021db70..2845a48a04 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -209,7 +209,7 @@ public final class Player extends Actor { var6 = var1.readUnsignedByte(); var4[var7] = var6 + (var5 << 8); if (var7 == 0 && var4[0] == 65535) { - var3 = var1.method43(); + var3 = var1.readUnsignedShort(); break; } @@ -233,38 +233,38 @@ public final class Player extends Actor { var9[var5] = var6; } - super.idleSequence = var1.method43(); + super.idleSequence = var1.readUnsignedShort(); if (super.idleSequence == 65535) { super.idleSequence = -1; } - super.turnLeftSequence = var1.method43(); + super.turnLeftSequence = var1.readUnsignedShort(); if (super.turnLeftSequence == 65535) { super.turnLeftSequence = -1; } super.turnRightSequence = super.turnLeftSequence; - super.walkSequence = var1.method43(); + super.walkSequence = var1.readUnsignedShort(); if (super.walkSequence == 65535) { super.walkSequence = -1; } - super.walkTurnSequence = var1.method43(); + super.walkTurnSequence = var1.readUnsignedShort(); if (super.walkTurnSequence == 65535) { super.walkTurnSequence = -1; } - super.walkTurnLeftSequence = var1.method43(); + super.walkTurnLeftSequence = var1.readUnsignedShort(); if (super.walkTurnLeftSequence == 65535) { super.walkTurnLeftSequence = -1; } - super.walkTurnRightSequence = var1.method43(); + super.walkTurnRightSequence = var1.readUnsignedShort(); if (super.walkTurnRightSequence == 65535) { super.walkTurnRightSequence = -1; } - super.runSequence = var1.method43(); + super.runSequence = var1.readUnsignedShort(); if (super.runSequence == 65535) { super.runSequence = -1; } @@ -277,7 +277,7 @@ public final class Player extends Actor { } this.combatLevel = var1.readUnsignedByte(); - this.skillLevel = var1.method43(); + this.skillLevel = var1.readUnsignedShort(); this.isHidden = var1.readUnsignedByte() == 1; if (Client.gameBuild == 0 && Client.rights >= 2) { this.isHidden = false; diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java index bc18190bc9..59bb5ca93b 100644 --- a/runescape-client/src/main/java/PlayerAppearance.java +++ b/runescape-client/src/main/java/PlayerAppearance.java @@ -55,7 +55,7 @@ public class PlayerAppearance { for (int var5 = 0; var5 < 7; ++var5) { for (int var6 = 0; var6 < KitDefinition.field457; ++var6) { KitDefinition var7 = WorldMapSection1.getKitDefinition(var6); - if (var7 != null && !var7.field460 && var5 + (var3 ? 7 : 0) == var7.field458) { + if (var7 != null && !var7.nonSelectable && var5 + (var3 ? 7 : 0) == var7.bodypartID) { var1[field727[var5]] = var6 + 256; break; } @@ -99,8 +99,8 @@ public class PlayerAppearance { var4 = WorldMapSection1.getKitDefinition(var3); } while(var4 == null); - } while(var4.field460); - } while(var1 + (this.isFemale ? 7 : 0) != var4.field458); + } while(var4.nonSelectable); + } while(var1 + (this.isFemale ? 7 : 0) != var4.bodypartID); this.equipment[field727[var1]] = var3 + 256; this.setHash(); @@ -254,7 +254,7 @@ public class PlayerAppearance { int var10; for (int var11 = 0; var11 < 12; ++var11) { var10 = var7[var11]; - if (var10 >= 256 && var10 < 512 && !WorldMapSection1.getKitDefinition(var10 - 256).method159()) { + if (var10 >= 256 && var10 < 512 && !WorldMapSection1.getKitDefinition(var10 - 256).ready()) { var9 = true; } @@ -282,7 +282,7 @@ public class PlayerAppearance { var12 = var7[var13]; ModelData var14; if (var12 >= 256 && var12 < 512) { - var14 = WorldMapSection1.getKitDefinition(var12 - 256).method160(); + var14 = WorldMapSection1.getKitDefinition(var12 - 256).getModelData(); if (var14 != null) { var17[var10++] = var14; } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index 328851d6dc..2238fe002f 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -195,7 +195,7 @@ public class ScriptEvent extends Node { return 1; } else if (var0 == 3304) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class231.method4523(var3).size; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapDecorationType.method4523(var3).size; return 1; } else if (var0 == 3305) { var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; @@ -341,9 +341,9 @@ public class ScriptEvent extends Node { garbageValue = "35" ) static final void method1179() { - for (class68 var0 = (class68)Client.field214.last(); var0 != null; var0 = (class68)Client.field214.previous()) { - if (var0.field910 == -1) { - var0.field909 = 0; + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0.hitpoints == -1) { + var0.delay = 0; class13.method165(var0); } else { var0.remove(); diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 3e02c0905e..e976ebcffa 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -86,7 +86,7 @@ public class SecureRandomCallable implements Callable { } } - var5 = class214.menuWidth / 2 + class25.menuX; + var5 = class214.menuWidth / 2 + WorldMapDecoration.menuX; var6 = GameShell.menuY; int var7 = class2.fontBold12.stringWidth("Choose Option"); @@ -128,7 +128,7 @@ public class SecureRandomCallable implements Callable { var13 = 0; } - class25.menuX = var12; + WorldMapDecoration.menuX = var12; GameShell.menuY = var13; class214.menuWidth = var7; AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22; diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index 555ecbd1df..134ea54929 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -133,25 +133,25 @@ public class SequenceDefinition extends DualNode { int var3; int var4; if (var2 == 1) { - var3 = var1.method43(); + var3 = var1.readUnsignedShort(); this.frameLengths = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.frameLengths[var4] = var1.method43(); + this.frameLengths[var4] = var1.readUnsignedShort(); } this.frameIds = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.frameIds[var4] = var1.method43(); + this.frameIds[var4] = var1.readUnsignedShort(); } for (var4 = 0; var4 < var3; ++var4) { var10000 = this.frameIds; - var10000[var4] += var1.method43() << 16; + var10000[var4] += var1.readUnsignedShort() << 16; } } else if (var2 == 2) { - this.frameCount = var1.method43(); + this.frameCount = var1.readUnsignedShort(); } else if (var2 == 3) { var3 = var1.readUnsignedByte(); this.field777 = new int[var3 + 1]; @@ -166,9 +166,9 @@ public class SequenceDefinition extends DualNode { } else if (var2 == 5) { this.field779 = var1.readUnsignedByte(); } else if (var2 == 6) { - this.shield = var1.method43(); + this.shield = var1.readUnsignedShort(); } else if (var2 == 7) { - this.weapon = var1.method43(); + this.weapon = var1.readUnsignedShort(); } else if (var2 == 8) { this.field780 = var1.readUnsignedByte(); } else if (var2 == 9) { @@ -182,12 +182,12 @@ public class SequenceDefinition extends DualNode { this.frameIds2 = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.frameIds2[var4] = var1.method43(); + this.frameIds2[var4] = var1.readUnsignedShort(); } for (var4 = 0; var4 < var3; ++var4) { var10000 = this.frameIds2; - var10000[var4] += var1.method43() << 16; + var10000[var4] += var1.readUnsignedShort() << 16; } } else if (var2 == 13) { var3 = var1.readUnsignedByte(); diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index 631add0a0c..6226bf1571 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -34,8 +34,8 @@ public class SoundEffect { } } - this.start = var1.method43(); - this.end = var1.method43(); + this.start = var1.readUnsignedShort(); + this.end = var1.readUnsignedShort(); } @ObfuscatedName("f") diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java index b5d494def3..dcbf6c0597 100644 --- a/runescape-client/src/main/java/SoundEnvelope.java +++ b/runescape-client/src/main/java/SoundEnvelope.java @@ -73,8 +73,8 @@ public class SoundEnvelope { this.phases = new int[this.segments]; for (int var2 = 0; var2 < this.segments; ++var2) { - this.durations[var2] = var1.method43(); - this.phases[var2] = var1.method43(); + this.durations[var2] = var1.readUnsignedShort(); + this.phases[var2] = var1.readUnsignedShort(); } } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index cc37a677b7..b9d3951b01 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -124,15 +124,15 @@ public class SpotAnimationDefinition extends DualNode { @Export("readNext") void readNext(Buffer var1, int var2) { if (var2 == 1) { - this.archive = var1.method43(); + this.archive = var1.readUnsignedShort(); } else if (var2 == 2) { - this.sequence = var1.method43(); + this.sequence = var1.readUnsignedShort(); } else if (var2 == 4) { - this.widthScale = var1.method43(); + this.widthScale = var1.readUnsignedShort(); } else if (var2 == 5) { - this.heightScale = var1.method43(); + this.heightScale = var1.readUnsignedShort(); } else if (var2 == 6) { - this.orientation = var1.method43(); + this.orientation = var1.readUnsignedShort(); } else if (var2 == 7) { this.field876 = var1.readUnsignedByte(); } else if (var2 == 8) { @@ -146,8 +146,8 @@ public class SpotAnimationDefinition extends DualNode { this.recolorTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.method43(); - this.recolorTo[var4] = (short)var1.method43(); + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); + this.recolorTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 == 41) { var3 = var1.readUnsignedByte(); @@ -155,8 +155,8 @@ public class SpotAnimationDefinition extends DualNode { this.retextureTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.method43(); - this.retextureTo[var4] = (short)var1.method43(); + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); } } } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index cc4f89e197..ce5b8d8384 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -41,7 +41,7 @@ public class Texture extends Node { ) Texture(Buffer var1) { this.isLoaded = false; - this.int1 = var1.method43(); + this.int1 = var1.readUnsignedShort(); this.field893 = var1.readUnsignedByte() == 1; int var2 = var1.readUnsignedByte(); if (var2 >= 1 && var2 <= 4) { @@ -49,7 +49,7 @@ public class Texture extends Node { int var3; for (var3 = 0; var3 < var2; ++var3) { - this.records[var3] = var1.method43(); + this.records[var3] = var1.readUnsignedShort(); } if (var2 > 1) { diff --git a/runescape-client/src/main/java/VarbitDefinition.java b/runescape-client/src/main/java/VarbitDefinition.java index 6479d49090..3f2d265505 100644 --- a/runescape-client/src/main/java/VarbitDefinition.java +++ b/runescape-client/src/main/java/VarbitDefinition.java @@ -66,7 +66,7 @@ public class VarbitDefinition extends DualNode { @Export("readNext") void readNext(Buffer var1, int var2) { if (var2 == 1) { - this.varp = var1.method43(); + this.varp = var1.readUnsignedShort(); this.lowBit = var1.readUnsignedByte(); this.highBit = var1.readUnsignedByte(); } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index 5813666fd3..bd18c01a0c 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -285,7 +285,7 @@ public class Varcs { int var8; int var9; if (var5 >= 2) { - var9 = var25.method43(); + var9 = var25.readUnsignedShort(); var6 = 0; while (true) { @@ -293,7 +293,7 @@ public class Varcs { break label225; } - var7 = var25.method43(); + var7 = var25.readUnsignedShort(); var8 = var25.readUnsignedByte(); class3 var10 = (class3)ScriptFrame.findEnumerated(class3.method34(), var8); Object var11 = var10.method31(var25); @@ -304,17 +304,17 @@ public class Varcs { ++var6; } } else { - var9 = var25.method43(); + var9 = var25.readUnsignedShort(); for (var6 = 0; var6 < var9; ++var6) { - var7 = var25.method43(); + var7 = var25.readUnsignedShort(); var8 = var25.readInt(); if (this.intsPersistence[var7]) { this.map.put(var7, var8); } } - var6 = var25.method43(); + var6 = var25.readUnsignedShort(); var7 = 0; while (true) { @@ -322,7 +322,7 @@ public class Varcs { break label225; } - var25.method43(); + var25.readUnsignedShort(); var25.readStringCp1252NullTerminated(); ++var7; } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index 658062221e..b650c9347c 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -59,7 +59,7 @@ public class VarpDefinition extends DualNode { @Export("readNext") void readNext(Buffer var1, int var2) { if (var2 == 5) { - this.type = var1.method43(); + this.type = var1.readUnsignedShort(); } } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 46cb448535..f29255a2e9 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -792,20 +792,20 @@ public class Widget extends Node { this.isIf3 = false; this.type = var1.readUnsignedByte(); this.buttonType = var1.readUnsignedByte(); - this.contentType = var1.method43(); + this.contentType = var1.readUnsignedShort(); this.rawX = var1.method44(); this.rawY = var1.method44(); - this.rawWidth = var1.method43(); - this.rawHeight = var1.method43(); + this.rawWidth = var1.readUnsignedShort(); + this.rawHeight = var1.readUnsignedShort(); this.transparency = var1.readUnsignedByte(); - this.parentId = var1.method43(); + this.parentId = var1.readUnsignedShort(); if (this.parentId == 65535) { this.parentId = -1; } else { this.parentId += this.id & -65536; } - this.mouseOverRedirect = var1.method43(); + this.mouseOverRedirect = var1.readUnsignedShort(); if (this.mouseOverRedirect == 65535) { this.mouseOverRedirect = -1; } @@ -818,7 +818,7 @@ public class Widget extends Node { for (var3 = 0; var3 < var2; ++var3) { this.cs1Comparisons[var3] = var1.readUnsignedByte(); - this.cs1ComparisonValues[var3] = var1.method43(); + this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); } } @@ -830,11 +830,11 @@ public class Widget extends Node { this.cs1Instructions = new int[var3][]; for (var4 = 0; var4 < var3; ++var4) { - var5 = var1.method43(); + var5 = var1.readUnsignedShort(); this.cs1Instructions[var4] = new int[var5]; for (var6 = 0; var6 < var5; ++var6) { - this.cs1Instructions[var4][var6] = var1.method43(); + this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); if (this.cs1Instructions[var4][var6] == 65535) { this.cs1Instructions[var4][var6] = -1; } @@ -843,12 +843,12 @@ public class Widget extends Node { } if (this.type == 0) { - this.scrollHeight = var1.method43(); + this.scrollHeight = var1.readUnsignedShort(); this.isHidden = var1.readUnsignedByte() == 1; } if (this.type == 1) { - var1.method43(); + var1.readUnsignedShort(); var1.readUnsignedByte(); } @@ -912,7 +912,7 @@ public class Widget extends Node { this.textXAlignment = var1.readUnsignedByte(); this.textYAlignment = var1.readUnsignedByte(); this.textLineHeight = var1.readUnsignedByte(); - this.fontId = var1.method43(); + this.fontId = var1.readUnsignedShort(); if (this.fontId == 65535) { this.fontId = -1; } @@ -942,37 +942,37 @@ public class Widget extends Node { if (this.type == 6) { this.modelType = 1; - this.modelId = var1.method43(); + this.modelId = var1.readUnsignedShort(); if (this.modelId == 65535) { this.modelId = -1; } this.modelType2 = 1; - this.modelId2 = var1.method43(); + this.modelId2 = var1.readUnsignedShort(); if (this.modelId2 == 65535) { this.modelId2 = -1; } - this.sequenceId = var1.method43(); + this.sequenceId = var1.readUnsignedShort(); if (this.sequenceId == 65535) { this.sequenceId = -1; } - this.sequenceId2 = var1.method43(); + this.sequenceId2 = var1.readUnsignedShort(); if (this.sequenceId2 == 65535) { this.sequenceId2 = -1; } - this.modelZoom = var1.method43(); - this.modelAngleX = var1.method43(); - this.modelAngleY = var1.method43(); + this.modelZoom = var1.readUnsignedShort(); + this.modelAngleX = var1.readUnsignedShort(); + this.modelAngleY = var1.readUnsignedShort(); } if (this.type == 7) { this.itemIds = new int[this.rawHeight * this.rawWidth]; this.itemQuantities = new int[this.rawWidth * this.rawHeight]; this.textXAlignment = var1.readUnsignedByte(); - this.fontId = var1.method43(); + this.fontId = var1.readUnsignedShort(); if (this.fontId == 65535) { this.fontId = -1; } @@ -1004,7 +1004,7 @@ public class Widget extends Node { if (this.buttonType == 2 || this.type == 2) { this.spellActionName = var1.readStringCp1252NullTerminated(); this.spellName = var1.readStringCp1252NullTerminated(); - var4 = var1.method43() & 63; + var4 = var1.readUnsignedShort() & 63; this.clickMask |= var4 << 11; } @@ -1049,21 +1049,21 @@ public class Widget extends Node { var1.readUnsignedByte(); this.isIf3 = true; this.type = var1.readUnsignedByte(); - this.contentType = var1.method43(); + this.contentType = var1.readUnsignedShort(); this.rawX = var1.method44(); this.rawY = var1.method44(); - this.rawWidth = var1.method43(); + this.rawWidth = var1.readUnsignedShort(); if (this.type == 9) { this.rawHeight = var1.method44(); } else { - this.rawHeight = var1.method43(); + this.rawHeight = var1.readUnsignedShort(); } this.widthAlignment = var1.readByte(); this.heightAlignment = var1.readByte(); this.xAlignment = var1.readByte(); this.yAlignment = var1.readByte(); - this.parentId = var1.method43(); + this.parentId = var1.readUnsignedShort(); if (this.parentId == 65535) { this.parentId = -1; } else { @@ -1072,14 +1072,14 @@ public class Widget extends Node { this.isHidden = var1.readUnsignedByte() == 1; if (this.type == 0) { - this.scrollWidth = var1.method43(); - this.scrollHeight = var1.method43(); + this.scrollWidth = var1.readUnsignedShort(); + this.scrollHeight = var1.readUnsignedShort(); this.noClickThrough = var1.readUnsignedByte() == 1; } if (this.type == 5) { this.spriteId2 = var1.readInt(); - this.spriteAngle = var1.method43(); + this.spriteAngle = var1.readUnsignedShort(); this.spriteTiling = var1.readUnsignedByte() == 1; this.transparency = var1.readUnsignedByte(); this.outline = var1.readUnsignedByte(); @@ -1090,35 +1090,35 @@ public class Widget extends Node { if (this.type == 6) { this.modelType = 1; - this.modelId = var1.method43(); + this.modelId = var1.readUnsignedShort(); if (this.modelId == 65535) { this.modelId = -1; } this.modelOffsetX = var1.method44(); this.modelOffsetY = var1.method44(); - this.modelAngleX = var1.method43(); - this.modelAngleY = var1.method43(); - this.modelAngleZ = var1.method43(); - this.modelZoom = var1.method43(); - this.sequenceId = var1.method43(); + this.modelAngleX = var1.readUnsignedShort(); + this.modelAngleY = var1.readUnsignedShort(); + this.modelAngleZ = var1.readUnsignedShort(); + this.modelZoom = var1.readUnsignedShort(); + this.sequenceId = var1.readUnsignedShort(); if (this.sequenceId == 65535) { this.sequenceId = -1; } this.modelOrthog = var1.readUnsignedByte() == 1; - var1.method43(); + var1.readUnsignedShort(); if (this.widthAlignment != 0) { - this.field962 = var1.method43(); + this.field962 = var1.readUnsignedShort(); } if (this.heightAlignment != 0) { - var1.method43(); + var1.readUnsignedShort(); } } if (this.type == 4) { - this.fontId = var1.method43(); + this.fontId = var1.readUnsignedShort(); if (this.fontId == 65535) { this.fontId = -1; } diff --git a/runescape-client/src/main/java/WorldComparator.java b/runescape-client/src/main/java/WorldComparator.java index b186520c8a..c254ab0fe5 100644 --- a/runescape-client/src/main/java/WorldComparator.java +++ b/runescape-client/src/main/java/WorldComparator.java @@ -93,7 +93,7 @@ final class WorldComparator implements Comparator { } if ((var4 & 32) != 0) { - var5 = var0.method43(); + var5 = var0.readUnsignedShort(); if (var5 == 65535) { var5 = -1; } @@ -122,7 +122,7 @@ final class WorldComparator implements Comparator { } if ((var4 & 4) != 0) { - var3.definition = ObjectDefinition.getNpcDefinition(var0.method43()); + var3.definition = ObjectDefinition.getNpcDefinition(var0.readUnsignedShort()); var3.size = var3.definition.size; var3.field23 = var3.definition.field639; var3.walkSequence = var3.definition.walkSequence; diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 6c7931c721..92be204da6 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -23,7 +23,7 @@ public class WorldMapAreaData extends WorldMapArea { ) void method387(Buffer var1, Buffer var2, int var3, boolean var4) { this.read(var1, var3); - int var5 = var2.method43(); + int var5 = var2.readUnsignedShort(); this.field1016 = new HashSet(var5); int var6; @@ -39,7 +39,7 @@ public class WorldMapAreaData extends WorldMapArea { this.field1016.add(var7); } - var6 = var2.method43(); + var6 = var2.readUnsignedShort(); this.field1017 = new HashSet(var6); for (int var12 = 0; var12 < var6; ++var12) { @@ -64,7 +64,7 @@ public class WorldMapAreaData extends WorldMapArea { ) void method388(Buffer var1, boolean var2) { this.field1018 = new LinkedList(); - int var3 = var1.method43(); + int var3 = var1.readUnsignedShort(); for (int var4 = 0; var4 < var3; ++var4) { int var5 = var1.method51(); @@ -106,7 +106,7 @@ public class WorldMapAreaData extends WorldMapArea { garbageValue = "-1767097678" ) public static boolean method711(int var0) { - return var0 >= class231.field2810.field2820 && var0 <= class231.field2822.field2820; + return var0 >= WorldMapDecorationType.field2810.id && var0 <= WorldMapDecorationType.field2822.id; } @ObfuscatedName("u") diff --git a/runescape-client/src/main/java/class25.java b/runescape-client/src/main/java/WorldMapDecoration.java similarity index 84% rename from runescape-client/src/main/java/class25.java rename to runescape-client/src/main/java/WorldMapDecoration.java index c34dc39d8b..fd15e8530c 100644 --- a/runescape-client/src/main/java/class25.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -1,10 +1,13 @@ 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("v") -public class class25 { +@Implements("WorldMapDecoration") +public class WorldMapDecoration +{ @ObfuscatedName("dd") @ObfuscatedSignature( signature = "Lit;" @@ -21,22 +24,25 @@ public class class25 { @ObfuscatedGetter( intValue = 916624935 ) - final int field199; + @Export("objectDefinitionId") + final int objectDefinitionId; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 1452888767 ) - final int field198; + @Export("decoration") + final int decoration; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -501025733 ) - final int field202; + @Export("rotation") + final int rotation; - class25(int var1, int var2, int var3) { - this.field199 = var1; - this.field198 = var2; - this.field202 = var3; + WorldMapDecoration(int var1, int var2, int var3) { + this.objectDefinitionId = var1; + this.decoration = var2; + this.rotation = var3; } @ObfuscatedName("j") diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/WorldMapDecorationType.java similarity index 93% rename from runescape-client/src/main/java/class231.java rename to runescape-client/src/main/java/WorldMapDecorationType.java index 7b7a13dd4e..fd5ef00171 100644 --- a/runescape-client/src/main/java/class231.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -1,10 +1,12 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hb") -public enum class231 implements Enumerated { +@Implements("WorldMapDecorationType") +public enum WorldMapDecorationType implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lhb;" @@ -132,14 +134,15 @@ public enum class231 implements Enumerated { @ObfuscatedGetter( intValue = 899733687 ) - public final int field2820; + @Export("id") + public final int id; @ObfuscatedSignature( signature = "(II)V", garbageValue = "0" ) - private class231(int var3, int var4) { - this.field2820 = var3; + private WorldMapDecorationType(int var3, int var4) { + this.id = var3; } @ObfuscatedName("f") @@ -149,7 +152,7 @@ public enum class231 implements Enumerated { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field2820; + return this.id; } @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index e890251192..62870b4599 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -196,7 +196,7 @@ public class WorldMapElement extends DualNode { } else if (var2 == 18) { var1.method51(); } else if (var2 == 19) { - this.category = var1.method43(); + this.category = var1.readUnsignedShort(); } else if (var2 == 21) { var1.readInt(); } else if (var2 == 22) { diff --git a/runescape-client/src/main/java/WorldMapIcon1.java b/runescape-client/src/main/java/WorldMapIcon1.java index a672e3263f..e4b4df12a8 100644 --- a/runescape-client/src/main/java/WorldMapIcon1.java +++ b/runescape-client/src/main/java/WorldMapIcon1.java @@ -126,7 +126,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { SoundEffect var10 = Client.soundEffects[var0]; if (var10 == null) { Object var2 = null; - var10 = SoundEffect.readSoundEffect(class25.indexCache4, Client.soundEffectIds[var0], 0); + var10 = SoundEffect.readSoundEffect(WorldMapDecoration.indexCache4, Client.soundEffectIds[var0], 0); if (var10 == null) { continue; } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 1abebbf4d6..4d8247b51b 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -126,16 +126,16 @@ public class WorldMapRegion { label66: for (int var7 = var2; var7 < var2 + var4; ++var7) { for (int var8 = 0; var8 < var5.field156; ++var8) { - class25[] var9 = var5.field144[var8][var6][var7]; + WorldMapDecoration[] var9 = var5.field144[var8][var6][var7]; if (var9 != null && var9.length != 0) { - class25[] var10 = var9; + WorldMapDecoration[] var10 = var9; for (int var11 = 0; var11 < var10.length; ++var11) { ObjectDefinition var12; boolean var13; label57: { - class25 var14 = var10[var11]; - var12 = class50.getObjectDefinition(var14.field199); + WorldMapDecoration var14 = var10[var11]; + var12 = class50.getObjectDefinition(var14.objectDefinitionId); if (var12.transforms != null) { int[] var15 = var12.transforms; @@ -655,14 +655,14 @@ public class WorldMapRegion { ) void method464(int var1, int var2, class21 var3, IndexedSprite[] var4) { for (int var5 = 0; var5 < var3.field156; ++var5) { - class25[] var6 = var3.field144[var5][var1][var2]; + WorldMapDecoration[] var6 = var3.field144[var5][var1][var2]; if (var6 != null && var6.length != 0) { - class25[] var7 = var6; + WorldMapDecoration[] var7 = var6; for (int var8 = 0; var8 < var7.length; ++var8) { - class25 var9 = var7[var8]; - if (WorldMapAreaData.method711(var9.field198) || class1.method19(var9.field198)) { - ObjectDefinition var10 = class50.getObjectDefinition(var9.field199); + WorldMapDecoration var9 = var7[var8]; + if (WorldMapAreaData.method711(var9.decoration) || class1.method19(var9.decoration)) { + ObjectDefinition var10 = class50.getObjectDefinition(var9.objectDefinitionId); if (var10.mapSceneId != -1) { if (var10.mapSceneId != 46 && var10.mapSceneId != 52) { var4[var10.mapSceneId].method135(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054 * 2, this.field1054 * 2); @@ -684,46 +684,46 @@ public class WorldMapRegion { ) void method465(int var1, int var2, class21 var3) { for (int var4 = 0; var4 < var3.field156; ++var4) { - class25[] var5 = var3.field144[var4][var1][var2]; + WorldMapDecoration[] var5 = var3.field144[var4][var1][var2]; if (var5 != null && var5.length != 0) { - class25[] var6 = var5; + WorldMapDecoration[] var6 = var5; for (int var7 = 0; var7 < var6.length; ++var7) { - class25 var8 = var6[var7]; - int var9 = var8.field198; - boolean var10 = var9 >= class231.field2805.field2820 && var9 <= class231.field2804.field2820 || var9 == class231.field2806.field2820; + WorldMapDecoration var8 = var6[var7]; + int var9 = var8.decoration; + boolean var10 = var9 >= WorldMapDecorationType.field2805.id && var9 <= WorldMapDecorationType.field2804.id || var9 == WorldMapDecorationType.field2806.id; if (var10) { - ObjectDefinition var11 = class50.getObjectDefinition(var8.field199); + ObjectDefinition var11 = class50.getObjectDefinition(var8.objectDefinitionId); int var12 = var11.int1 != 0 ? 0xffcc0000 : 0xffcccccc; - if (var8.field198 == class231.field2805.field2820) { - this.method422(var1, var2, var8.field202, var12); + if (var8.decoration == WorldMapDecorationType.field2805.id) { + this.method422(var1, var2, var8.rotation, var12); } - if (var8.field198 == class231.field2813.field2820) { - this.method422(var1, var2, var8.field202, 0xffcccccc); - this.method422(var1, var2, var8.field202 + 1, var12); + if (var8.decoration == WorldMapDecorationType.field2813.id) { + this.method422(var1, var2, var8.rotation, 0xffcccccc); + this.method422(var1, var2, var8.rotation + 1, var12); } - if (var8.field198 == class231.field2804.field2820) { - if (var8.field202 == 0) { + if (var8.decoration == WorldMapDecorationType.field2804.id) { + if (var8.rotation == 0) { Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1, this.field1054 * (63 - var2), 1, var12); } - if (var8.field202 == 1) { + if (var8.rotation == 1) { Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1 + this.field1054 - 1, this.field1054 * (63 - var2), 1, var12); } - if (var8.field202 == 2) { + if (var8.rotation == 2) { Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1 + this.field1054 - 1, this.field1054 * (63 - var2) + this.field1054 - 1, 1, var12); } - if (var8.field202 == 3) { + if (var8.rotation == 3) { Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1, this.field1054 * (63 - var2) + this.field1054 - 1, 1, var12); } } - if (var8.field198 == class231.field2806.field2820) { - int var13 = var8.field202 % 2; + if (var8.decoration == WorldMapDecorationType.field2806.id) { + int var13 = var8.rotation % 2; int var14; if (var13 == 0) { for (var14 = 0; var14 < this.field1054; ++var14) { diff --git a/runescape-client/src/main/java/WorldMapSection0.java b/runescape-client/src/main/java/WorldMapSection0.java index a17c8d87aa..580063b608 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -170,16 +170,16 @@ public class WorldMapSection0 implements WorldMapSection { public void read(Buffer var1) { this.field1057 = var1.readUnsignedByte(); this.field1058 = var1.readUnsignedByte(); - this.field1059 = var1.method43(); + this.field1059 = var1.readUnsignedShort(); this.field1063 = var1.readUnsignedByte(); this.field1065 = var1.readUnsignedByte(); - this.field1060 = var1.method43(); + this.field1060 = var1.readUnsignedShort(); this.field1064 = var1.readUnsignedByte(); this.field1066 = var1.readUnsignedByte(); - this.field1061 = var1.method43(); + this.field1061 = var1.readUnsignedShort(); this.field1067 = var1.readUnsignedByte(); this.field1069 = var1.readUnsignedByte(); - this.field1062 = var1.method43(); + this.field1062 = var1.readUnsignedShort(); this.field1068 = var1.readUnsignedByte(); this.field1070 = var1.readUnsignedByte(); this.method423(); diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index 8c5859f173..9b7aae46ca 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -163,13 +163,13 @@ public class WorldMapSection1 implements WorldMapSection { public void read(Buffer var1) { this.field1072 = var1.readUnsignedByte(); this.field1073 = var1.readUnsignedByte(); - this.field1074 = var1.method43(); + this.field1074 = var1.readUnsignedShort(); this.field1078 = var1.readUnsignedByte(); - this.field1075 = var1.method43(); + this.field1075 = var1.readUnsignedShort(); this.field1079 = var1.readUnsignedByte(); - this.field1076 = var1.method43(); + this.field1076 = var1.readUnsignedShort(); this.field1080 = var1.readUnsignedByte(); - this.field1077 = var1.method43(); + this.field1077 = var1.readUnsignedShort(); this.field1081 = var1.readUnsignedByte(); this.method424(); } @@ -215,7 +215,7 @@ public class WorldMapSection1 implements WorldMapSection { class230.field1138 = true; Client.field166 = true; Client.field126 = -1L; - class68.method1694(); + PendingSpawn.method1694(); Client.packetWriter.method239(); Client.packetWriter.packetBuffer.index = 0; Client.packetWriter.serverPacket0 = null; @@ -272,7 +272,7 @@ public class WorldMapSection1 implements WorldMapSection { } } - Client.field214 = new NodeDeque(); + Client.pendingSpawns = new NodeDeque(); WorldMapArea.friendSystem.clear(); for (var0 = 0; var0 < VarpDefinition.field944; ++var0) { diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 593ff56c98..7be549d5f2 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -128,10 +128,10 @@ public class WorldMapSection2 implements WorldMapSection { public void read(Buffer var1) { this.field1083 = var1.readUnsignedByte(); this.field1084 = var1.readUnsignedByte(); - this.field1085 = var1.method43(); - this.field1086 = var1.method43(); - this.field1087 = var1.method43(); - this.field1088 = var1.method43(); + this.field1085 = var1.readUnsignedShort(); + this.field1086 = var1.readUnsignedShort(); + this.field1087 = var1.readUnsignedShort(); + this.field1088 = var1.readUnsignedShort(); this.method425(); } diff --git a/runescape-client/src/main/java/WorldMapSection3.java b/runescape-client/src/main/java/WorldMapSection3.java index 674ae00ca1..a3dc383399 100644 --- a/runescape-client/src/main/java/WorldMapSection3.java +++ b/runescape-client/src/main/java/WorldMapSection3.java @@ -157,14 +157,14 @@ public class WorldMapSection3 implements WorldMapSection { public void read(Buffer var1) { this.field1090 = var1.readUnsignedByte(); this.field1091 = var1.readUnsignedByte(); - this.field1092 = var1.method43(); - this.field1093 = var1.method43(); - this.field1094 = var1.method43(); - this.field1095 = var1.method43(); - this.field1096 = var1.method43(); - this.field1097 = var1.method43(); - this.field1098 = var1.method43(); - this.field1099 = var1.method43(); + this.field1092 = var1.readUnsignedShort(); + this.field1093 = var1.readUnsignedShort(); + this.field1094 = var1.readUnsignedShort(); + this.field1095 = var1.readUnsignedShort(); + this.field1096 = var1.readUnsignedShort(); + this.field1097 = var1.readUnsignedShort(); + this.field1098 = var1.readUnsignedShort(); + this.field1099 = var1.readUnsignedShort(); this.method426(); } diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index bb5a5df529..3f186cdad6 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -43,7 +43,7 @@ final class class1 implements class0 { garbageValue = "553036714" ) public static boolean method19(int var0) { - return var0 == class231.field2819.field2820; + return var0 == WorldMapDecorationType.field2819.id; } @ObfuscatedName("q") @@ -231,14 +231,14 @@ final class class1 implements class0 { return 1; } else if (var0 != 4211) { if (var0 == 4212) { - class231.field1139 = 0; + WorldMapDecorationType.field1139 = 0; return 1; } else { return 2; } } else { - if (AttackOption.field30 != null && class231.field1139 < WorldMapSection0.field1055) { - Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = AttackOption.field30[++class231.field1139 - 1] & '\uffff'; + if (AttackOption.field30 != null && WorldMapDecorationType.field1139 < WorldMapSection0.field1055) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = AttackOption.field30[++WorldMapDecorationType.field1139 - 1] & '\uffff'; } else { Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index b4652f2105..4da7663662 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -51,29 +51,29 @@ public class class13 { signature = "(Lbi;I)V", garbageValue = "-527387190" ) - static final void method165(class68 var0) { + static final void method165(PendingSpawn var0) { long var1 = 0L; int var3 = -1; int var4 = 0; int var5 = 0; - if (var0.field906 == 0) { - var1 = class65.scene.method290(var0.field911, var0.field913, var0.field901); + if (var0.type == 0) { + var1 = class65.scene.method290(var0.level, var0.x, var0.y); } - if (var0.field906 == 1) { - var1 = class65.scene.method291(var0.field911, var0.field913, var0.field901); + if (var0.type == 1) { + var1 = class65.scene.method291(var0.level, var0.x, var0.y); } - if (var0.field906 == 2) { - var1 = class65.scene.method292(var0.field911, var0.field913, var0.field901); + if (var0.type == 2) { + var1 = class65.scene.method292(var0.level, var0.x, var0.y); } - if (var0.field906 == 3) { - var1 = class65.scene.getFloorDecorationTag(var0.field911, var0.field913, var0.field901); + if (var0.type == 3) { + var1 = class65.scene.getFloorDecorationTag(var0.level, var0.x, var0.y); } if (var1 != 0L) { - int var6 = class65.scene.getObjectFlags(var0.field911, var0.field913, var0.field901, var1); + int var6 = class65.scene.getObjectFlags(var0.level, var0.x, var0.y, var1); var3 = HitSplatDefinition.method4972(var1); var4 = var6 & 31; var5 = var6 >> 6 & 3; diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java index 42d91b8e84..0b07ec0546 100644 --- a/runescape-client/src/main/java/class15.java +++ b/runescape-client/src/main/java/class15.java @@ -41,10 +41,10 @@ public class class15 extends class21 { } else { super.field148 = var1.readUnsignedByte(); super.field156 = var1.readUnsignedByte(); - super.field149 = var1.method43(); - super.field146 = var1.method43(); - super.field159 = var1.method43(); - super.field147 = var1.method43(); + super.field149 = var1.readUnsignedShort(); + super.field146 = var1.readUnsignedShort(); + super.field159 = var1.readUnsignedShort(); + super.field147 = var1.readUnsignedShort(); super.field150 = var1.method51(); super.field152 = var1.method51(); } @@ -61,7 +61,7 @@ public class class15 extends class21 { super.field145 = new short[super.field156][64][64]; super.field154 = new byte[super.field156][64][64]; super.field155 = new byte[super.field156][64][64]; - super.field144 = new class25[super.field156][64][64][]; + super.field144 = new WorldMapDecoration[super.field156][64][64][]; int var2 = var1.readUnsignedByte(); if (var2 != class30.field246.field248) { throw new IllegalStateException(""); diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 3f6bfbfbe4..07eddf838a 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -112,7 +112,7 @@ public class class16 { var2 = var1.method67(); byte var13 = var1.method61(); var3 = var1.method66(); - var4 = var1.method43(); + var4 = var1.readUnsignedShort(); var5 = var1.method58(); var6 = var5 >> 2; var7 = var5 & 3; @@ -218,7 +218,7 @@ public class class16 { } if (class190.field2341 == var0) { - var31 = var1.method43(); + var31 = var1.readUnsignedShort(); var2 = var1.method58(); var32 = var1.method66(); var3 = var1.readUnsignedByte(); @@ -240,7 +240,7 @@ public class class16 { var4 = var1.readUnsignedByteNegate(); var5 = (var4 >> 4 & 7) + WorldMapSection3.field1089; var6 = (var4 & 7) + Canvas.field95; - var7 = var1.method43(); + var7 = var1.readUnsignedShort(); if (var5 >= 0 && var6 >= 0 && var5 < 103 && var6 < 103) { if (var3 == 0) { BoundaryObject var34 = class65.scene.getBoundaryObject(SoundSystem.plane, var5, var6); @@ -330,7 +330,7 @@ public class class16 { } } else if (class190.field2352 == var0) { var31 = var1.method59() * 4; - var2 = var1.method43(); + var2 = var1.readUnsignedShort(); var32 = var1.method66(); var3 = var1.method59() * 4; var4 = var1.method68(); diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index be6abab812..2ae59d52fe 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -103,7 +103,7 @@ public class class171 { Skeleton.indexCache1 = class22.newIndexCache(1, false, true, true); ObjectSound.indexCache2 = class22.newIndexCache(2, true, false, true); WorldMapIcon1.indexCache3 = class22.newIndexCache(3, false, true, true); - class25.indexCache4 = class22.newIndexCache(4, false, true, true); + WorldMapDecoration.indexCache4 = class22.newIndexCache(4, false, true, true); SecureRandomFuture.indexCache5 = class22.newIndexCache(5, true, true, true); UserComparator3.indexCache6 = class22.newIndexCache(6, true, true, true); class40.indexCache7 = class22.newIndexCache(7, false, true, true); @@ -128,7 +128,7 @@ public class class171 { var0 += Skeleton.indexCache1.method131() * 4 / 100; var0 += ObjectSound.indexCache2.method131() * 2 / 100; var0 += WorldMapIcon1.indexCache3.method131() * 2 / 100; - var0 += class25.indexCache4.method131() * 6 / 100; + var0 += WorldMapDecoration.indexCache4.method131() * 6 / 100; var0 += SecureRandomFuture.indexCache5.method131() * 4 / 100; var0 += UserComparator3.indexCache6.method131() * 2 / 100; var0 += class40.indexCache7.method131() * 56 / 100; @@ -153,7 +153,7 @@ public class class171 { } else { AbstractWorldMapIcon.method625(AbstractIndexCache.indexCache0, "Animations"); AbstractWorldMapIcon.method625(Skeleton.indexCache1, "Skeletons"); - AbstractWorldMapIcon.method625(class25.indexCache4, "Sound FX"); + AbstractWorldMapIcon.method625(WorldMapDecoration.indexCache4, "Sound FX"); AbstractWorldMapIcon.method625(SecureRandomFuture.indexCache5, "Maps"); AbstractWorldMapIcon.method625(UserComparator3.indexCache6, "Music Tracks"); AbstractWorldMapIcon.method625(class40.indexCache7, "Models"); @@ -176,7 +176,7 @@ public class class171 { var28.method174(9, 128); WorldMapCacheName.pcmPlayer0 = Players.newPcmPlayer(GameShell.taskHandler, 0, 22050); WorldMapCacheName.pcmPlayer0.setStream(var28); - NetSocket.method3537(WorldMapSection1.indexCache15, class2.indexCache14, class25.indexCache4, var28); + NetSocket.method3537(WorldMapSection1.indexCache15, class2.indexCache14, WorldMapDecoration.indexCache4, var28); AbstractIndexCache.pcmPlayer1 = Players.newPcmPlayer(GameShell.taskHandler, 1, 2048); TaskHandler.pcmStreamMixer = new PcmStreamMixer(); AbstractIndexCache.pcmPlayer1.setStream(TaskHandler.pcmStreamMixer); diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java index fcc927ce95..94984cac3c 100644 --- a/runescape-client/src/main/java/class21.java +++ b/runescape-client/src/main/java/class21.java @@ -59,7 +59,7 @@ public abstract class class21 { @ObfuscatedSignature( signature = "[[[[Lv;" ) - class25[][][][] field144; + WorldMapDecoration[][][][] field144; @ObfuscatedName("i") boolean field157; @ObfuscatedName("a") @@ -116,7 +116,7 @@ public abstract class class21 { this.field145 = (short[][][])null; this.field154 = (byte[][][])null; this.field155 = (byte[][][])null; - this.field144 = (class25[][][][])null; + this.field144 = (WorldMapDecoration[][][][])null; this.field157 = false; this.field153 = false; } @@ -183,12 +183,12 @@ public abstract class class21 { for (var8 = 0; var8 < var5; ++var8) { var9 = var3.readUnsignedByte(); if (var9 != 0) { - class25[] var14 = this.field144[var8][var1][var2] = new class25[var9]; + WorldMapDecoration[] var14 = this.field144[var8][var1][var2] = new WorldMapDecoration[var9]; for (var10 = 0; var10 < var9; ++var10) { int var12 = var3.method51(); int var13 = var3.readUnsignedByte(); - var14[var10] = new class25(var12, var13 >> 2, var13 & 3); + var14[var10] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); } } } @@ -305,7 +305,7 @@ public abstract class class21 { var3.field18 = var0.method62(); var3.field19 = var0.method66() + Client.cycle; var3.field20 = var0.method65() + Client.cycle; - var3.field21 = var0.method43(); + var3.field21 = var0.readUnsignedShort(); if (var3.field725) { var3.field15 += var3.tileX; var3.field17 += var3.tileY; @@ -413,7 +413,7 @@ public abstract class class21 { } if ((var4 & 128) != 0) { - var6 = var0.method43(); + var6 = var0.readUnsignedShort(); if (var6 == 65535) { var6 = -1; } diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java index 09f71a5c0f..6fa87ea0aa 100644 --- a/runescape-client/src/main/java/class238.java +++ b/runescape-client/src/main/java/class238.java @@ -225,7 +225,7 @@ public final class class238 { class171.method3494(var22 + 1, var9.id, var9.childIndex, var9.itemId, ""); } else if (var22 == 10) { Player.method1281(); - class25.method350(var9.id, var9.childIndex, class211.method4107(class1.getWidgetClickMask(var9)), var9.itemId); + WorldMapDecoration.method350(var9.id, var9.childIndex, class211.method4107(class1.getWidgetClickMask(var9)), var9.itemId); Client.selectedSpellActionName = class198.method3745(var9); if (Client.selectedSpellActionName == null) { Client.selectedSpellActionName = "null"; @@ -586,7 +586,7 @@ public final class class238 { } } - class231.method4517(var33.group, var12, var13, var14, var15, var10, var11); + WorldMapDecorationType.method4517(var33.group, var12, var13, var14, var15, var10, var11); } } } diff --git a/runescape-client/src/main/java/class258.java b/runescape-client/src/main/java/class258.java index 90c200d0eb..9d5e68b68a 100644 --- a/runescape-client/src/main/java/class258.java +++ b/runescape-client/src/main/java/class258.java @@ -39,29 +39,29 @@ public class class258 { garbageValue = "772902595" ) static final void method4898(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - class68 var9 = null; + PendingSpawn var9 = null; - for (class68 var10 = (class68)Client.field214.last(); var10 != null; var10 = (class68)Client.field214.previous()) { - if (var0 == var10.field911 && var10.field913 == var1 && var2 == var10.field901 && var3 == var10.field906) { + for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0 == var10.level && var10.x == var1 && var2 == var10.y && var3 == var10.type) { var9 = var10; break; } } if (var9 == null) { - var9 = new class68(); - var9.field911 = var0; - var9.field906 = var3; - var9.field913 = var1; - var9.field901 = var2; + var9 = new PendingSpawn(); + var9.level = var0; + var9.type = var3; + var9.x = var1; + var9.y = var2; class13.method165(var9); - Client.field214.addFirst(var9); + Client.pendingSpawns.addFirst(var9); } - var9.field899 = var4; + var9.id = var4; var9.field908 = var5; - var9.field907 = var6; - var9.field909 = var7; - var9.field910 = var8; + var9.orientation = var6; + var9.delay = var7; + var9.hitpoints = var8; } } diff --git a/runescape-client/src/main/java/class39.java b/runescape-client/src/main/java/class39.java index 629a66f2d6..e66798f49a 100644 --- a/runescape-client/src/main/java/class39.java +++ b/runescape-client/src/main/java/class39.java @@ -44,12 +44,12 @@ public class class39 extends class21 { } else { super.field148 = var1.readUnsignedByte(); super.field156 = var1.readUnsignedByte(); - super.field149 = var1.method43(); - super.field146 = var1.method43(); + super.field149 = var1.readUnsignedShort(); + super.field146 = var1.readUnsignedShort(); this.field318 = var1.readUnsignedByte(); this.field319 = var1.readUnsignedByte(); - super.field159 = var1.method43(); - super.field147 = var1.method43(); + super.field159 = var1.readUnsignedShort(); + super.field147 = var1.readUnsignedShort(); this.field321 = var1.readUnsignedByte(); this.field323 = var1.readUnsignedByte(); super.field150 = var1.method51(); @@ -68,7 +68,7 @@ public class class39 extends class21 { super.field145 = new short[super.field156][64][64]; super.field154 = new byte[super.field156][64][64]; super.field155 = new byte[super.field156][64][64]; - super.field144 = new class25[super.field156][64][64][]; + super.field144 = new WorldMapDecoration[super.field156][64][64][]; int var2 = var1.readUnsignedByte(); if (var2 != class30.field247.field248) { throw new IllegalStateException(""); diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java index eec1fab32e..052402ebef 100644 --- a/runescape-client/src/main/java/class40.java +++ b/runescape-client/src/main/java/class40.java @@ -637,7 +637,7 @@ public class class40 { static final void drawEntities(int var0, int var1, int var2, int var3) { ++Client.viewportDrawCount; class229.method4514(); - class25.addLocalPlayerToScene(); + WorldMapDecoration.addLocalPlayerToScene(); TriBool.addTargetPlayerToScene(); BufferedSource.method3423(true); int var4 = Players.Players_count; @@ -879,7 +879,7 @@ public class class40 { if (Client.isLoading) { Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - class68.drawLoadingMessage("Loading - please wait.", false); + PendingSpawn.drawLoadingMessage("Loading - please wait.", false); } } diff --git a/runescape-client/src/main/java/class50.java b/runescape-client/src/main/java/class50.java index 8b2c6cf343..7ffa296a42 100644 --- a/runescape-client/src/main/java/class50.java +++ b/runescape-client/src/main/java/class50.java @@ -89,7 +89,7 @@ public class class50 { if (!Client.isInInstance) { var2 = var1.method67(); var3 = var1.method66(); - int var8 = var1.method43(); + int var8 = var1.readUnsignedShort(); class190.xteaKeys = new int[var8][4]; for (var4 = 0; var4 < var8; ++var4) { @@ -131,7 +131,7 @@ public class class50 { var2 = var1.method66(); var3 = var1.method67(); boolean var15 = var1.readUnsignedByte() == 1; - var4 = var1.method43(); + var4 = var1.readUnsignedShort(); var1.importIndex(); int var16; @@ -233,7 +233,7 @@ public class class50 { } AttackOption.field30 = var2; - class231.field1139 = 0; + WorldMapDecorationType.field1139 = 0; WorldMapSection0.field1055 = var3; String[] var8 = new String[WorldMapSection0.field1055];