From 6ba1f2f808ef2f6a74846942487d2f601abd271b Mon Sep 17 00:00:00 2001 From: Pazaz Date: Mon, 25 Apr 2022 00:49:33 -0400 Subject: [PATCH] Started moving around static methods/fields --- client/src/main/java/AnimFrameset.java | 2 +- client/src/main/java/AudioChannel.java | 2 +- client/src/main/java/AudioThread.java | 4 +- client/src/main/java/BrokenInputStream.java | 2 +- client/src/main/java/BufferedFile.java | 16 +- client/src/main/java/BufferedSocket.java | 4 +- client/src/main/java/Cheat.java | 14 + client/src/main/java/Component.java | 6 +- client/src/main/java/DelayedStateChange.java | 19 +- client/src/main/java/DisplayMode.java | 23 + client/src/main/java/FloType.java | 6 +- client/src/main/java/FloTypeList.java | 6 + client/src/main/java/Font.java | 8 +- client/src/main/java/Fonts.java | 36 + client/src/main/java/FrameBuffer.java | 2 +- client/src/main/java/GameShell.java | 33 +- client/src/main/java/GlModel.java | 20 +- client/src/main/java/GlRenderer.java | 6 +- client/src/main/java/GlTile.java | 4 +- client/src/main/java/HashTable.java | 2 +- client/src/main/java/IntUtils.java | 22 + client/src/main/java/InterfaceList.java | 12 + client/src/main/java/JagString.java | 104 ++- client/src/main/java/Js5.java | 8 +- client/src/main/java/Js5CacheQueue.java | 4 +- .../main/java/Js5CachedResourceProvider.java | 6 +- client/src/main/java/Js5Compression.java | 38 + client/src/main/java/Js5Index.java | 2 +- client/src/main/java/Keyboard.java | 12 +- client/src/main/java/LinkedList.java | 2 +- client/src/main/java/LoadingBar.java | 30 + client/src/main/java/LoadingBarAwt.java | 61 ++ client/src/main/java/Loc.java | 6 +- client/src/main/java/LocType.java | 4 +- client/src/main/java/LocalizedText.java | 15 + client/src/main/java/LongNode.java | 4 +- client/src/main/java/LruHashTable.java | 4 +- client/src/main/java/Map.java | 12 +- .../{Class3_Sub26.java => MapElement.java} | 4 +- ...FunctionGroup.java => MapElementList.java} | 26 +- client/src/main/java/MapList.java | 6 + client/src/main/java/MidiPcmStream.java | 2 +- client/src/main/java/MidiPlayer.java | 42 + client/src/main/java/MillisTimer.java | 4 +- client/src/main/java/MiniMenu.java | 6 + client/src/main/java/Mouse.java | 19 + client/src/main/java/MouseRecorder.java | 6 +- client/src/main/java/MsiTypeList.java | 20 + client/src/main/java/NanoTimer.java | 4 +- client/src/main/java/Npc.java | 6 +- client/src/main/java/PathingEntity.java | 12 +- client/src/main/java/Player.java | 76 +- client/src/main/java/PlayerAppearance.java | 4 +- client/src/main/java/PlayerList.java | 6 + client/src/main/java/Preferences.java | 319 +++++++ client/src/main/java/Protocol.java | 6 + client/src/main/java/Rasteriser.java | 398 ++++----- client/src/main/java/SceneGraph.java | 8 + client/src/main/java/SecondaryLinkedList.java | 2 +- client/src/main/java/Shadow.java | 10 +- client/src/main/java/SoftLruHashTable.java | 4 +- client/src/main/java/SoftwareAlphaSprite.java | 256 +++--- client/src/main/java/SoftwareFont.java | 60 +- .../src/main/java/SoftwareIndexedSprite.java | 106 +-- .../{Static129.java => SoftwareRaster.java} | 38 +- client/src/main/java/SoftwareSprite.java | 270 +++--- client/src/main/java/Song.java | 8 +- client/src/main/java/SoundBank.java | 2 +- client/src/main/java/SoundPlayer.java | 37 + .../main/java/SpecularMaterialRenderer.java | 6 +- client/src/main/java/SpriteLoader.java | 313 +++++++ client/src/main/java/Sprites.java | 273 ++++++ client/src/main/java/Static1.java | 38 +- client/src/main/java/Static10.java | 10 +- client/src/main/java/Static102.java | 39 +- client/src/main/java/Static103.java | 98 +-- client/src/main/java/Static104.java | 4 +- client/src/main/java/Static106.java | 2 +- client/src/main/java/Static107.java | 14 +- client/src/main/java/Static11.java | 10 +- client/src/main/java/Static112.java | 10 +- client/src/main/java/Static113.java | 5 +- client/src/main/java/Static114.java | 22 +- client/src/main/java/Static115.java | 40 +- client/src/main/java/Static116.java | 53 +- client/src/main/java/Static118.java | 22 - client/src/main/java/Static119.java | 19 +- client/src/main/java/Static12.java | 41 +- client/src/main/java/Static120.java | 10 +- client/src/main/java/Static121.java | 19 +- client/src/main/java/Static122.java | 6 +- client/src/main/java/Static123.java | 40 +- client/src/main/java/Static124.java | 13 +- client/src/main/java/Static125.java | 10 +- client/src/main/java/Static126.java | 14 +- client/src/main/java/Static127.java | 65 +- client/src/main/java/Static128.java | 5 +- client/src/main/java/Static13.java | 67 +- client/src/main/java/Static130.java | 13 +- client/src/main/java/Static131.java | 20 +- client/src/main/java/Static132.java | 20 +- client/src/main/java/Static133.java | 9 +- client/src/main/java/Static134.java | 4 +- client/src/main/java/Static136.java | 116 --- client/src/main/java/Static137.java | 18 +- client/src/main/java/Static138.java | 45 - client/src/main/java/Static139.java | 8 +- client/src/main/java/Static14.java | 18 +- client/src/main/java/Static140.java | 39 +- client/src/main/java/Static141.java | 16 +- client/src/main/java/Static142.java | 63 +- client/src/main/java/Static144.java | 252 ------ client/src/main/java/Static145.java | 24 +- client/src/main/java/Static146.java | 5 - client/src/main/java/Static147.java | 9 +- client/src/main/java/Static148.java | 10 +- client/src/main/java/Static149.java | 6 - client/src/main/java/Static15.java | 13 +- client/src/main/java/Static150.java | 20 +- client/src/main/java/Static152.java | 34 - client/src/main/java/Static154.java | 5 +- client/src/main/java/Static155.java | 14 +- client/src/main/java/Static156.java | 11 +- client/src/main/java/Static158.java | 53 +- client/src/main/java/Static159.java | 15 +- client/src/main/java/Static160.java | 11 +- client/src/main/java/Static162.java | 46 - client/src/main/java/Static163.java | 5 +- client/src/main/java/Static164.java | 34 +- client/src/main/java/Static165.java | 3 - client/src/main/java/Static166.java | 104 +-- client/src/main/java/Static169.java | 7 +- client/src/main/java/Static17.java | 15 +- client/src/main/java/Static170.java | 6 +- client/src/main/java/Static171.java | 6 +- client/src/main/java/Static172.java | 5 +- client/src/main/java/Static173.java | 6 - client/src/main/java/Static175.java | 4 +- client/src/main/java/Static176.java | 38 +- client/src/main/java/Static178.java | 11 +- client/src/main/java/Static18.java | 6 - client/src/main/java/Static181.java | 9 +- client/src/main/java/Static182.java | 29 +- client/src/main/java/Static185.java | 10 +- client/src/main/java/Static186.java | 180 ---- client/src/main/java/Static187.java | 5 +- client/src/main/java/Static189.java | 6 - client/src/main/java/Static19.java | 5 +- client/src/main/java/Static190.java | 5 +- client/src/main/java/Static192.java | 2 +- client/src/main/java/Static195.java | 2 +- client/src/main/java/Static196.java | 26 +- client/src/main/java/Static197.java | 70 +- client/src/main/java/Static199.java | 2 +- client/src/main/java/Static2.java | 13 +- client/src/main/java/Static20.java | 10 - client/src/main/java/Static202.java | 5 +- client/src/main/java/Static203.java | 32 +- client/src/main/java/Static204.java | 5 +- client/src/main/java/Static205.java | 2 +- client/src/main/java/Static207.java | 36 +- client/src/main/java/Static209.java | 26 +- client/src/main/java/Static21.java | 12 +- client/src/main/java/Static210.java | 4 +- client/src/main/java/Static211.java | 20 +- client/src/main/java/Static213.java | 36 - client/src/main/java/Static214.java | 10 +- client/src/main/java/Static215.java | 9 - client/src/main/java/Static216.java | 104 +-- client/src/main/java/Static217.java | 41 +- client/src/main/java/Static219.java | 8 +- client/src/main/java/Static22.java | 5 +- client/src/main/java/Static220.java | 13 +- client/src/main/java/Static221.java | 8 +- client/src/main/java/Static223.java | 20 +- client/src/main/java/Static224.java | 5 +- client/src/main/java/Static225.java | 12 +- client/src/main/java/Static226.java | 16 +- client/src/main/java/Static227.java | 8 +- client/src/main/java/Static228.java | 5 +- client/src/main/java/Static229.java | 5 +- client/src/main/java/Static23.java | 2 +- client/src/main/java/Static230.java | 10 +- client/src/main/java/Static231.java | 76 +- client/src/main/java/Static232.java | 28 +- client/src/main/java/Static233.java | 11 +- client/src/main/java/Static234.java | 33 +- client/src/main/java/Static235.java | 2 +- client/src/main/java/Static236.java | 13 +- client/src/main/java/Static238.java | 4 +- client/src/main/java/Static24.java | 5 +- client/src/main/java/Static240.java | 3 - client/src/main/java/Static241.java | 3 - client/src/main/java/Static242.java | 9 +- client/src/main/java/Static243.java | 12 +- client/src/main/java/Static244.java | 5 +- client/src/main/java/Static246.java | 20 +- client/src/main/java/Static247.java | 114 +-- client/src/main/java/Static248.java | 11 +- client/src/main/java/Static249.java | 5 +- client/src/main/java/Static25.java | 21 +- client/src/main/java/Static250.java | 16 +- client/src/main/java/Static251.java | 10 - client/src/main/java/Static252.java | 8 +- client/src/main/java/Static253.java | 38 +- client/src/main/java/Static254.java | 16 +- client/src/main/java/Static256.java | 4 +- client/src/main/java/Static257.java | 6 - client/src/main/java/Static258.java | 30 +- client/src/main/java/Static259.java | 8 +- client/src/main/java/Static26.java | 22 +- client/src/main/java/Static260.java | 8 +- client/src/main/java/Static263.java | 6 +- client/src/main/java/Static265.java | 7 - client/src/main/java/Static266.java | 8 +- client/src/main/java/Static267.java | 2 +- client/src/main/java/Static269.java | 58 +- client/src/main/java/Static27.java | 7 +- client/src/main/java/Static270.java | 3 - client/src/main/java/Static271.java | 6 +- client/src/main/java/Static273.java | 9 +- client/src/main/java/Static274.java | 5 +- client/src/main/java/Static276.java | 13 +- client/src/main/java/Static277.java | 10 +- client/src/main/java/Static278.java | 16 +- client/src/main/java/Static279.java | 9 +- client/src/main/java/Static28.java | 56 +- client/src/main/java/Static280.java | 39 +- client/src/main/java/Static281.java | 7 - client/src/main/java/Static285.java | 6 +- client/src/main/java/Static288.java | 14 - client/src/main/java/Static289.java | 50 +- client/src/main/java/Static29.java | 8 +- client/src/main/java/Static291.java | 12 - client/src/main/java/Static292.java | 12 - client/src/main/java/Static3.java | 18 +- client/src/main/java/Static30.java | 72 +- client/src/main/java/Static31.java | 57 +- client/src/main/java/Static32.java | 7 +- client/src/main/java/Static33.java | 152 +--- client/src/main/java/Static34.java | 43 +- client/src/main/java/Static36.java | 82 +- client/src/main/java/Static38.java | 99 +-- client/src/main/java/Static4.java | 91 +- client/src/main/java/Static40.java | 19 +- client/src/main/java/Static41.java | 3 - client/src/main/java/Static42.java | 13 - client/src/main/java/Static43.java | 12 - client/src/main/java/Static44.java | 10 +- client/src/main/java/Static45.java | 4 +- client/src/main/java/Static47.java | 68 +- client/src/main/java/Static48.java | 40 +- client/src/main/java/Static49.java | 10 +- client/src/main/java/Static5.java | 3 - client/src/main/java/Static52.java | 6 +- client/src/main/java/Static53.java | 11 +- client/src/main/java/Static54.java | 118 +-- client/src/main/java/Static55.java | 5 +- client/src/main/java/Static58.java | 5 +- client/src/main/java/Static59.java | 10 +- client/src/main/java/Static6.java | 12 +- client/src/main/java/Static61.java | 2 +- client/src/main/java/Static63.java | 8 +- client/src/main/java/Static64.java | 20 +- client/src/main/java/Static67.java | 2 +- client/src/main/java/Static7.java | 15 +- client/src/main/java/Static70.java | 26 +- client/src/main/java/Static71.java | 8 +- client/src/main/java/Static73.java | 25 +- client/src/main/java/Static74.java | 47 +- client/src/main/java/Static75.java | 63 +- client/src/main/java/Static76.java | 13 - client/src/main/java/Static78.java | 46 +- client/src/main/java/Static79.java | 8 +- client/src/main/java/Static80.java | 93 +- client/src/main/java/Static81.java | 53 +- client/src/main/java/Static82.java | 21 +- client/src/main/java/Static83.java | 13 +- client/src/main/java/Static84.java | 107 +-- client/src/main/java/Static86.java | 10 +- client/src/main/java/Static87.java | 108 +-- client/src/main/java/Static88.java | 290 +++--- client/src/main/java/Static89.java | 66 +- client/src/main/java/Static9.java | 6 +- client/src/main/java/Static90.java | 5 +- client/src/main/java/Static91.java | 14 +- client/src/main/java/Static97.java | 6 +- client/src/main/java/Static98.java | 16 +- client/src/main/java/Static99.java | 5 +- client/src/main/java/StructType.java | 26 +- client/src/main/java/SubScript.java | 6 + client/src/main/java/SynthSound.java | 8 +- client/src/main/java/TextureOp29.java | 2 +- client/src/main/java/TextureOp29SubOp3.java | 7 +- client/src/main/java/TextureOpSprite.java | 4 +- client/src/main/java/ThreadUtils.java | 26 + client/src/main/java/Timer.java | 12 +- client/src/main/java/TracingException.java | 39 + .../main/java/UnderwaterMaterialRenderer.java | 2 +- .../src/main/java/UnlitMaterialRenderer.java | 4 +- client/src/main/java/VorbisCodebook.java | 13 +- .../src/main/java/WaterMaterialRenderer.java | 21 +- client/src/main/java/WorldMap.java | 833 ++++++++++++++++++ client/src/main/java/WorldMapFont.java | 32 +- client/src/main/java/client.java | 501 ++++++----- 305 files changed, 5027 insertions(+), 5075 deletions(-) create mode 100644 client/src/main/java/Cheat.java create mode 100644 client/src/main/java/DisplayMode.java create mode 100644 client/src/main/java/FloTypeList.java create mode 100644 client/src/main/java/Fonts.java create mode 100644 client/src/main/java/IntUtils.java create mode 100644 client/src/main/java/InterfaceList.java create mode 100644 client/src/main/java/Js5Compression.java create mode 100644 client/src/main/java/LoadingBar.java create mode 100644 client/src/main/java/LoadingBarAwt.java rename client/src/main/java/{Class3_Sub26.java => MapElement.java} (84%) rename client/src/main/java/{MapFunctionGroup.java => MapElementList.java} (60%) create mode 100644 client/src/main/java/MapList.java create mode 100644 client/src/main/java/MidiPlayer.java create mode 100644 client/src/main/java/MiniMenu.java create mode 100644 client/src/main/java/MsiTypeList.java create mode 100644 client/src/main/java/PlayerList.java create mode 100644 client/src/main/java/Preferences.java create mode 100644 client/src/main/java/Protocol.java create mode 100644 client/src/main/java/SceneGraph.java rename client/src/main/java/{Static129.java => SoftwareRaster.java} (93%) create mode 100644 client/src/main/java/SoundPlayer.java create mode 100644 client/src/main/java/SpriteLoader.java create mode 100644 client/src/main/java/Sprites.java delete mode 100644 client/src/main/java/Static162.java delete mode 100644 client/src/main/java/Static281.java delete mode 100644 client/src/main/java/Static288.java delete mode 100644 client/src/main/java/Static291.java delete mode 100644 client/src/main/java/Static292.java delete mode 100644 client/src/main/java/Static42.java create mode 100644 client/src/main/java/SubScript.java create mode 100644 client/src/main/java/ThreadUtils.java create mode 100644 client/src/main/java/WorldMap.java diff --git a/client/src/main/java/AnimFrameset.java b/client/src/main/java/AnimFrameset.java index a391a18..d7e635b 100644 --- a/client/src/main/java/AnimFrameset.java +++ b/client/src/main/java/AnimFrameset.java @@ -30,7 +30,7 @@ public final class AnimFrameset extends SecondaryNode { if (local58 == null) { @Pc(85) byte[] local85 = arg1.method4502(0, local51); local58 = new AnimBase(local51, local85); - local5.method2282(local58); + local5.addTail(local58); } this.frames[local19[local21]] = new AnimFrame(local37, local58); } diff --git a/client/src/main/java/AudioChannel.java b/client/src/main/java/AudioChannel.java index 792c2df..7ed1b93 100644 --- a/client/src/main/java/AudioChannel.java +++ b/client/src/main/java/AudioChannel.java @@ -370,7 +370,7 @@ public class AudioChannel { if (local6) { Static60.thread.stop = true; while (Static60.thread.running) { - Static231.sleep(50L); + ThreadUtils.sleep(50L); } Static60.thread = null; } diff --git a/client/src/main/java/AudioThread.java b/client/src/main/java/AudioThread.java index cd5f755..b6ef94f 100644 --- a/client/src/main/java/AudioThread.java +++ b/client/src/main/java/AudioThread.java @@ -29,11 +29,11 @@ public final class AudioThread implements Runnable { channel.loop(); } } - Static231.sleep(10L); + ThreadUtils.sleep(10L); GameShell.flush(this.signLink, null); } } catch (@Pc(43) Exception ex) { - Static89.report(null, ex); + TracingException.report(null, ex); } finally { this.running = false; } diff --git a/client/src/main/java/BrokenInputStream.java b/client/src/main/java/BrokenInputStream.java index 498258c..44abaae 100644 --- a/client/src/main/java/BrokenInputStream.java +++ b/client/src/main/java/BrokenInputStream.java @@ -8,7 +8,7 @@ public final class BrokenInputStream extends InputStream { @OriginalMember(owner = "client!qk", name = "read", descriptor = "()I") @Override public final int read() { - Static231.sleep(30000L); + ThreadUtils.sleep(30000L); return -1; } } diff --git a/client/src/main/java/BufferedFile.java b/client/src/main/java/BufferedFile.java index ce82cea..8674b63 100644 --- a/client/src/main/java/BufferedFile.java +++ b/client/src/main/java/BufferedFile.java @@ -79,7 +79,7 @@ public final class BufferedFile { } if (start > -1L && end > start) { @Pc(208) int copyLen = (int) (end - start); - Static289.copy(this.writeBuffer, (int) (start - this.writePosition), this.readBuffer, (int) (start - this.readPosition), copyLen); + JagString.copy(this.writeBuffer, (int) (start - this.writePosition), this.readBuffer, (int) (start - this.readPosition), copyLen); } this.writeLen = 0; this.writePosition = -1L; @@ -102,7 +102,7 @@ public final class BufferedFile { throw new ArrayIndexOutOfBoundsException(len - b.length); } if (this.writePosition != -1L && this.virtualPosition >= this.writePosition && (long) this.writeLen + this.writePosition >= (long) len + this.virtualPosition) { - Static289.copy(this.writeBuffer, (int) (this.virtualPosition - this.writePosition), b, 0, len); + JagString.copy(this.writeBuffer, (int) (this.virtualPosition - this.writePosition), b, 0, len); this.virtualPosition += len; return; } @@ -114,7 +114,7 @@ public final class BufferedFile { if (n > len) { n = len; } - Static289.copy(this.readBuffer, (int) (this.virtualPosition - this.readPosition), b, 0, n); + JagString.copy(this.readBuffer, (int) (this.virtualPosition - this.readPosition), b, 0, n); off = n; len -= n; this.virtualPosition += n; @@ -138,7 +138,7 @@ public final class BufferedFile { if (len > this.readLen) { n = this.readLen; } - Static289.copy(this.readBuffer, 0, b, off, n); + JagString.copy(this.readBuffer, 0, b, off, n); len -= n; off += n; this.virtualPosition += n; @@ -169,7 +169,7 @@ public final class BufferedFile { } if (end > -1L && start > end) { @Pc(426) int copyLen = (int) (start - end); - Static289.copy(this.writeBuffer, (int) (end - this.writePosition), b, (int) (end - originalPosition), copyLen); + JagString.copy(this.writeBuffer, (int) (end - this.writePosition), b, (int) (end - originalPosition), copyLen); if (this.virtualPosition < start) { len = (int) ((long) len + this.virtualPosition - start); this.virtualPosition = start; @@ -230,7 +230,7 @@ public final class BufferedFile { if (this.writePosition != -1L && (long) this.writeBuffer.length + this.writePosition < (long) len + this.virtualPosition) { @Pc(90) int n = (int) ((long) this.writeBuffer.length + this.writePosition - this.virtualPosition); len -= n; - Static289.copy(b, off, this.writeBuffer, (int) (this.virtualPosition - this.writePosition), n); + JagString.copy(b, off, this.writeBuffer, (int) (this.virtualPosition - this.writePosition), n); this.virtualPosition += n; this.writeLen = this.writeBuffer.length; this.flush(); @@ -260,14 +260,14 @@ public final class BufferedFile { } if (start > -1L && end > start) { @Pc(324) int copyLen = (int) (end - start); - Static289.copy(b, (int) (start + (long) off - this.virtualPosition), this.readBuffer, (int) (start - this.readPosition), copyLen); + JagString.copy(b, (int) (start + (long) off - this.virtualPosition), this.readBuffer, (int) (start - this.readPosition), copyLen); } this.virtualPosition += len; } else if (len > 0) { if (this.writePosition == -1L) { this.writePosition = this.virtualPosition; } - Static289.copy(b, off, this.writeBuffer, (int) (this.virtualPosition - this.writePosition), len); + JagString.copy(b, off, this.writeBuffer, (int) (this.virtualPosition - this.writePosition), len); this.virtualPosition += len; if ((long) this.writeLen < this.virtualPosition - this.writePosition) { this.writeLen = (int) (this.virtualPosition - this.writePosition); diff --git a/client/src/main/java/BufferedSocket.java b/client/src/main/java/BufferedSocket.java index 68951ed..e40c6b2 100644 --- a/client/src/main/java/BufferedSocket.java +++ b/client/src/main/java/BufferedSocket.java @@ -111,7 +111,7 @@ public final class BufferedSocket implements Runnable { } } } catch (@Pc(124) Exception ex) { - Static89.report(null, ex); + TracingException.report(null, ex); } } @@ -200,7 +200,7 @@ public final class BufferedSocket implements Runnable { } if (this.thread != null) { while (this.thread.status == 0) { - Static231.sleep(1L); + ThreadUtils.sleep(1L); } if (this.thread.status == 1) { try { diff --git a/client/src/main/java/Cheat.java b/client/src/main/java/Cheat.java new file mode 100644 index 0000000..9c2a31c --- /dev/null +++ b/client/src/main/java/Cheat.java @@ -0,0 +1,14 @@ +import org.openrs2.deob.annotation.OriginalMember; + +public class Cheat { + @OriginalMember(owner = "client!p", name = "f", descriptor = "Lclient!na;") + public static final JagString JS5DROP = Static28.parse("::serverjs5drop"); + @OriginalMember(owner = "client!v", name = "d", descriptor = "Lclient!na;") + public static final JagString CLIENTDROP = Static28.parse("::clientdrop"); + @OriginalMember(owner = "client!dg", name = "b", descriptor = "Lclient!na;") + public static final JagString aClass100_333 = Static28.parse("Shift)2click ENABLED(Q"); + @OriginalMember(owner = "client!dg", name = "d", descriptor = "Lclient!na;") + public static final JagString aClass100_334 = Static28.parse("Cache:"); + @OriginalMember(owner = "client!dg", name = "f", descriptor = "Z") + public static boolean displayFps = false; +} diff --git a/client/src/main/java/Component.java b/client/src/main/java/Component.java index c1497db..bb90d5e 100644 --- a/client/src/main/java/Component.java +++ b/client/src/main/java/Component.java @@ -504,7 +504,7 @@ public final class Component { if (local18 == null) { return false; } - local18.method1396(); + local18.trim(); this.anIntArray37 = new int[local18.height]; this.anIntArray45 = new int[local18.height]; for (@Pc(37) int local37 = 0; local37 < local18.height; local37++) { @@ -778,7 +778,7 @@ public final class Component { if (local43 != null) { return local43; } - local43 = Static150.method2800(local29, Static23.aClass153_12); + local43 = SpriteLoader.loadSprites(local29, Static23.aClass153_12); if (local43 == null) { Static211.aBoolean72 = true; } else { @@ -938,7 +938,7 @@ public final class Component { if (this.aBoolean18) { local85 = Static80.loadSoftwareAlphaSprite(Static23.aClass153_12, local12); } else { - local85 = Static78.method1693(0, Static23.aClass153_12, local12); + local85 = SpriteLoader.loadSoftwareSprite(0, Static23.aClass153_12, local12); } if (local85 == null) { Static211.aBoolean72 = true; diff --git a/client/src/main/java/DelayedStateChange.java b/client/src/main/java/DelayedStateChange.java index 47d697e..841f72a 100644 --- a/client/src/main/java/DelayedStateChange.java +++ b/client/src/main/java/DelayedStateChange.java @@ -5,6 +5,12 @@ import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!da") public final class DelayedStateChange extends SecondaryNode { + @OriginalMember(owner = "client!client", name = "U", descriptor = "Lclient!sc;") + public static final HashTable changes = new HashTable(16); + @OriginalMember(owner = "client!la", name = "f", descriptor = "Lclient!ce;") + public static final SecondaryLinkedList clientQueue = new SecondaryLinkedList(); + @OriginalMember(owner = "client!rh", name = "e", descriptor = "Lclient!ce;") + public static final SecondaryLinkedList serverQueue = new SecondaryLinkedList(); @OriginalMember(owner = "client!da", name = "T", descriptor = "I") public int intArg2; @@ -22,10 +28,17 @@ public final class DelayedStateChange extends SecondaryNode { this.key = (long) arg0 << 32 | (long) arg1; } - @OriginalMember(owner = "client!da", name = "a", descriptor = "(Z)V") + @OriginalMember(owner = "client!bj", name = "d", descriptor = "(B)V") + public static void clear() { + changes.clear(); + clientQueue.clear(); + serverQueue.clear(); + } + + @OriginalMember(owner = "client!da", name = "a", descriptor = "(Z)V") public final void pushClient() { this.secondaryKey = MonotonicClock.currentTimeMillis() + 500L | Long.MIN_VALUE & this.secondaryKey; - Static140.clientQueue.addTail(this); + clientQueue.addTail(this); } @OriginalMember(owner = "client!da", name = "b", descriptor = "(Z)J") @@ -47,7 +60,7 @@ public final class DelayedStateChange extends SecondaryNode { public final void pushServer() { this.secondaryKey |= Long.MIN_VALUE; if (this.getTime() == 0L) { - Static215.serverQueue.addTail(this); + serverQueue.addTail(this); } } } diff --git a/client/src/main/java/DisplayMode.java b/client/src/main/java/DisplayMode.java new file mode 100644 index 0000000..c1d3920 --- /dev/null +++ b/client/src/main/java/DisplayMode.java @@ -0,0 +1,23 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +import java.awt.*; + +public class DisplayMode { + @OriginalMember(owner = "client!c", name = "a", descriptor = "(Ljava/awt/Frame;ZLsignlink!ll;)V") + public static void exitFullScreen(@OriginalArg(0) Frame arg0, @OriginalArg(2) SignLink arg1) { + while (true) { + @Pc(16) PrivilegedRequest local16 = arg1.exitFullScreen(arg0); + while (local16.status == 0) { + ThreadUtils.sleep(10L); + } + if (local16.status == 1) { + arg0.setVisible(false); + arg0.dispose(); + return; + } + ThreadUtils.sleep(100L); + } + } +} diff --git a/client/src/main/java/FloType.java b/client/src/main/java/FloType.java index df7f6e6..147557e 100644 --- a/client/src/main/java/FloType.java +++ b/client/src/main/java/FloType.java @@ -6,7 +6,9 @@ import org.openrs2.deob.annotation.Pc; @OriginalClass("client!wl") public final class FloType { - @OriginalMember(owner = "client!wl", name = "j", descriptor = "Z") + @OriginalMember(owner = "client!ca", name = "db", descriptor = "I") + public static int anInt865 = 0; + @OriginalMember(owner = "client!wl", name = "j", descriptor = "Z") public boolean aBoolean310 = false; @OriginalMember(owner = "client!wl", name = "l", descriptor = "Z") @@ -63,7 +65,7 @@ public final class FloType { } else if (arg0 == 7) { this.anInt5894 = Static15.method492(arg1.g3()); } else if (arg0 == 8) { - Static26.anInt865 = arg2; + anInt865 = arg2; } else if (arg0 == 9) { this.anInt5885 = arg1.g2(); } else if (arg0 == 10) { diff --git a/client/src/main/java/FloTypeList.java b/client/src/main/java/FloTypeList.java new file mode 100644 index 0000000..2457975 --- /dev/null +++ b/client/src/main/java/FloTypeList.java @@ -0,0 +1,6 @@ +import org.openrs2.deob.annotation.OriginalMember; + +public class FloTypeList { + @OriginalMember(owner = "client!hj", name = "a", descriptor = "I") + public static int capacity; +} diff --git a/client/src/main/java/Font.java b/client/src/main/java/Font.java index a77ad06..3c71d21 100644 --- a/client/src/main/java/Font.java +++ b/client/src/main/java/Font.java @@ -152,14 +152,14 @@ public abstract class Font extends SecondaryNode { if (GlRenderer.enabled) { Static46.method1174(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local323, Static218.strikethroughColor); } else { - Static129.method2489(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local323, Static218.strikethroughColor); + SoftwareRaster.drawHorizontalLine(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local323, Static218.strikethroughColor); } } if (Static218.underlineColor != -1) { if (GlRenderer.enabled) { Static46.method1174(arg1, local4 + this.lineHeight + 1, local323, Static218.underlineColor); } else { - Static129.method2489(arg1, local4 + this.lineHeight + 1, local323, Static218.underlineColor); + SoftwareRaster.drawHorizontalLine(arg1, local4 + this.lineHeight + 1, local323, Static218.underlineColor); } } arg1 += local323; @@ -844,14 +844,14 @@ public abstract class Font extends SecondaryNode { if (GlRenderer.enabled) { Static46.method1174(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local387, Static218.strikethroughColor); } else { - Static129.method2489(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local387, Static218.strikethroughColor); + SoftwareRaster.drawHorizontalLine(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local387, Static218.strikethroughColor); } } if (Static218.underlineColor != -1) { if (GlRenderer.enabled) { Static46.method1174(arg1, local4 + this.lineHeight, local387, Static218.underlineColor); } else { - Static129.method2489(arg1, local4 + this.lineHeight, local387, Static218.underlineColor); + SoftwareRaster.drawHorizontalLine(arg1, local4 + this.lineHeight, local387, Static218.underlineColor); } } arg1 += local387; diff --git a/client/src/main/java/Fonts.java b/client/src/main/java/Fonts.java new file mode 100644 index 0000000..f2a84d7 --- /dev/null +++ b/client/src/main/java/Fonts.java @@ -0,0 +1,36 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class Fonts { + @OriginalMember(owner = "client!j", name = "x", descriptor = "Lclient!rk;") + public static Font p11Full; + @OriginalMember(owner = "client!rh", name = "h", descriptor = "Lclient!rk;") + public static Font p12Full; + @OriginalMember(owner = "client!wl", name = "q", descriptor = "Lclient!rk;") + public static Font b12Full; + + @OriginalMember(owner = "client!fn", name = "a", descriptor = "(Lclient!ve;Lclient!ve;Z)I") + public static int getReady(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1) { + @Pc(5) int ready = 0; + if (arg0.isFileReady(Sprites.p11FullId)) { + ready++; + } + if (arg0.isFileReady(Sprites.p12FullId)) { + ready++; + } + if (arg0.isFileReady(Sprites.b12FullId)) { + ready++; + } + if (arg1.isFileReady(Sprites.p11FullId)) { + ready++; + } + if (arg1.isFileReady(Sprites.p12FullId)) { + ready++; + } + if (arg1.isFileReady(Sprites.b12FullId)) { + ready++; + } + return ready; + } +} diff --git a/client/src/main/java/FrameBuffer.java b/client/src/main/java/FrameBuffer.java index 174cc05..baedb50 100644 --- a/client/src/main/java/FrameBuffer.java +++ b/client/src/main/java/FrameBuffer.java @@ -25,7 +25,7 @@ public abstract class FrameBuffer { @OriginalMember(owner = "client!vk", name = "a", descriptor = "(I)V") public final void makeTarget() { - Static129.method2491(this.pixels, this.width, this.height); + SoftwareRaster.method2491(this.pixels, this.width, this.height); } @OriginalMember(owner = "client!vk", name = "a", descriptor = "(IIIILjava/awt/Graphics;I)V") diff --git a/client/src/main/java/GameShell.java b/client/src/main/java/GameShell.java index 061a8f0..e800ea3 100644 --- a/client/src/main/java/GameShell.java +++ b/client/src/main/java/GameShell.java @@ -158,14 +158,27 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } for (@Pc(19) int i = 0; i < 50 && signLink.eventQueue.peekEvent() != null; i++) { - Static231.sleep(1L); + ThreadUtils.sleep(1L); } if (source != null) { signLink.eventQueue.postEvent(new ActionEvent(source, 1001, "dummy")); } } - @OriginalMember(owner = "client!rc", name = "focusLost", descriptor = "(Ljava/awt/event/FocusEvent;)V") + @OriginalMember(owner = "client!ta", name = "a", descriptor = "(Z)V") + public static void resetTimer() { + timer.reset(); + @Pc(10) int local10; + for (local10 = 0; local10 < 32; local10++) { + redrawTimes[local10] = 0L; + } + for (local10 = 0; local10 < 32; local10++) { + logicTimes[local10] = 0L; + } + logicCycles = 0; + } + + @OriginalMember(owner = "client!rc", name = "focusLost", descriptor = "(Ljava/awt/event/FocusEvent;)V") @Override public final void focusLost(@OriginalArg(0) FocusEvent event) { focusIn = false; @@ -256,7 +269,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public final void destroy() { if (instance == this && !shutdown) { killTime = MonotonicClock.currentTimeMillis(); - Static231.sleep(5000L); + ThreadUtils.sleep(5000L); Static69.signLink = null; this.shutdown(false); } @@ -507,9 +520,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } getMaxMemory(); this.addCanvas(); - Static260.frameBuffer = Static131.create(canvasHeight, canvasWidth, canvas); + client.frameBuffer = Static131.create(canvasHeight, canvasWidth, canvas); this.mainInit(); - timer = Static70.create(); + timer = Timer.create(); long lastUpdateTime = 0; long lastDrawTime = 0; @@ -542,7 +555,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } } catch (@Pc(198) Exception ex) { - Static89.report(null, ex); + TracingException.report(null, ex); this.error("crash"); } this.shutdown(true); @@ -595,11 +608,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene Static69.signLink = signLink = new SignLink(null, cacheId, cacheSubDir, 28); @Pc(76) PrivilegedRequest request = signLink.startThread(1, this); while (request.status == 0) { - Static231.sleep(10L); + ThreadUtils.sleep(10L); } thread = (Thread) request.result; } catch (@Pc(91) Exception ex) { - Static89.report(null, ex); + TracingException.report(null, ex); } } @@ -647,11 +660,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } @Pc(86) PrivilegedRequest request = signLink.startThread(1, this); while (request.status == 0) { - Static231.sleep(10L); + ThreadUtils.sleep(10L); } thread = (Thread) request.result; } catch (@Pc(103) Exception ex) { - Static89.report(null, ex); + TracingException.report(null, ex); this.error("crash"); } } diff --git a/client/src/main/java/GlModel.java b/client/src/main/java/GlModel.java index f6c88e6..954b4d9 100644 --- a/client/src/main/java/GlModel.java +++ b/client/src/main/java/GlModel.java @@ -208,7 +208,7 @@ public final class GlModel extends Model { this.aClass5_1 = new Class5(); this.aClass127_4 = new GlBuffer(); this.aClass127_1 = new GlBuffer(); - if (Static178.highDetailLighting) { + if (Preferences.highDetailLighting) { this.aClass127_2 = new GlBuffer(); } this.aClass127_3 = new GlBuffer(); @@ -1940,7 +1940,7 @@ public final class GlModel extends Model { throw new IllegalArgumentException(); } else if (this.anInt5296 != 0) { if (arg5) { - @Pc(26) boolean local26 = !this.aClass127_1.aBoolean235 && (arg1 || arg2 && !Static178.highDetailLighting); + @Pc(26) boolean local26 = !this.aClass127_1.aBoolean235 && (arg1 || arg2 && !Preferences.highDetailLighting); this.method4113(false, !this.aClass127_4.aBoolean235 && arg0, local26, this.aClass127_2 != null && !this.aClass127_2.aBoolean235 && arg2, !this.aClass127_3.aBoolean235); if (!this.aClass127_5.aBoolean235 && arg3 && arg1) { this.method4103(); @@ -1968,7 +1968,7 @@ public final class GlModel extends Model { this.aByte19 = (byte) (this.aByte19 | 0x2); } } - if (arg2 && Static178.highDetailLighting) { + if (arg2 && Preferences.highDetailLighting) { if (this.aClass127_2.aBoolean235) { this.aShortArray76 = null; this.aShortArray79 = null; @@ -2077,7 +2077,7 @@ public final class GlModel extends Model { } } if (arg2) { - if (Static178.highDetailLighting) { + if (Preferences.highDetailLighting) { for (local60 = 0; local60 < this.anInt5297; local60++) { local71 = Static237.method4096(this.aShortArray75[local60], this.aShortArray80[local60], this.aShort29, this.aByteArray71[local60]); Static237.aClass3_Sub15_8.offset = this.aClass127_1.anInt4777 + this.aShortArray77[local60] * local1; @@ -2426,7 +2426,7 @@ public final class GlModel extends Model { arg3.aShortArray85[local69] = this.aShortArray85[local69]; arg3.aShortArray86[local69] = this.aShortArray86[local69]; } - if (Static178.highDetailLighting) { + if (Preferences.highDetailLighting) { if (arg4.aClass127_2 == null) { arg4.aClass127_2 = new GlBuffer(); } @@ -2531,7 +2531,7 @@ public final class GlModel extends Model { local3.aShortArray75 = Static263.method4511(this.aShortArray75); } local3.aByteArray71 = this.aByteArray71; - if (arg2 && arg3 && (arg6 && arg4 || Static178.highDetailLighting)) { + if (arg2 && arg3 && (arg6 && arg4 || Preferences.highDetailLighting)) { local3.aClass127_1 = this.aClass127_1; } else { local3.aClass127_1 = new GlBuffer(); @@ -2547,7 +2547,7 @@ public final class GlModel extends Model { local3.aShortArray85 = Static263.method4511(this.aShortArray85); local3.aShortArray86 = Static263.method4511(this.aShortArray86); } - if (!Static178.highDetailLighting) { + if (!Preferences.highDetailLighting) { local3.aClass127_2 = null; } else if (arg4 && arg5 && arg6) { local3.aClass127_2 = this.aClass127_2; @@ -3022,7 +3022,7 @@ public final class GlModel extends Model { } local1.glColorPointer(4, GL2.GL_UNSIGNED_BYTE, this.aClass127_1.anInt4782, (long) this.aClass127_1.anInt4777); } - if (Static178.highDetailLighting && this.aClass127_2.aClass155_4 != null) { + if (Preferences.highDetailLighting && this.aClass127_2.aClass155_4 != null) { if (local172 != this.aClass127_2.aClass155_4) { this.aClass127_2.aClass155_4.method4516(); local172 = this.aClass127_2.aClass155_4; @@ -3039,7 +3039,7 @@ public final class GlModel extends Model { if (this.aClass127_5.aClass155_4 != null) { this.aClass127_5.aClass155_4.method4518(); } - if (this.aClass127_4.aClass155_4 == null || this.aClass127_1.aClass155_4 == null || Static178.highDetailLighting && this.aClass127_2.aClass155_4 == null || this.aClass127_3.aClass155_4 == null) { + if (this.aClass127_4.aClass155_4 == null || this.aClass127_1.aClass155_4 == null || Preferences.highDetailLighting && this.aClass127_2.aClass155_4 == null || this.aClass127_3.aClass155_4 == null) { if (GlRenderer.arbVboSupported) { local1.glBindBuffer(GL2.GL_ARRAY_BUFFER, 0); } @@ -3051,7 +3051,7 @@ public final class GlModel extends Model { this.aClass127_1.aByteBuffer8.position(this.aClass127_1.anInt4777); local1.glColorPointer(4, GL2.GL_UNSIGNED_BYTE, this.aClass127_1.anInt4782, this.aClass127_1.aByteBuffer8); } - if (Static178.highDetailLighting && this.aClass127_2.aClass155_4 == null) { + if (Preferences.highDetailLighting && this.aClass127_2.aClass155_4 == null) { this.aClass127_2.aByteBuffer8.position(this.aClass127_2.anInt4777); local1.glNormalPointer(GL2.GL_FLOAT, this.aClass127_2.anInt4782, this.aClass127_2.aByteBuffer8); } diff --git a/client/src/main/java/GlRenderer.java b/client/src/main/java/GlRenderer.java index 9acc3e5..9e4b44f 100644 --- a/client/src/main/java/GlRenderer.java +++ b/client/src/main/java/GlRenderer.java @@ -565,7 +565,7 @@ public final class GlRenderer { @OriginalMember(owner = "client!tf", name = "p", descriptor = "()V") public static void method4173() { - if (Static178.highDetailLighting) { + if (Preferences.highDetailLighting) { setLightingEnabled(true); setNormalArrayEnabled(true); } else { @@ -686,7 +686,7 @@ public final class GlRenderer { if (swapBuffersAttempts++ > 5) { return -2; } - Static231.sleep(1000L); + ThreadUtils.sleep(1000L); } if (window.getLock().isLocked()) { window.unlockSurface(); @@ -714,7 +714,7 @@ public final class GlRenderer { quit(); return -3; } - Static231.sleep(100L); + ThreadUtils.sleep(100L); } } gl.glClear(GL2.GL_COLOR_BUFFER_BIT); diff --git a/client/src/main/java/GlTile.java b/client/src/main/java/GlTile.java index fdbd1f6..5cdbb67 100644 --- a/client/src/main/java/GlTile.java +++ b/client/src/main/java/GlTile.java @@ -291,7 +291,7 @@ public final class GlTile extends Node { local257.glVertexPointer(3, GL2.GL_FLOAT, local282, this.aByteBuffer3); this.aByteBuffer3.position(12); local257.glColorPointer(4, GL2.GL_UNSIGNED_BYTE, local282, this.aByteBuffer3); - if (Static178.highDetailLighting) { + if (Preferences.highDetailLighting) { this.aByteBuffer3.position(16); local257.glNormalPointer(GL2.GL_FLOAT, local282, this.aByteBuffer3); } @@ -307,7 +307,7 @@ public final class GlTile extends Node { this.aClass155_3.method4516(); local257.glVertexPointer(3, GL2.GL_FLOAT, local282, 0L); local257.glColorPointer(4, GL2.GL_UNSIGNED_BYTE, local282, 12L); - if (Static178.highDetailLighting) { + if (Preferences.highDetailLighting) { local257.glNormalPointer(GL2.GL_FLOAT, local282, 16L); } local257.glTexCoordPointer(2, GL2.GL_FLOAT, local282, 28L); diff --git a/client/src/main/java/HashTable.java b/client/src/main/java/HashTable.java index f1c27c4..b4b2b6a 100644 --- a/client/src/main/java/HashTable.java +++ b/client/src/main/java/HashTable.java @@ -36,7 +36,7 @@ public final class HashTable { } @OriginalMember(owner = "client!sc", name = "a", descriptor = "(I)V") - public final void method3856() { + public final void clear() { for (@Pc(5) int local5 = 0; local5 < this.anInt5023; local5++) { @Pc(14) Node local14 = this.aClass3Array1[local5]; while (true) { diff --git a/client/src/main/java/IntUtils.java b/client/src/main/java/IntUtils.java new file mode 100644 index 0000000..923c231 --- /dev/null +++ b/client/src/main/java/IntUtils.java @@ -0,0 +1,22 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class IntUtils { + @OriginalMember(owner = "client!ra", name = "b", descriptor = "(III)I") + public static int pow(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { + @Pc(15) int local15 = 1; + while (arg0 > 1) { + if ((arg0 & 0x1) != 0) { + local15 *= arg1; + } + arg1 *= arg1; + arg0 >>= 0x1; + } + if (arg0 == 1) { + return local15 * arg1; + } else { + return local15; + } + } +} diff --git a/client/src/main/java/InterfaceList.java b/client/src/main/java/InterfaceList.java new file mode 100644 index 0000000..80fdbb4 --- /dev/null +++ b/client/src/main/java/InterfaceList.java @@ -0,0 +1,12 @@ +import org.openrs2.deob.annotation.OriginalMember; + +public class InterfaceList { + @OriginalMember(owner = "client!p", name = "c", descriptor = "Lclient!ih;") + public static final LinkedList lowPriorityRequests = new LinkedList(); + @OriginalMember(owner = "client!ch", name = "y", descriptor = "[Z") + public static final boolean[] rectangleRedraw = new boolean[100]; + @OriginalMember(owner = "client!bn", name = "V", descriptor = "I") + public static int anInt766 = 0; + @OriginalMember(owner = "client!md", name = "W", descriptor = "I") + public static int topLevelInterface = -1; +} diff --git a/client/src/main/java/JagString.java b/client/src/main/java/JagString.java index c7d3969..5cca1ec 100644 --- a/client/src/main/java/JagString.java +++ b/client/src/main/java/JagString.java @@ -12,7 +12,9 @@ import org.openrs2.deob.annotation.Pc; @OriginalClass("client!na") public final class JagString implements StringInterface { - @OriginalMember(owner = "client!na", name = "T", descriptor = "[B") + @OriginalMember(owner = "client!pa", name = "O", descriptor = "Lclient!na;") + public static final JagString EMPTY = Static28.parse(""); + @OriginalMember(owner = "client!na", name = "T", descriptor = "[B") public byte[] chars; @OriginalMember(owner = "client!na", name = "lb", descriptor = "I") @@ -21,6 +23,84 @@ public final class JagString implements StringInterface { @OriginalMember(owner = "client!na", name = "N", descriptor = "Z") private boolean aBoolean193 = true; + @OriginalMember(owner = "client!ck", name = "a", descriptor = "([Lclient!na;B)Lclient!na;") + public static JagString concatenate(@OriginalArg(0) JagString[] arg0) { + if (arg0.length < 2) { + throw new IllegalArgumentException(); + } + return method2355(0, arg0.length, arg0); + } + + @OriginalMember(owner = "client!jd", name = "a", descriptor = "(II[Lclient!na;I)Lclient!na;") + public static JagString method2355(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) JagString[] arg2) { + @Pc(5) int local5 = 0; + for (@Pc(7) int local7 = 0; local7 < arg1; local7++) { + if (arg2[arg0 + local7] == null) { + arg2[local7 + arg0] = Static193.aClass100_853; + } + local5 += arg2[local7 + arg0].length; + } + @Pc(39) byte[] local39 = new byte[local5]; + @Pc(41) int local41 = 0; + for (@Pc(43) int local43 = 0; local43 < arg1; local43++) { + @Pc(52) JagString local52 = arg2[local43 + arg0]; + copy(local52.chars, 0, local39, local41, local52.length); + local41 += local52.length; + } + @Pc(71) JagString local71 = new JagString(); + local71.length = local5; + local71.chars = local39; + return local71; + } + + @OriginalMember(owner = "client!kg", name = "a", descriptor = "([BI[BII)V") + public static void copy(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) byte[] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { + @Pc(15) int local15; + if (arg0 == arg2) { + if (arg1 == arg3) { + return; + } + if (arg3 > arg1 && arg3 < arg1 + arg4) { + local15 = arg4 - 1; + @Pc(19) int local19 = arg1 + local15; + @Pc(23) int local23 = arg3 + local15; + local15 = local19 - local15; + local15 += 7; + while (local19 >= local15) { + arg2[local23--] = arg0[local19--]; + arg2[local23--] = arg0[local19--]; + arg2[local23--] = arg0[local19--]; + arg2[local23--] = arg0[local19--]; + arg2[local23--] = arg0[local19--]; + arg2[local23--] = arg0[local19--]; + arg2[local23--] = arg0[local19--]; + arg2[local23--] = arg0[local19--]; + } + local15 -= 7; + while (local19 >= local15) { + arg2[local23--] = arg0[local19--]; + } + return; + } + } + local15 = arg4 + arg1; + @Pc(115) int local115 = local15 - 7; + while (arg1 < local115) { + arg2[arg3++] = arg0[arg1++]; + arg2[arg3++] = arg0[arg1++]; + arg2[arg3++] = arg0[arg1++]; + arg2[arg3++] = arg0[arg1++]; + arg2[arg3++] = arg0[arg1++]; + arg2[arg3++] = arg0[arg1++]; + arg2[arg3++] = arg0[arg1++]; + arg2[arg3++] = arg0[arg1++]; + } + local15 = local115 + 7; + while (arg1 < local15) { + arg2[arg3++] = arg0[arg1++]; + } + } + @OriginalMember(owner = "client!na", name = "a", descriptor = "(Z)Ljava/net/URL;") public final URL method3107() throws MalformedURLException { return new URL(new String(this.chars, 0, this.length)); @@ -135,10 +215,10 @@ public final class JagString implements StringInterface { for (local31 = 1; local31 < arg0.length + this.length; local31 += local31) { } @Pc(51) byte[] local51 = new byte[local31]; - Static289.copy(this.chars, 0, local51, 0, this.length); + copy(this.chars, 0, local51, 0, this.length); this.chars = local51; } - Static289.copy(arg0.chars, 0, this.chars, this.length, arg0.length); + copy(arg0.chars, 0, this.chars, this.length, arg0.length); this.length += arg0.length; return this; } @@ -212,10 +292,10 @@ public final class JagString implements StringInterface { for (local43 = 1; local43 < this.length + arg0.length; local43 += local43) { } @Pc(63) byte[] local63 = new byte[local43]; - Static289.copy(this.chars, 0, local63, 0, this.length); + copy(this.chars, 0, local63, 0, this.length); this.chars = local63; } - Static289.copy(arg0.chars, arg1, this.chars, this.length, arg2 - arg1); + copy(arg0.chars, arg1, this.chars, this.length, arg2 - arg1); this.length += arg2 - arg1; return this; } else { @@ -329,7 +409,7 @@ public final class JagString implements StringInterface { @Pc(23) JagString local23 = new JagString(); local23.chars = new byte[this.length + 1]; local23.length = this.length + 1; - Static289.copy(this.chars, 0, local23.chars, 0, this.length); + copy(this.chars, 0, local23.chars, 0, this.length); local23.chars[this.length] = (byte) arg0; return local23; } @@ -381,7 +461,7 @@ public final class JagString implements StringInterface { for (local30 = 1; local30 < arg0; local30 += local30) { } @Pc(45) byte[] local45 = new byte[local30]; - Static289.copy(this.chars, 0, local45, 0, this.length); + copy(this.chars, 0, local45, 0, this.length); this.chars = local45; } for (local30 = this.length; local30 < arg0; local30++) { @@ -424,7 +504,7 @@ public final class JagString implements StringInterface { @Pc(7) JagString local7 = new JagString(); local7.length = arg0 - arg1; local7.chars = new byte[arg0 - arg1]; - Static289.copy(this.chars, arg1, local7.chars, 0, local7.length); + copy(this.chars, arg1, local7.chars, 0, local7.length); return local7; } @@ -683,7 +763,7 @@ public final class JagString implements StringInterface { @OriginalMember(owner = "client!na", name = "i", descriptor = "(I)[B") public final byte[] method3148() { @Pc(7) byte[] local7 = new byte[this.length]; - Static289.copy(this.chars, 0, local7, 0, this.length); + copy(this.chars, 0, local7, 0, this.length); return local7; } @@ -725,7 +805,7 @@ public final class JagString implements StringInterface { for (local44 = 1; local44 <= this.length; local44 += local44) { } @Pc(61) byte[] local61 = new byte[local44]; - Static289.copy(this.chars, 0, local61, 0, this.length); + copy(this.chars, 0, local61, 0, this.length); this.chars = local61; } this.chars[this.length++] = (byte) arg0; @@ -769,7 +849,7 @@ public final class JagString implements StringInterface { } if (this.chars.length != this.length) { @Pc(26) byte[] local26 = new byte[this.length]; - Static289.copy(this.chars, 0, local26, 0, this.length); + copy(this.chars, 0, local26, 0, this.length); this.chars = local26; } return this; @@ -814,7 +894,7 @@ public final class JagString implements StringInterface { @OriginalMember(owner = "client!na", name = "a", descriptor = "(Z[BIII)I") public final int encodeString(@OriginalArg(1) byte[] arg0, @OriginalArg(2) int arg1, @OriginalArg(4) int arg2) { - Static289.copy(this.chars, 0, arg0, arg1, arg2); + copy(this.chars, 0, arg0, arg1, arg2); return arg2; } } diff --git a/client/src/main/java/Js5.java b/client/src/main/java/Js5.java index 7fc19f6..76d83fc 100644 --- a/client/src/main/java/Js5.java +++ b/client/src/main/java/Js5.java @@ -72,7 +72,7 @@ public final class Js5 { } @OriginalMember(owner = "client!ve", name = "a", descriptor = "(ILclient!na;)I") - public final int method4478(@OriginalArg(1) JagString arg0) { + public final int getPercentageComplete(@OriginalArg(1) JagString arg0) { if (this.method4484()) { @Pc(15) JagString local15 = arg0.toLowerCase(); @Pc(29) int local29 = this.aClass70_2.aClass76_1.method2405(local15.method3154()); @@ -286,7 +286,7 @@ public final class Js5 { } @Pc(140) byte[] local140; try { - local140 = Static162.method3092(local114); + local140 = Js5Compression.uncompress(local114); } catch (@Pc(142) RuntimeException local142) { System.out.println("T3 - " + (arg1 != null) + "," + arg0 + "," + local114.length + "," + Static71.method1442(local114, local114.length) + "," + Static71.method1442(local114, local114.length - 2) + "," + this.aClass70_2.anIntArray268[arg0] + "," + this.aClass70_2.anInt2911); local140 = new byte[] { 0 }; @@ -326,7 +326,7 @@ public final class Js5 { local320 = 0; for (@Pc(322) int local322 = 0; local322 < local31; local322++) { local320 += local233.g4(); - Static289.copy(local140, local250, local282[local322], local239[local322], local320); + JagString.copy(local140, local250, local282[local322], local239[local322], local320); local250 += local320; local239[local322] += local320; } @@ -374,7 +374,7 @@ public final class Js5 { } @OriginalMember(owner = "client!ve", name = "a", descriptor = "(Lclient!na;I)Z") - public final boolean method4497(@OriginalArg(0) JagString arg0) { + public final boolean isGroupNameValid(@OriginalArg(0) JagString arg0) { if (this.method4484()) { @Pc(19) JagString local19 = arg0.toLowerCase(); @Pc(28) int local28 = this.aClass70_2.aClass76_1.method2405(local19.method3154()); diff --git a/client/src/main/java/Js5CacheQueue.java b/client/src/main/java/Js5CacheQueue.java index 2efdaa8..59452a9 100644 --- a/client/src/main/java/Js5CacheQueue.java +++ b/client/src/main/java/Js5CacheQueue.java @@ -22,7 +22,7 @@ public final class Js5CacheQueue implements Runnable { public Js5CacheQueue() { @Pc(20) PrivilegedRequest local20 = GameShell.signLink.startThread(5, this); while (local20.status == 0) { - Static231.sleep(10L); + ThreadUtils.sleep(10L); } if (local20.status == 2) { throw new RuntimeException(); @@ -126,7 +126,7 @@ public final class Js5CacheQueue implements Runnable { local19.aByteArray11 = local19.aClass49_3.read((int) local19.secondaryKey); } } catch (@Pc(83) Exception local83) { - Static89.report(null, local83); + TracingException.report(null, local83); } local19.aBoolean226 = false; } diff --git a/client/src/main/java/Js5CachedResourceProvider.java b/client/src/main/java/Js5CachedResourceProvider.java index f91a472..72746ec 100644 --- a/client/src/main/java/Js5CachedResourceProvider.java +++ b/client/src/main/java/Js5CachedResourceProvider.java @@ -98,7 +98,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider { } local15 = new Node(); local15.key = arg0; - this.aClass69_16.method2282(local15); + this.aClass69_16.addTail(local15); } @OriginalMember(owner = "client!bg", name = "b", descriptor = "(I)Lclient!ii;") @@ -227,7 +227,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider { local32 = false; local37 = new Node(); local37.key = this.anInt578; - this.aClass69_17.method2282(local37); + this.aClass69_17.addTail(local37); } this.anInt578++; } @@ -263,7 +263,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider { if (this.aByteArray9[this.anInt578] != 1) { local37 = new Node(); local37.key = this.anInt578; - this.aClass69_17.method2282(local37); + this.aClass69_17.addTail(local37); local32 = false; } this.anInt578++; diff --git a/client/src/main/java/Js5Compression.java b/client/src/main/java/Js5Compression.java new file mode 100644 index 0000000..117509b --- /dev/null +++ b/client/src/main/java/Js5Compression.java @@ -0,0 +1,38 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public final class Js5Compression { + + @OriginalMember(owner = "client!mf", name = "x", descriptor = "Lclient!ha;") + public static final GzipDecompressor GZIP_DECOMPRESSOR = new GzipDecompressor(); + + @OriginalMember(owner = "client!kf", name = "j", descriptor = "I") + public static final int MAX_LENGTH = 0; + + @OriginalMember(owner = "client!ml", name = "a", descriptor = "(B[B)[B") + public static byte[] uncompress(@OriginalArg(1) byte[] in) { + @Pc(17) Buffer buffer = new Buffer(in); + @Pc(21) int type = buffer.g1(); + @Pc(25) int len = buffer.g4(); + if (len < 0 || MAX_LENGTH != 0 && MAX_LENGTH < len) { + throw new RuntimeException(); + } else if (type == 0) { + @Pc(53) byte[] bytes = new byte[len]; + buffer.gBytes(len, bytes); + return bytes; + } else { + @Pc(65) int uncompressedLen = buffer.g4(); + if (uncompressedLen < 0 || MAX_LENGTH != 0 && MAX_LENGTH < uncompressedLen) { + throw new RuntimeException(); + } + @Pc(85) byte[] out = new byte[uncompressedLen]; + if (type == 1) { + Bzip2Decompressor.bunzip2(out, uncompressedLen, in, len); + } else { + GZIP_DECOMPRESSOR.method1842(out, buffer); + } + return out; + } + } +} diff --git a/client/src/main/java/Js5Index.java b/client/src/main/java/Js5Index.java index 633ae66..ddceb0d 100644 --- a/client/src/main/java/Js5Index.java +++ b/client/src/main/java/Js5Index.java @@ -59,7 +59,7 @@ public final class Js5Index { @OriginalMember(owner = "client!ii", name = "a", descriptor = "(I[B)V") private void method2293(@OriginalArg(1) byte[] arg0) { - @Pc(12) Buffer local12 = new Buffer(Static162.method3092(arg0)); + @Pc(12) Buffer local12 = new Buffer(Js5Compression.uncompress(arg0)); @Pc(16) int local16 = local12.g1(); if (local16 != 5 && local16 != 6) { throw new RuntimeException(); diff --git a/client/src/main/java/Keyboard.java b/client/src/main/java/Keyboard.java index 1f5552a..14c6295 100644 --- a/client/src/main/java/Keyboard.java +++ b/client/src/main/java/Keyboard.java @@ -275,7 +275,17 @@ public final class Keyboard implements KeyListener, FocusListener { component.addFocusListener(instance); } - @OriginalMember(owner = "client!uf", name = "keyPressed", descriptor = "(Ljava/awt/event/KeyEvent;)V") + @OriginalMember(owner = "client!ag", name = "h", descriptor = "(I)V") + public static void quit() { + if (instance != null) { + @Pc(4) Keyboard local4 = instance; + synchronized (instance) { + instance = null; + } + } + } + + @OriginalMember(owner = "client!uf", name = "keyPressed", descriptor = "(Ljava/awt/event/KeyEvent;)V") @Override public final synchronized void keyPressed(@OriginalArg(0) KeyEvent event) { if (instance == null) { diff --git a/client/src/main/java/LinkedList.java b/client/src/main/java/LinkedList.java index 8886cc5..ef9edd0 100644 --- a/client/src/main/java/LinkedList.java +++ b/client/src/main/java/LinkedList.java @@ -43,7 +43,7 @@ public final class LinkedList { } @OriginalMember(owner = "client!ih", name = "a", descriptor = "(ZLclient!ab;)V") - public final void method2282(@OriginalArg(1) Node arg0) { + public final void addTail(@OriginalArg(1) Node arg0) { if (arg0.aClass3_223 != null) { arg0.unlink(); } diff --git a/client/src/main/java/LoadingBar.java b/client/src/main/java/LoadingBar.java new file mode 100644 index 0000000..4a8519a --- /dev/null +++ b/client/src/main/java/LoadingBar.java @@ -0,0 +1,30 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class LoadingBar { + @OriginalMember(owner = "client!oj", name = "a", descriptor = "(BZLclient!rk;)V") + public static void render(@OriginalArg(1) boolean arg0, @OriginalArg(2) Font arg1) { + @Pc(9) int local9; + if (GlRenderer.enabled || arg0) { + local9 = GameShell.canvasHeight; + @Pc(15) int local15 = local9 * 956 / 503; + Static78.titleBg.renderResizedTransparent((GameShell.canvasWidth - local15) / 2, 0, local15, local9); + Static243.logo.renderTransparent(GameShell.canvasWidth / 2 - Static243.logo.width / 2, 18); + } + arg1.renderCenter(LocalizedText.GAME0_LOADING, GameShell.canvasWidth / 2, GameShell.canvasHeight / 2 - 26, 16777215, -1); + local9 = GameShell.canvasHeight / 2 - 18; + if (GlRenderer.enabled) { + Static46.method1179(GameShell.canvasWidth / 2 - 152, local9, 304, 34, 9179409); + Static46.method1179(GameShell.canvasWidth / 2 - 151, local9 - -1, 302, 32, 0); + Static46.method1186(GameShell.canvasWidth / 2 - 150, local9 + 2, Static199.mainLoadPercentage * 3, 30, 9179409); + Static46.method1186(GameShell.canvasWidth / 2 + Static199.mainLoadPercentage * 3 - 150, local9 + 2, 300 - Static199.mainLoadPercentage * 3, 30, 0); + } else { + SoftwareRaster.drawRect(GameShell.canvasWidth / 2 - 152, local9, 304, 34, 9179409); + SoftwareRaster.drawRect(GameShell.canvasWidth / 2 - 151, local9 + 1, 302, 32, 0); + SoftwareRaster.fillRect(GameShell.canvasWidth / 2 - 150, local9 + 2, Static199.mainLoadPercentage * 3, 30, 9179409); + SoftwareRaster.fillRect(Static199.mainLoadPercentage * 3 + GameShell.canvasWidth / 2 - 150, local9 + 2, 300 - Static199.mainLoadPercentage * 3, 30, 0); + } + arg1.renderCenter(Static126.mainLoadSecondaryText, GameShell.canvasWidth / 2, GameShell.canvasHeight / 2 + 4, 16777215, -1); + } +} diff --git a/client/src/main/java/LoadingBarAwt.java b/client/src/main/java/LoadingBarAwt.java new file mode 100644 index 0000000..8cfc551 --- /dev/null +++ b/client/src/main/java/LoadingBarAwt.java @@ -0,0 +1,61 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +import java.awt.*; +import java.awt.Font; + +public class LoadingBarAwt { + @OriginalMember(owner = "client!bc", name = "a", descriptor = "(Ljava/awt/Color;ZZLclient!na;I)V") + public static void render(@OriginalArg(0) Color arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) JagString arg2, @OriginalArg(4) int arg3) { + try { + @Pc(6) Graphics local6 = GameShell.canvas.getGraphics(); + if (Static222.aFont1 == null) { + Static222.aFont1 = new Font("Helvetica", 1, 13); + Static240.aFontMetrics1 = GameShell.canvas.getFontMetrics(Static222.aFont1); + } + if (arg1) { + local6.setColor(Color.black); + local6.fillRect(0, 0, GameShell.canvasWidth, GameShell.canvasHeight); + } + if (arg0 == null) { + arg0 = new Color(140, 17, 17); + } + try { + if (Static149.anImage3 == null) { + Static149.anImage3 = GameShell.canvas.createImage(304, 34); + } + @Pc(56) Graphics local56 = Static149.anImage3.getGraphics(); + local56.setColor(arg0); + local56.drawRect(0, 0, 303, 33); + local56.fillRect(2, 2, arg3 * 3, 30); + local56.setColor(Color.black); + local56.drawRect(1, 1, 301, 31); + local56.fillRect(arg3 * 3 + 2, 2, 300 - arg3 * 3, 30); + local56.setFont(Static222.aFont1); + local56.setColor(Color.white); + arg2.method3112(22, (304 - arg2.method3155(Static240.aFontMetrics1)) / 2, local56); + local6.drawImage(Static149.anImage3, GameShell.canvasWidth / 2 - 152, GameShell.canvasHeight / 2 + -18, null); + } catch (@Pc(134) Exception local134) { + @Pc(140) int local140 = GameShell.canvasWidth / 2 - 152; + @Pc(146) int local146 = GameShell.canvasHeight / 2 - 18; + local6.setColor(arg0); + local6.drawRect(local140, local146, 303, 33); + local6.fillRect(local140 + 2, local146 + 2, arg3 * 3, 30); + local6.setColor(Color.black); + local6.drawRect(local140 + 1, local146 - -1, 301, 31); + local6.fillRect(arg3 * 3 + local140 + 2, local146 + 2, 300 - arg3 * 3, 30); + local6.setFont(Static222.aFont1); + local6.setColor(Color.white); + arg2.method3112(local146 + 22, local140 + (-arg2.method3155(Static240.aFontMetrics1) + 304) / 2, local6); + } + if (Static278.mainLoadPrimaryText != null) { + local6.setFont(Static222.aFont1); + local6.setColor(Color.white); + Static278.mainLoadPrimaryText.method3112(GameShell.canvasHeight / 2 - 26, GameShell.canvasWidth / 2 - Static278.mainLoadPrimaryText.method3155(Static240.aFontMetrics1) / 2, local6); + } + } catch (@Pc(252) Exception local252) { + GameShell.canvas.repaint(); + } + } +} diff --git a/client/src/main/java/Loc.java b/client/src/main/java/Loc.java index 7095317..9be6833 100644 --- a/client/src/main/java/Loc.java +++ b/client/src/main/java/Loc.java @@ -197,7 +197,7 @@ public final class Loc extends Entity { } } while (local10 > this.aClass144_2.anIntArray474[this.anInt1297]) { - Static152.method2836(arg0, this.aClass144_2, arg1, false, this.anInt1297); + SoundPlayer.playSeqSound(arg0, this.aClass144_2, arg1, false, this.anInt1297); local10 -= this.aClass144_2.anIntArray474[this.anInt1297]; this.anInt1297++; if (this.aClass144_2.frames.length <= this.anInt1297) { @@ -234,7 +234,7 @@ public final class Loc extends Entity { return null; } @Pc(69) int local69; - if (Static266.game != 0 && this.aBoolean80 && (this.aClass144_2 == null || this.aClass144_2 != null && this.aClass144_2.anInt5361 != local19.anInt4430)) { + if (client.game != 0 && this.aBoolean80 && (this.aClass144_2 == null || this.aClass144_2 != null && this.aClass144_2.anInt5361 != local19.anInt4430)) { local69 = local19.anInt4430; if (local19.anInt4430 == -1) { local69 = local22; @@ -269,7 +269,7 @@ public final class Loc extends Entity { @Pc(192) int local192 = (local157 >> 1) + this.anInt1300; @Pc(201) int local201 = (local157 + 1 >> 1) + this.anInt1300; this.method1047(local192 * 128, local185 * 128); - @Pc(256) boolean local256 = !local12 && local19.aBoolean212 && (local19.anInt4426 != this.anInt1321 || (this.anInt1297 != this.anInt1322 || this.aClass144_2 != null && (this.aClass144_2.aBoolean280 || Static204.applyTweening) && this.anInt1297 != this.anInt1304) && Static139.sceneryShadowsType >= 2); + @Pc(256) boolean local256 = !local12 && local19.aBoolean212 && (local19.anInt4426 != this.anInt1321 || (this.anInt1297 != this.anInt1322 || this.aClass144_2 != null && (this.aClass144_2.aBoolean280 || Static204.applyTweening) && this.anInt1297 != this.anInt1304) && Preferences.sceneryShadowsType >= 2); if (arg0 && !local256) { return null; } diff --git a/client/src/main/java/LocType.java b/client/src/main/java/LocType.java index b543471..b789754 100644 --- a/client/src/main/java/LocType.java +++ b/client/src/main/java/LocType.java @@ -85,7 +85,7 @@ public final class LocType { public int anInt4419 = 0; @OriginalMember(owner = "client!pb", name = "h", descriptor = "I") - public int anInt4400 = -1; + public int mapElement = -1; @OriginalMember(owner = "client!pb", name = "L", descriptor = "Z") public boolean aBoolean214 = false; @@ -484,7 +484,7 @@ public final class LocType { this.aByteArray63[len] = arg0.g1s(); } } else if (arg1 == 60) { - this.anInt4400 = arg0.g2(); + this.mapElement = arg0.g2(); } else if (arg1 == 62) { this.aBoolean217 = true; } else if (arg1 == 64) { diff --git a/client/src/main/java/LocalizedText.java b/client/src/main/java/LocalizedText.java index 4c54798..5a8f8f7 100644 --- a/client/src/main/java/LocalizedText.java +++ b/client/src/main/java/LocalizedText.java @@ -1,3 +1,4 @@ +import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; public class LocalizedText { @@ -1304,5 +1305,19 @@ public class LocalizedText { CHATEFFECT4 = FR_CHATEFFECT4; MAINLOAD135 = FR_MAINLOAD135; } + + @OriginalMember(owner = "client!ab", name = "a", descriptor = "(II)V") + public static void setLanguage(@OriginalArg(1) int arg0) { + if (arg0 == 0) { + return; + } + if (arg0 == 1) { + switchToGerman(); + } else if (arg0 == 2) { + switchToFrench(); + } else { + throw new RuntimeException(); + } + } //endregion } diff --git a/client/src/main/java/LongNode.java b/client/src/main/java/LongNode.java index 61ebb7d..36d05fa 100644 --- a/client/src/main/java/LongNode.java +++ b/client/src/main/java/LongNode.java @@ -6,10 +6,10 @@ import org.openrs2.deob.annotation.OriginalMember; public final class LongNode extends Node { @OriginalMember(owner = "client!eb", name = "v", descriptor = "J") - public long aLong55; + public long value; @OriginalMember(owner = "client!eb", name = "", descriptor = "(J)V") public LongNode(@OriginalArg(0) long arg0) { - this.aLong55 = arg0; + this.value = arg0; } } diff --git a/client/src/main/java/LruHashTable.java b/client/src/main/java/LruHashTable.java index b395c99..4c4b844 100644 --- a/client/src/main/java/LruHashTable.java +++ b/client/src/main/java/LruHashTable.java @@ -71,8 +71,8 @@ public final class LruHashTable { @OriginalMember(owner = "client!gn", name = "c", descriptor = "(I)V") public final void clear() { - this.aClass16_1.method802(); - this.aClass133_5.method3856(); + this.aClass16_1.clear(); + this.aClass133_5.clear(); this.aClass3_Sub2_37 = new SecondaryNode(); this.anInt2314 = this.anInt2313; } diff --git a/client/src/main/java/Map.java b/client/src/main/java/Map.java index df2c97d..511737e 100644 --- a/client/src/main/java/Map.java +++ b/client/src/main/java/Map.java @@ -25,13 +25,13 @@ public final class Map extends SecondaryNode { public boolean aBoolean50 = true; @OriginalMember(owner = "client!bn", name = "db", descriptor = "I") - public int anInt772 = -1; + public int defaultZoom = -1; @OriginalMember(owner = "client!bn", name = "T", descriptor = "I") public final int anInt764; @OriginalMember(owner = "client!bn", name = "bb", descriptor = "Lclient!na;") - public final JagString aClass100_138; + public final JagString group; @OriginalMember(owner = "client!bn", name = "Q", descriptor = "Lclient!na;") public final JagString aClass100_137; @@ -47,12 +47,12 @@ public final class Map extends SecondaryNode { this.anInt764 = arg3; this.anInt759 = arg4; this.aBoolean50 = arg5; - this.aClass100_138 = arg0; + this.group = arg0; this.aClass100_137 = arg1; - this.anInt772 = arg6; + this.defaultZoom = arg6; this.anInt769 = arg2; - if (this.anInt772 == 255) { - this.anInt772 = 0; + if (this.defaultZoom == 255) { + this.defaultZoom = 0; } this.aClass69_23 = new LinkedList(); } diff --git a/client/src/main/java/Class3_Sub26.java b/client/src/main/java/MapElement.java similarity index 84% rename from client/src/main/java/Class3_Sub26.java rename to client/src/main/java/MapElement.java index 567d9e4..a380ef0 100644 --- a/client/src/main/java/Class3_Sub26.java +++ b/client/src/main/java/MapElement.java @@ -2,13 +2,13 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!oj") -public final class Class3_Sub26 extends Node { +public final class MapElement extends Node { @OriginalMember(owner = "client!oj", name = "q", descriptor = "I") public int anInt4307; @OriginalMember(owner = "client!oj", name = "r", descriptor = "I") - public int anInt4308; + public int id; @OriginalMember(owner = "client!oj", name = "A", descriptor = "I") public int anInt4314; diff --git a/client/src/main/java/MapFunctionGroup.java b/client/src/main/java/MapElementList.java similarity index 60% rename from client/src/main/java/MapFunctionGroup.java rename to client/src/main/java/MapElementList.java index 4b88d4f..9136061 100644 --- a/client/src/main/java/MapFunctionGroup.java +++ b/client/src/main/java/MapElementList.java @@ -1,9 +1,10 @@ import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; @OriginalClass("client!se") -public final class MapFunctionGroup { +public final class MapElementList { @OriginalMember(owner = "client!se", name = "i", descriptor = "I") public final int anInt5074; @@ -24,7 +25,7 @@ public final class MapFunctionGroup { public final short[] aShortArray73; @OriginalMember(owner = "client!se", name = "", descriptor = "(I)V") - public MapFunctionGroup(@OriginalArg(0) int arg0) { + public MapElementList(@OriginalArg(0) int arg0) { this.anInt5074 = arg0; this.aClass100Array153 = new JagString[this.anInt5074]; this.aShortArray72 = new short[this.anInt5074]; @@ -33,7 +34,26 @@ public final class MapFunctionGroup { this.aShortArray73 = new short[this.anInt5074]; } - @OriginalMember(owner = "client!se", name = "a", descriptor = "(IB)Z") + @OriginalMember(owner = "client!la", name = "a", descriptor = "(ILclient!na;Lclient!ve;)Lclient!se;") + public static MapElementList create(@OriginalArg(1) JagString arg0, @OriginalArg(2) Js5 arg1) { + @Pc(10) int local10 = arg1.getGroupId(arg0); + if (local10 == -1) { + return new MapElementList(0); + } + @Pc(29) int[] local29 = arg1.method4503(local10); + @Pc(35) MapElementList local35 = new MapElementList(local29.length); + for (@Pc(37) int local37 = 0; local37 < local35.anInt5074; local37++) { + @Pc(56) Buffer local56 = new Buffer(arg1.getFile(local10, local29[local37])); + local35.aClass100Array153[local37] = local56.gjstr(); + local35.aByteArray69[local37] = local56.g1s(); + local35.aShortArray73[local37] = (short) local56.g2(); + local35.aShortArray72[local37] = (short) local56.g2(); + local35.anIntArray444[local37] = local56.g4(); + } + return local35; + } + + @OriginalMember(owner = "client!se", name = "a", descriptor = "(IB)Z") public final boolean method3890(@OriginalArg(0) int arg0) { return (this.aByteArray69[arg0] & 0x8) != 0; } diff --git a/client/src/main/java/MapList.java b/client/src/main/java/MapList.java new file mode 100644 index 0000000..f724bfc --- /dev/null +++ b/client/src/main/java/MapList.java @@ -0,0 +1,6 @@ +import org.openrs2.deob.annotation.OriginalMember; + +public class MapList { + @OriginalMember(owner = "client!je", name = "W", descriptor = "Lclient!ve;") + public static Js5 archive; +} diff --git a/client/src/main/java/MidiPcmStream.java b/client/src/main/java/MidiPcmStream.java index 6045d12..5996805 100644 --- a/client/src/main/java/MidiPcmStream.java +++ b/client/src/main/java/MidiPcmStream.java @@ -316,7 +316,7 @@ public final class MidiPcmStream extends PcmStream { } this.aClass3_Sub25ArrayArray2[arg1][local133.anInt3776] = local133; } - this.aClass3_Sub3_Sub3_1.aClass69_126.method2282(local133); + this.aClass3_Sub3_Sub3_1.aClass69_126.addTail(local133); this.aClass3_Sub25ArrayArray1[arg1][arg2] = local133; } diff --git a/client/src/main/java/MidiPlayer.java b/client/src/main/java/MidiPlayer.java new file mode 100644 index 0000000..db1f15b --- /dev/null +++ b/client/src/main/java/MidiPlayer.java @@ -0,0 +1,42 @@ +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class MidiPlayer { + @OriginalMember(owner = "client!le", name = "k", descriptor = "Z") + public static boolean jingle = false; + + @OriginalMember(owner = "client!km", name = "c", descriptor = "(Z)Z") + public static boolean method2699() { + try { + if (Static14.anInt441 == 2) { + if (Static144.aClass3_Sub29_1 == null) { + Static144.aClass3_Sub29_1 = Song.create(Static172.aClass153_70, Static277.anInt5853, Static226.anInt5085); + if (Static144.aClass3_Sub29_1 == null) { + return false; + } + } + if (Static27.aClass89_1 == null) { + Static27.aClass89_1 = new SoundBank(Static78.aClass153_32, Static252.aClass153_103); + } + if (Static172.aClass3_Sub3_Sub4_2.method4411(Static144.aClass3_Sub29_1, Static210.aClass153_87, Static27.aClass89_1)) { + Static172.aClass3_Sub3_Sub4_2.method4412(); + Static172.aClass3_Sub3_Sub4_2.method4447(Static253.anInt5527); + Static172.aClass3_Sub3_Sub4_2.method4431(Static72.aBoolean116, Static144.aClass3_Sub29_1); + Static14.anInt441 = 0; + Static144.aClass3_Sub29_1 = null; + Static27.aClass89_1 = null; + Static172.aClass153_70 = null; + return true; + } + } + } catch (@Pc(68) Exception local68) { + local68.printStackTrace(); + Static172.aClass3_Sub3_Sub4_2.method4446(); + Static172.aClass153_70 = null; + Static144.aClass3_Sub29_1 = null; + Static14.anInt441 = 0; + Static27.aClass89_1 = null; + } + return false; + } +} diff --git a/client/src/main/java/MillisTimer.java b/client/src/main/java/MillisTimer.java index 54ac585..22b6aa2 100644 --- a/client/src/main/java/MillisTimer.java +++ b/client/src/main/java/MillisTimer.java @@ -33,7 +33,7 @@ public final class MillisTimer extends Timer { @OriginalMember(owner = "client!lj", name = "b", descriptor = "(I)V") @Override - public final void method3394() { + public final void reset() { for (@Pc(7) int local7 = 0; local7 < 10; local7++) { this.aLongArray4[local7] = 0L; } @@ -76,7 +76,7 @@ public final class MillisTimer extends Timer { if (arg0 > this.anInt3552) { this.anInt3552 = arg0; } - Static231.sleep((long) this.anInt3552); + ThreadUtils.sleep((long) this.anInt3552); local139 = 0; while (this.anInt3553 < 256) { this.anInt3553 += this.anInt3550; diff --git a/client/src/main/java/MiniMenu.java b/client/src/main/java/MiniMenu.java new file mode 100644 index 0000000..bc904a4 --- /dev/null +++ b/client/src/main/java/MiniMenu.java @@ -0,0 +1,6 @@ +import org.openrs2.deob.annotation.OriginalMember; + +public class MiniMenu { + @OriginalMember(owner = "client!df", name = "l", descriptor = "Lclient!na;") + public static final JagString COLOR_GREEN = Static28.parse(""); +} diff --git a/client/src/main/java/Mouse.java b/client/src/main/java/Mouse.java index 6b0b59d..31b8d1b 100644 --- a/client/src/main/java/Mouse.java +++ b/client/src/main/java/Mouse.java @@ -1,3 +1,4 @@ +import java.awt.Component; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.awt.event.MouseEvent; @@ -16,6 +17,24 @@ public final class Mouse implements MouseListener, MouseMotionListener, FocusLis public int mouseWheelX; public int mouseWheelY; + @OriginalMember(owner = "client!sc", name = "a", descriptor = "(ILjava/awt/Component;)V") + public static void stop(@OriginalArg(1) Component arg0) { + arg0.removeMouseListener(Static93.instance); + arg0.removeMouseMotionListener(Static93.instance); + arg0.removeFocusListener(Static93.instance); + Static57.anInt1759 = 0; + } + + @OriginalMember(owner = "client!ug", name = "a", descriptor = "(I)V") + public static void quit() { + if (Static93.instance != null) { + @Pc(5) Mouse local5 = Static93.instance; + synchronized (Static93.instance) { + Static93.instance = null; + } + } + } + @OriginalMember(owner = "client!ug", name = "mouseMoved", descriptor = "(Ljava/awt/event/MouseEvent;)V") @Override public final synchronized void mouseMoved(@OriginalArg(0) MouseEvent arg0) { diff --git a/client/src/main/java/MouseRecorder.java b/client/src/main/java/MouseRecorder.java index 5ecb001..eeb3247 100644 --- a/client/src/main/java/MouseRecorder.java +++ b/client/src/main/java/MouseRecorder.java @@ -5,7 +5,9 @@ import org.openrs2.deob.annotation.Pc; @OriginalClass("client!jd") public final class MouseRecorder implements Runnable { - @OriginalMember(owner = "client!jd", name = "e", descriptor = "Z") + @OriginalMember(owner = "client!od", name = "f", descriptor = "Lclient!jd;") + public static MouseRecorder instance; + @OriginalMember(owner = "client!jd", name = "e", descriptor = "Z") public boolean running = true; @OriginalMember(owner = "client!jd", name = "f", descriptor = "Ljava/lang/Object;") @@ -32,7 +34,7 @@ public final class MouseRecorder implements Runnable { this.samples++; } } - Static231.sleep(50L); + ThreadUtils.sleep(50L); } } } diff --git a/client/src/main/java/MsiTypeList.java b/client/src/main/java/MsiTypeList.java new file mode 100644 index 0000000..b595419 --- /dev/null +++ b/client/src/main/java/MsiTypeList.java @@ -0,0 +1,20 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class MsiTypeList { + @OriginalMember(owner = "client!da", name = "c", descriptor = "(II)Lclient!aa;") + public static MsiType get(@OriginalArg(0) int arg0) { + @Pc(10) MsiType local10 = (MsiType) Static231.aClass99_29.get((long) arg0); + if (local10 != null) { + return local10; + } + @Pc(20) byte[] local20 = Static98.aClass153_42.getFile(34, arg0); + local10 = new MsiType(); + if (local20 != null) { + local10.decode(new Buffer(local20), arg0); + } + Static231.aClass99_29.put(local10, (long) arg0); + return local10; + } +} diff --git a/client/src/main/java/NanoTimer.java b/client/src/main/java/NanoTimer.java index 7b4802a..4162fa2 100644 --- a/client/src/main/java/NanoTimer.java +++ b/client/src/main/java/NanoTimer.java @@ -11,7 +11,7 @@ public final class NanoTimer extends Timer { @OriginalMember(owner = "client!om", name = "b", descriptor = "(I)V") @Override - public final void method3394() { + public final void reset() { this.aLong142 = System.nanoTime(); } @@ -23,7 +23,7 @@ public final class NanoTimer extends Timer { if (local9 > local14) { local14 = local9; } - Static231.sleep(local14 / 1000000L); + ThreadUtils.sleep(local14 / 1000000L); @Pc(31) int local31 = 0; @Pc(33) long local33 = System.nanoTime(); while (local31 < 10 && (local31 < 1 || this.aLong142 < local33)) { diff --git a/client/src/main/java/Npc.java b/client/src/main/java/Npc.java index e100fe4..334c3d4 100644 --- a/client/src/main/java/Npc.java +++ b/client/src/main/java/Npc.java @@ -26,7 +26,7 @@ public final class Npc extends PathingEntity { if (this.type == null) { return; } - @Pc(29) SeqType local29 = this.anInt3369 != -1 && this.anInt3420 == 0 ? Static36.get(this.anInt3369) : null; + @Pc(29) SeqType local29 = this.seqId != -1 && this.anInt3420 == 0 ? Static36.get(this.seqId) : null; @Pc(53) SeqType local53 = this.anInt3366 == -1 || this.anInt3366 == this.method2681().idleAnimationId && local29 != null ? null : Static36.get(this.anInt3366); @Pc(74) Model local74 = this.type.getBodyModel(this.aClass147Array3, this.anInt3388, this.anInt3407, this.anInt3373, this.anInt3360, this.anInt3425, local53, this.anInt3396, local29); if (local74 == null) { @@ -38,7 +38,7 @@ public final class Npc extends PathingEntity { local84 = local84.getMultiNpc(); } @Pc(140) Model local140; - if (Static209.characterShadowsOn && local84.shadow) { + if (Preferences.characterShadowsOn && local84.shadow) { local140 = Static41.method1043(this.type.aByte13, this.aBoolean171, local53 == null ? local29 : local53, this.xFine, this.type.aShort23, this.zFine, this.type.aShort24, this.type.soze, local74, arg0, local53 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, this.type.aByte12); if (GlRenderer.enabled) { @Pc(144) float local144 = GlRenderer.method4179(); @@ -98,7 +98,7 @@ public final class Npc extends PathingEntity { @OriginalMember(owner = "client!km", name = "b", descriptor = "(I)I") @Override protected final int method2688() { - if (Static266.game != 0 && this.type.multiNpcs != null) { + if (client.game != 0 && this.type.multiNpcs != null) { @Pc(17) NpcType local17 = this.type.getMultiNpc(); if (local17 != null && local17.basId != -1) { return local17.basId; diff --git a/client/src/main/java/PathingEntity.java b/client/src/main/java/PathingEntity.java index ab6d956..2a3e5f6 100644 --- a/client/src/main/java/PathingEntity.java +++ b/client/src/main/java/PathingEntity.java @@ -97,7 +97,7 @@ public abstract class PathingEntity extends Entity { public int anInt3360 = 0; @OriginalMember(owner = "client!fe", name = "O", descriptor = "I") - public int anInt3369 = -1; + public int seqId = -1; @OriginalMember(owner = "client!fe", name = "ab", descriptor = "Z") private boolean aBoolean169 = false; @@ -265,8 +265,8 @@ public abstract class PathingEntity extends Entity { @OriginalMember(owner = "client!fe", name = "a", descriptor = "(IIIIZ)V") public final void method2683(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) boolean arg3) { - if (this.anInt3369 != -1 && Static36.get(this.anInt3369).anInt5349 == 1) { - this.anInt3369 = -1; + if (this.seqId != -1 && Static36.get(this.seqId).anInt5349 == 1) { + this.seqId = -1; } if (!arg3) { @Pc(32) int local32 = arg1 - this.movementQueueX[0]; @@ -293,7 +293,7 @@ public abstract class PathingEntity extends Entity { this.anInt3405 = 0; this.zFine = arg0 * 64 + this.movementQueueZ[0] * 128; this.xFine = arg0 * 64 + this.movementQueueX[0] * 128; - if (GlRenderer.enabled && Static173.self == this) { + if (GlRenderer.enabled && PlayerList.self == this) { Static86.setInstantFade(); } } @@ -306,8 +306,8 @@ public abstract class PathingEntity extends Entity { local10--; local15++; } - if (this.anInt3369 != -1 && Static36.get(this.anInt3369).anInt5349 == 1) { - this.anInt3369 = -1; + if (this.seqId != -1 && Static36.get(this.seqId).anInt5349 == 1) { + this.seqId = -1; } if (this.movementQueueSize < 9) { this.movementQueueSize++; diff --git a/client/src/main/java/Player.java b/client/src/main/java/Player.java index a574e99..2ad8ced 100644 --- a/client/src/main/java/Player.java +++ b/client/src/main/java/Player.java @@ -6,8 +6,12 @@ import org.openrs2.deob.annotation.Pc; @OriginalClass("client!e") public final class Player extends PathingEntity { + @OriginalMember(owner = "client!pa", name = "P", descriptor = "Lclient!na;") + public static JagString password = JagString.EMPTY; + @OriginalMember(owner = "client!pa", name = "S", descriptor = "Lclient!na;") + public static JagString username = JagString.EMPTY; @OriginalMember(owner = "client!e", name = "Bc", descriptor = "Lclient!hh;") - public PlayerAppearance aClass59_1; + public PlayerAppearance appearance; @OriginalMember(owner = "client!e", name = "Mc", descriptor = "Lclient!na;") public JagString aClass100_364; @@ -54,10 +58,40 @@ public final class Player extends PathingEntity { @OriginalMember(owner = "client!e", name = "Wc", descriptor = "I") public int anInt1670 = -1; + @OriginalMember(owner = "client!pa", name = "a", descriptor = "(IIILclient!e;)V") + public static void animate(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Player arg2) { + if (arg1 == arg2.seqId && arg1 != -1) { + @Pc(89) SeqType local89 = Static36.get(arg1); + @Pc(92) int local92 = local89.anInt5347; + if (local92 == 1) { + arg2.anInt3420 = arg0; + arg2.anInt3360 = 0; + arg2.anInt3373 = 1; + arg2.anInt3425 = 0; + arg2.anInt3371 = 0; + SoundPlayer.playSeqSound(arg2.zFine, local89, arg2.xFine, PlayerList.self == arg2, arg2.anInt3425); + } + if (local92 == 2) { + arg2.anInt3371 = 0; + } + } else if (arg1 == -1 || arg2.seqId == -1 || Static36.get(arg1).anInt5355 >= Static36.get(arg2.seqId).anInt5355) { + arg2.anInt3373 = 1; + arg2.anInt3425 = 0; + arg2.anInt3420 = arg0; + arg2.anInt3405 = arg2.movementQueueSize; + arg2.anInt3371 = 0; + arg2.anInt3360 = 0; + arg2.seqId = arg1; + if (arg2.seqId != -1) { + SoundPlayer.playSeqSound(arg2.zFine, Static36.get(arg2.seqId), arg2.xFine, arg2 == PlayerList.self, arg2.anInt3425); + } + } + } + @OriginalMember(owner = "client!e", name = "c", descriptor = "(B)I") @Override public final int getSize() { - return this.aClass59_1 == null || this.aClass59_1.anInt2492 == -1 ? super.getSize() : Static214.get(this.aClass59_1.anInt2492).soze; + return this.appearance == null || this.appearance.anInt2492 == -1 ? super.getSize() : Static214.get(this.appearance.anInt2492).soze; } @OriginalMember(owner = "client!e", name = "b", descriptor = "(I)I") @@ -151,11 +185,11 @@ public final class Player extends PathingEntity { Static214.method4359(this); } } - if (this.aClass59_1 == null) { - this.aClass59_1 = new PlayerAppearance(); + if (this.appearance == null) { + this.appearance = new PlayerAppearance(); } - local175 = this.aClass59_1.anInt2492; - this.aClass59_1.method1950(local197, local22, local26 == 1, local44, this.anInt3365); + local175 = this.appearance.anInt2492; + this.appearance.method1950(local197, local22, local26 == 1, local44, this.anInt3365); if (local175 != local22) { this.xFine = this.movementQueueX[0] * 128 + this.getSize() * 64; this.zFine = this.movementQueueZ[0] * 128 + this.getSize() * 64; @@ -168,18 +202,18 @@ public final class Player extends PathingEntity { @OriginalMember(owner = "client!e", name = "a", descriptor = "(IIIIIIIIJILclient!ga;)V") @Override public final void method4546(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) long arg8, @OriginalArg(9) int arg9, @OriginalArg(10) ParticleSystem arg10) { - if (this.aClass59_1 == null) { + if (this.appearance == null) { return; } - @Pc(25) SeqType local25 = this.anInt3369 != -1 && this.anInt3420 == 0 ? Static36.get(this.anInt3369) : null; + @Pc(25) SeqType local25 = this.seqId != -1 && this.anInt3420 == 0 ? Static36.get(this.seqId) : null; @Pc(54) SeqType local54 = this.anInt3366 == -1 || this.aBoolean98 || this.anInt3366 == this.method2681().idleAnimationId && local25 != null ? null : Static36.get(this.anInt3366); - @Pc(76) Model local76 = this.aClass59_1.method1954(this.aClass147Array3, this.anInt3373, local54, local25, this.anInt3396, this.anInt3388, this.anInt3360, this.anInt3425, this.anInt3407); + @Pc(76) Model local76 = this.appearance.method1954(this.aClass147Array3, this.anInt3373, local54, local25, this.anInt3396, this.anInt3388, this.anInt3360, this.anInt3425, this.anInt3407); @Pc(79) int local79 = Static198.method1029(); if (GlRenderer.enabled && GameShell.maxMemory < 96 && local79 > 50) { Static16.method501(); } @Pc(102) int local102; - if (Static81.modeWhat != 0 && local79 < 50) { + if (client.modeWhat != 0 && local79 < 50) { local102 = 50 - local79; while (Static105.anInt2863 < local102) { Static51.aByteArrayArray8[Static105.anInt2863] = new byte[102400]; @@ -195,7 +229,7 @@ public final class Player extends PathingEntity { } this.anInt3413 = local76.method4549(); @Pc(184) Model local184; - if (Static209.characterShadowsOn && (this.aClass59_1.anInt2492 == -1 || Static214.get(this.aClass59_1.anInt2492).shadow)) { + if (Preferences.characterShadowsOn && (this.appearance.anInt2492 == -1 || Static214.get(this.appearance.anInt2492).shadow)) { local184 = Static41.method1043(160, this.aBoolean171, local54 == null ? local25 : local54, this.xFine, 0, this.zFine, 0, 1, local76, arg0, local54 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, 240); if (GlRenderer.enabled) { @Pc(188) float local188 = GlRenderer.method4179(); @@ -209,7 +243,7 @@ public final class Player extends PathingEntity { local184.method4546(0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, -1L, arg9, null); } } - if (Static173.self == this) { + if (PlayerList.self == this) { for (local102 = Static143.aClass102Array1.length - 1; local102 >= 0; local102--) { @Pc(245) Class102 local245 = Static143.aClass102Array1[local102]; if (local245 != null && local245.anInt4052 != -1) { @@ -218,21 +252,21 @@ public final class Player extends PathingEntity { if (local245.anInt4058 == 1 && local245.anInt4057 >= 0 && Static175.npcs.length > local245.anInt4057) { @Pc(278) Npc local278 = Static175.npcs[local245.anInt4057]; if (local278 != null) { - local291 = local278.xFine / 32 - Static173.self.xFine / 32; - local302 = local278.zFine / 32 - Static173.self.zFine / 32; + local291 = local278.xFine / 32 - PlayerList.self.xFine / 32; + local302 = local278.zFine / 32 - PlayerList.self.zFine / 32; this.method1263(null, local302, local76, local291, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.anInt4052, arg2, arg6); } } if (local245.anInt4058 == 2) { - @Pc(340) int local340 = (local245.anInt4053 - Static225.originX) * 4 + 2 - Static173.self.xFine / 32; - local291 = (local245.anInt4046 - Static142.originZ) * 4 + 2 - Static173.self.zFine / 32; + @Pc(340) int local340 = (local245.anInt4053 - Static225.originX) * 4 + 2 - PlayerList.self.xFine / 32; + local291 = (local245.anInt4046 - Static142.originZ) * 4 + 2 - PlayerList.self.zFine / 32; this.method1263(null, local291, local76, local340, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.anInt4052, arg2, arg6); } if (local245.anInt4058 == 10 && local245.anInt4057 >= 0 && Static159.players.length > local245.anInt4057) { @Pc(395) Player local395 = Static159.players[local245.anInt4057]; if (local395 != null) { - local291 = local395.xFine / 32 - Static173.self.xFine / 32; - local302 = local395.zFine / 32 - Static173.self.zFine / 32; + local291 = local395.xFine / 32 - PlayerList.self.xFine / 32; + local302 = local395.zFine / 32 - PlayerList.self.zFine / 32; this.method1263(null, local302, local76, local291, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.anInt4052, arg2, arg6); } } @@ -338,17 +372,17 @@ public final class Player extends PathingEntity { @OriginalMember(owner = "client!e", name = "a", descriptor = "(B)Z") @Override public final boolean method2682() { - return this.aClass59_1 != null; + return this.appearance != null; } @OriginalMember(owner = "client!e", name = "e", descriptor = "(I)Lclient!na;") public final JagString method1264() { @Pc(2) JagString local2 = this.aClass100_364; if (Static103.aClass100Array88 != null) { - local2 = Static34.concatenate(new JagString[] { Static103.aClass100Array88[this.anInt1651], local2 }); + local2 = JagString.concatenate(new JagString[] { Static103.aClass100Array88[this.anInt1651], local2 }); } if (Static263.aClass100Array174 != null) { - local2 = Static34.concatenate(new JagString[] { local2, Static263.aClass100Array174[this.anInt1651] }); + local2 = JagString.concatenate(new JagString[] { local2, Static263.aClass100Array174[this.anInt1651] }); } return local2; } diff --git a/client/src/main/java/PlayerAppearance.java b/client/src/main/java/PlayerAppearance.java index 9f832f9..a860384 100644 --- a/client/src/main/java/PlayerAppearance.java +++ b/client/src/main/java/PlayerAppearance.java @@ -6,7 +6,9 @@ import org.openrs2.deob.annotation.Pc; @OriginalClass("client!hh") public final class PlayerAppearance { - @OriginalMember(owner = "client!hh", name = "e", descriptor = "I") + @OriginalMember(owner = "client!bj", name = "t", descriptor = "[S") + public static final short[] aShortArray5 = new short[] { -4160, -4163, -8256, -8259, 22461 }; + @OriginalMember(owner = "client!hh", name = "e", descriptor = "I") public int anInt2492; @OriginalMember(owner = "client!hh", name = "i", descriptor = "J") diff --git a/client/src/main/java/PlayerList.java b/client/src/main/java/PlayerList.java new file mode 100644 index 0000000..7c333e7 --- /dev/null +++ b/client/src/main/java/PlayerList.java @@ -0,0 +1,6 @@ +import org.openrs2.deob.annotation.OriginalMember; + +public class PlayerList { + @OriginalMember(owner = "client!nk", name = "O", descriptor = "Lclient!e;") + public static Player self; +} diff --git a/client/src/main/java/Preferences.java b/client/src/main/java/Preferences.java new file mode 100644 index 0000000..4c5e117 --- /dev/null +++ b/client/src/main/java/Preferences.java @@ -0,0 +1,319 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +import java.io.IOException; + +public class Preferences { + @OriginalMember(owner = "client!pa", name = "N", descriptor = "I") + public static int antiAliasingMode = 0; + @OriginalMember(owner = "client!na", name = "h", descriptor = "Z") + public static boolean safeMode = false; + @OriginalMember(owner = "client!il", name = "I", descriptor = "I") + public static int brightness = 3; + @OriginalMember(owner = "client!gf", name = "N", descriptor = "Z") + public static boolean removeRoofsSelectively = true; + @OriginalMember(owner = "client!hk", name = "eb", descriptor = "Z") + public static boolean stereo = true; + @OriginalMember(owner = "client!rm", name = "g", descriptor = "Z") + public static boolean highWaterDetail = true; + @OriginalMember(owner = "client!hn", name = "X", descriptor = "I") + public static int windowMode = 0; + @OriginalMember(owner = "client!bl", name = "W", descriptor = "I") + public static int fullScreenHeight = 0; + @OriginalMember(owner = "client!uf", name = "b", descriptor = "Z") + public static boolean showGroundDecorations = true; + @OriginalMember(owner = "client!ba", name = "x", descriptor = "Z") + public static boolean flickeringEffectsOn = true; + @OriginalMember(owner = "client!be", name = "Kb", descriptor = "Z") + public static boolean manyIdleAnimations = true; + @OriginalMember(owner = "client!cg", name = "f", descriptor = "I") + public static int ambientSoundsVolume = 127; + @OriginalMember(owner = "client!fk", name = "g", descriptor = "Z") + public static boolean fogEnabled = true; + @OriginalMember(owner = "client!ra", name = "R", descriptor = "Z") + public static boolean characterShadowsOn = true; + @OriginalMember(owner = "client!j", name = "v", descriptor = "I") + public static int fullScreenWidth = 0; + @OriginalMember(owner = "client!l", name = "k", descriptor = "I") + public static int sceneryShadowsType = 2; + @OriginalMember(owner = "client!mi", name = "ab", descriptor = "Z") + public static boolean manyGroundTextures = true; + @OriginalMember(owner = "client!od", name = "c", descriptor = "Z") + public static boolean highDetailLighting = true; + @OriginalMember(owner = "client!bb", name = "n", descriptor = "I") + public static int musicVolume = 255; + @OriginalMember(owner = "client!ec", name = "n", descriptor = "Z") + public static boolean highDetailTextures = true; + @OriginalMember(owner = "client!jl", name = "J", descriptor = "I") + public static int soundEffectVolume = 127; + @OriginalMember(owner = "client!na", name = "o", descriptor = "I") + public static int lastWorldId = 0; + @OriginalMember(owner = "client!lb", name = "A", descriptor = "I") + public static int buildArea = 0; + @OriginalMember(owner = "client!ml", name = "ab", descriptor = "Z") + public static boolean allLevelsVisible = true; + @OriginalMember(owner = "client!cj", name = "h", descriptor = "Z") + public static boolean aBoolean63; + @OriginalMember(owner = "client!fb", name = "m", descriptor = "Z") + public static boolean cursorsEnabled = true; + @OriginalMember(owner = "client!k", name = "c", descriptor = "Z") + public static boolean hdr = false; + @OriginalMember(owner = "client!rg", name = "F", descriptor = "I") + public static int favoriteWorlds = 0; + @OriginalMember(owner = "client!ga", name = "e", descriptor = "I") + static int particles = 2; + + @OriginalMember(owner = "client!qh", name = "a", descriptor = "(Lsignlink!ll;B)V") + public static void write(@OriginalArg(0) SignLink arg0) { + @Pc(11) FileOnDisk local11 = null; + try { + @Pc(16) PrivilegedRequest local16 = arg0.openPreferences("runescape"); + while (local16.status == 0) { + ThreadUtils.sleep(1L); + } + if (local16.status == 1) { + local11 = (FileOnDisk) local16.result; + @Pc(39) Buffer local39 = encode(); + local11.write(local39.data, local39.offset, 0); + } + } catch (@Pc(49) Exception local49) { + } + try { + if (local11 != null) { + local11.close(); + } + } catch (@Pc(56) Exception local56) { + } + } + + @OriginalMember(owner = "client!gf", name = "a", descriptor = "(Lsignlink!ll;I)V") + public static void read(@OriginalArg(0) SignLink arg0) { + brightness = 3; + setAllVisibleLevels(true); + removeRoofsSelectively = true; + stereo = true; + highWaterDetail = true; + windowMode = 0; + fullScreenHeight = 0; + showGroundDecorations = true; + flickeringEffectsOn = true; + manyIdleAnimations = true; + ambientSoundsVolume = 127; + fogEnabled = true; + characterShadowsOn = true; + fullScreenWidth = 0; + sceneryShadowsType = 2; + manyGroundTextures = true; + highDetailLighting = true; + musicVolume = 255; + highDetailTextures = true; + antiAliasingMode = 0; + @Pc(48) FileOnDisk local48 = null; + soundEffectVolume = 127; + if (GameShell.maxMemory >= 96) { + setParticles(2); + } else { + setParticles(0); + } + lastWorldId = 0; + buildArea = 0; + aBoolean63 = false; + cursorsEnabled = true; + safeMode = false; + hdr = false; + favoriteWorlds = 0; + try { + @Pc(78) PrivilegedRequest request = arg0.openPreferences("runescape"); + while (request.status == 0) { + ThreadUtils.sleep(1L); + } + if (request.status == 1) { + local48 = (FileOnDisk) request.result; + @Pc(106) byte[] local106 = new byte[(int) local48.length()]; + @Pc(128) int local128; + for (@Pc(108) int local108 = 0; local108 < local106.length; local108 += local128) { + local128 = local48.read(local108, local106.length - local108, local106); + if (local128 == -1) { + throw new IOException("EOF"); + } + } + decode(new Buffer(local106)); + } + } catch (@Pc(151) Exception local151) { + } + try { + if (local48 != null) { + local48.close(); + } + } catch (@Pc(158) Exception local158) { + } + } + + @OriginalMember(owner = "client!ec", name = "a", descriptor = "(IZ)V") + public static void setAllVisibleLevels(@OriginalArg(1) boolean arg0) { + allLevelsVisible = arg0; + Static87.aBoolean130 = !SceneGraph.allLevelsAreVisible(); + } + + @OriginalMember(owner = "client!ga", name = "b", descriptor = "(I)V") + public static void setParticles(@OriginalArg(0) int arg0) { + particles = arg0; + } + + @OriginalMember(owner = "client!ga", name = "c", descriptor = "()I") + public static int getParticleSetting() { + return particles; + } + + @OriginalMember(owner = "client!kk", name = "b", descriptor = "(Lclient!wa;I)V") + public static void decode(@OriginalArg(0) Buffer buffer) { + if (buffer.data.length - buffer.offset < 1) { + return; + } + @Pc(21) int version = buffer.g1(); + if (version < 0 || version > 11) { + return; + } + @Pc(34) byte len; + if (version == 11) { + len = 33; + } else if (version == 10) { + len = 32; + } else if (version == 9) { + len = 31; + } else if (version == 8) { + len = 30; + } else if (version == 7) { + len = 29; + } else if (version == 6) { + len = 28; + } else if (version == 5) { + len = 28; + } else if (version == 4) { + len = 24; + } else if (version == 3) { + len = 23; + } else if (version == 2) { + len = 22; + } else if (version == 1) { + len = 23; + } else { + len = 19; + } + if (buffer.data.length - buffer.offset < len) { + return; + } + brightness = buffer.g1(); + if (brightness < 1) { + brightness = 1; + } else if (brightness > 4) { + brightness = 4; + } + setAllVisibleLevels(buffer.g1() == 1); + removeRoofsSelectively = buffer.g1() == 1; + showGroundDecorations = buffer.g1() == 1; + highDetailTextures = buffer.g1() == 1; + manyIdleAnimations = buffer.g1() == 1; + flickeringEffectsOn = buffer.g1() == 1; + manyGroundTextures = buffer.g1() == 1; + characterShadowsOn = buffer.g1() == 1; + sceneryShadowsType = buffer.g1(); + if (sceneryShadowsType > 2) { + sceneryShadowsType = 2; + } + if (version < 2) { + highDetailLighting = buffer.g1() == 1; + buffer.g1(); + } else { + highDetailLighting = buffer.g1() == 1; + } + highWaterDetail = buffer.g1() == 1; + fogEnabled = buffer.g1() == 1; + windowMode = buffer.g1(); + if (windowMode > 2) { + windowMode = 2; + } + antiAliasingMode = windowMode; + stereo = buffer.g1() == 1; + soundEffectVolume = buffer.g1(); + if (soundEffectVolume > 127) { + soundEffectVolume = 127; + } + musicVolume = buffer.g1(); + ambientSoundsVolume = buffer.g1(); + if (ambientSoundsVolume > 127) { + ambientSoundsVolume = 127; + } + if (version >= 1) { + fullScreenWidth = buffer.g2(); + fullScreenHeight = buffer.g2(); + } + if (version >= 3 && version < 6) { + buffer.g1(); + } + if (version >= 4) { + @Pc(386) int particles = buffer.g1(); + if (GameShell.maxMemory < 96) { + particles = 0; + } + setParticles(particles); + } + if (version >= 5) { + lastWorldId = buffer.g4(); + } + if (version >= 6) { + favoriteWorlds = buffer.g1(); + } + if (version >= 7) { + safeMode = buffer.g1() == 1; + } + if (version >= 8) { + aBoolean63 = buffer.g1() == 1; + } + if (version >= 9) { + buildArea = buffer.g1(); + } + if (version >= 10) { + hdr = buffer.g1() != 0; + } + if (version >= 11) { + cursorsEnabled = buffer.g1() != 0; + } + } + + @OriginalMember(owner = "client!dl", name = "a", descriptor = "(B)Lclient!wa;") + public static Buffer encode() { + @Pc(4) Buffer local4 = new Buffer(34); + local4.p1(11); + local4.p1(brightness); + local4.p1(allLevelsVisible ? 1 : 0); + local4.p1(removeRoofsSelectively ? 1 : 0); + local4.p1(showGroundDecorations ? 1 : 0); + local4.p1(highDetailTextures ? 1 : 0); + local4.p1(manyIdleAnimations ? 1 : 0); + local4.p1(flickeringEffectsOn ? 1 : 0); + local4.p1(manyGroundTextures ? 1 : 0); + local4.p1(characterShadowsOn ? 1 : 0); + local4.p1(sceneryShadowsType); + local4.p1(highDetailLighting ? 1 : 0); + local4.p1(highWaterDetail ? 1 : 0); + local4.p1(fogEnabled ? 1 : 0); + local4.p1(windowMode); + local4.p1(stereo ? 1 : 0); + local4.p1(soundEffectVolume); + local4.p1(musicVolume); + local4.p1(ambientSoundsVolume); + local4.p2(fullScreenWidth); + local4.p2(fullScreenHeight); + local4.p1(getParticleSetting()); + local4.p4(lastWorldId); + local4.p1(favoriteWorlds); + local4.p1(safeMode ? 1 : 0); + local4.p1(aBoolean63 ? 1 : 0); + local4.p1(buildArea); + local4.p1(hdr ? 1 : 0); + local4.p1(cursorsEnabled ? 1 : 0); + return local4; + } +} diff --git a/client/src/main/java/Protocol.java b/client/src/main/java/Protocol.java new file mode 100644 index 0000000..84b988a --- /dev/null +++ b/client/src/main/java/Protocol.java @@ -0,0 +1,6 @@ +import org.openrs2.deob.annotation.OriginalMember; + +public class Protocol { + @OriginalMember(owner = "client!jk", name = "B", descriptor = "Lclient!ma;") + public static BufferedSocket socket; +} diff --git a/client/src/main/java/Rasteriser.java b/client/src/main/java/Rasteriser.java index 6df0080..c88305a 100644 --- a/client/src/main/java/Rasteriser.java +++ b/client/src/main/java/Rasteriser.java @@ -48,7 +48,7 @@ public final class Rasteriser { @OriginalMember(owner = "client!hf", name = "a", descriptor = "()V") public static void prepare() { - prepareOffsets(Static129.clipLeft, Static129.clipTop, Static129.clipRight, Static129.clipBottom); + prepareOffsets(SoftwareRaster.clipLeft, SoftwareRaster.clipTop, SoftwareRaster.clipRight, SoftwareRaster.clipBottom); } @OriginalMember(owner = "client!hf", name = "a", descriptor = "(IIIIIIIIIIIIIIIIIII)V") @@ -156,22 +156,22 @@ public final class Rasteriser { return; } - drawTexturedScanline(Static129.pixels, texels, yA, xC >> 16, xB >> 16, colorA, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yA, xC >> 16, xB >> 16, colorA, colorStepA, local177, local207, local237, local187, local217, local247); xC += xStepAC; xB += xStepBC; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; } } - drawTexturedScanline(Static129.pixels, texels, yA, xC >> 16, xA >> 16, colorA, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yA, xC >> 16, xA >> 16, colorA, colorStepA, local177, local207, local237, local187, local217, local247); xC += xStepAC; xA += xStepAB; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; @@ -189,22 +189,22 @@ public final class Rasteriser { return; } - drawTexturedScanline(Static129.pixels, texels, yA, xB >> 16, xC >> 16, colorA, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yA, xB >> 16, xC >> 16, colorA, colorStepA, local177, local207, local237, local187, local217, local247); xC += xStepAC; xB += xStepBC; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; } } - drawTexturedScanline(Static129.pixels, texels, yA, xA >> 16, xC >> 16, colorA, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yA, xA >> 16, xC >> 16, colorA, colorStepA, local177, local207, local237, local187, local217, local247); xC += xStepAC; xA += xStepAB; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; @@ -241,22 +241,22 @@ public final class Rasteriser { if (yB < 0) { return; } - drawTexturedScanline(Static129.pixels, texels, yA, xA >> 16, xC >> 16, colorA, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yA, xA >> 16, xC >> 16, colorA, colorStepA, local177, local207, local237, local187, local217, local247); xC += xStepBC; xA += xStepAB; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; } } - drawTexturedScanline(Static129.pixels, texels, yA, xA >> 16, xB >> 16, colorA, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yA, xA >> 16, xB >> 16, colorA, colorStepA, local177, local207, local237, local187, local217, local247); xB += xStepAC; xA += xStepAB; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; @@ -274,22 +274,22 @@ public final class Rasteriser { return; } - drawTexturedScanline(Static129.pixels, texels, yA, xC >> 16, xA >> 16, colorA, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yA, xC >> 16, xA >> 16, colorA, colorStepA, local177, local207, local237, local187, local217, local247); xC += xStepBC; xA += xStepAB; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; } } - drawTexturedScanline(Static129.pixels, texels, yA, xB >> 16, xA >> 16, colorA, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yA, xB >> 16, xA >> 16, colorA, colorStepA, local177, local207, local237, local187, local217, local247); xB += xStepAC; xA += xStepAB; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; @@ -340,22 +340,22 @@ public final class Rasteriser { return; } - drawTexturedScanline(Static129.pixels, texels, yB, xA >> 16, xC >> 16, colorB, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yB, xA >> 16, xC >> 16, colorB, colorStepA, local177, local207, local237, local187, local217, local247); xA += xStepAB; xC += xStepAC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; } } - drawTexturedScanline(Static129.pixels, texels, yB, xA >> 16, xB >> 16, colorB, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yB, xA >> 16, xB >> 16, colorB, colorStepA, local177, local207, local237, local187, local217, local247); xA += xStepAB; xB += xStepBC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; @@ -373,22 +373,22 @@ public final class Rasteriser { return; } - drawTexturedScanline(Static129.pixels, texels, yB, xC >> 16, xA >> 16, colorB, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yB, xC >> 16, xA >> 16, colorB, colorStepA, local177, local207, local237, local187, local217, local247); xA += xStepAB; xC += xStepAC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; } } - drawTexturedScanline(Static129.pixels, texels, yB, xB >> 16, xA >> 16, colorB, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yB, xB >> 16, xA >> 16, colorB, colorStepA, local177, local207, local237, local187, local217, local247); xA += xStepAB; xB += xStepBC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; @@ -426,22 +426,22 @@ public final class Rasteriser { return; } - drawTexturedScanline(Static129.pixels, texels, yB, xA >> 16, xB >> 16, colorB, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yB, xA >> 16, xB >> 16, colorB, colorStepA, local177, local207, local237, local187, local217, local247); xA += xStepAC; xB += xStepBC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; } } - drawTexturedScanline(Static129.pixels, texels, yB, xC >> 16, xB >> 16, colorB, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yB, xC >> 16, xB >> 16, colorB, colorStepA, local177, local207, local237, local187, local217, local247); xC += xStepAB; xB += xStepBC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; @@ -459,22 +459,22 @@ public final class Rasteriser { return; } - drawTexturedScanline(Static129.pixels, texels, yB, xB >> 16, xA >> 16, colorB, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yB, xB >> 16, xA >> 16, colorB, colorStepA, local177, local207, local237, local187, local217, local247); xA += xStepAC; xB += xStepBC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; } } - drawTexturedScanline(Static129.pixels, texels, yB, xB >> 16, xC >> 16, colorB, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yB, xB >> 16, xC >> 16, colorB, colorStepA, local177, local207, local237, local187, local217, local247); xC += xStepAB; xB += xStepBC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; @@ -524,22 +524,22 @@ public final class Rasteriser { return; } - drawTexturedScanline(Static129.pixels, texels, yC, xB >> 16, xA >> 16, colorC, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yC, xB >> 16, xA >> 16, colorC, colorStepA, local177, local207, local237, local187, local217, local247); xB += xStepBC; xA += xStepAB; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; } } - drawTexturedScanline(Static129.pixels, texels, yC, xB >> 16, xC >> 16, colorC, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yC, xB >> 16, xC >> 16, colorC, colorStepA, local177, local207, local237, local187, local217, local247); xB += xStepBC; xC += xStepAC; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; @@ -557,22 +557,22 @@ public final class Rasteriser { return; } - drawTexturedScanline(Static129.pixels, texels, yC, xA >> 16, xB >> 16, colorC, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yC, xA >> 16, xB >> 16, colorC, colorStepA, local177, local207, local237, local187, local217, local247); xB += xStepBC; xA += xStepAB; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; } } - drawTexturedScanline(Static129.pixels, texels, yC, xC >> 16, xB >> 16, colorC, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yC, xC >> 16, xB >> 16, colorC, colorStepA, local177, local207, local237, local187, local217, local247); xB += xStepBC; xC += xStepAC; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; @@ -610,22 +610,22 @@ public final class Rasteriser { return; } - drawTexturedScanline(Static129.pixels, texels, yC, xB >> 16, xC >> 16, colorC, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yC, xB >> 16, xC >> 16, colorC, colorStepA, local177, local207, local237, local187, local217, local247); xB += xStepAB; xC += xStepAC; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; } } - drawTexturedScanline(Static129.pixels, texels, yC, xA >> 16, xC >> 16, colorC, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yC, xA >> 16, xC >> 16, colorC, colorStepA, local177, local207, local237, local187, local217, local247); xA += xStepBC; xC += xStepAC; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; @@ -643,22 +643,22 @@ public final class Rasteriser { return; } - drawTexturedScanline(Static129.pixels, texels, yC, xC >> 16, xB >> 16, colorC, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yC, xC >> 16, xB >> 16, colorC, colorStepA, local177, local207, local237, local187, local217, local247); xB += xStepAB; xC += xStepAC; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; } } - drawTexturedScanline(Static129.pixels, texels, yC, xC >> 16, xA >> 16, colorC, colorStepA, local177, local207, local237, local187, local217, local247); + drawTexturedScanline(SoftwareRaster.pixels, texels, yC, xC >> 16, xA >> 16, colorC, colorStepA, local177, local207, local237, local187, local217, local247); xA += xStepBC; xC += xStepAC; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; local177 += local197; local207 += local227; local237 += local257; @@ -788,22 +788,22 @@ public final class Rasteriser { return; } - drawTexturedAlphaScanline(Static129.pixels, texels, yA, xC >> 16, xB >> 16, colorA, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yA, xC >> 16, xB >> 16, colorA, colorStepA, local182, local212, local242, local192, local222, local252); xC += xStepAC; xB += xStepBC; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; } } - drawTexturedAlphaScanline(Static129.pixels, texels, yA, xC >> 16, xA >> 16, colorA, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yA, xC >> 16, xA >> 16, colorA, colorStepA, local182, local212, local242, local192, local222, local252); xC += xStepAC; xA += xStepAB; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; @@ -821,22 +821,22 @@ public final class Rasteriser { return; } - drawTexturedAlphaScanline(Static129.pixels, texels, yA, xB >> 16, xC >> 16, colorA, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yA, xB >> 16, xC >> 16, colorA, colorStepA, local182, local212, local242, local192, local222, local252); xC += xStepAC; xB += xStepBC; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; } } - drawTexturedAlphaScanline(Static129.pixels, texels, yA, xA >> 16, xC >> 16, colorA, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yA, xA >> 16, xC >> 16, colorA, colorStepA, local182, local212, local242, local192, local222, local252); xC += xStepAC; xA += xStepAB; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; @@ -874,22 +874,22 @@ public final class Rasteriser { return; } - drawTexturedAlphaScanline(Static129.pixels, texels, yA, xA >> 16, xC >> 16, colorA, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yA, xA >> 16, xC >> 16, colorA, colorStepA, local182, local212, local242, local192, local222, local252); xC += xStepBC; xA += xStepAB; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; } } - drawTexturedAlphaScanline(Static129.pixels, texels, yA, xA >> 16, xB >> 16, colorA, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yA, xA >> 16, xB >> 16, colorA, colorStepA, local182, local212, local242, local192, local222, local252); xB += xStepAC; xA += xStepAB; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; @@ -907,22 +907,22 @@ public final class Rasteriser { return; } - drawTexturedAlphaScanline(Static129.pixels, texels, yA, xC >> 16, xA >> 16, colorA, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yA, xC >> 16, xA >> 16, colorA, colorStepA, local182, local212, local242, local192, local222, local252); xC += xStepBC; xA += xStepAB; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; } } - drawTexturedAlphaScanline(Static129.pixels, texels, yA, xB >> 16, xA >> 16, colorA, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yA, xB >> 16, xA >> 16, colorA, colorStepA, local182, local212, local242, local192, local222, local252); xB += xStepAC; xA += xStepAB; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; @@ -971,22 +971,22 @@ public final class Rasteriser { return; } - drawTexturedAlphaScanline(Static129.pixels, texels, yB, xA >> 16, xC >> 16, colorB, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yB, xA >> 16, xC >> 16, colorB, colorStepA, local182, local212, local242, local192, local222, local252); xA += xStepAB; xC += xStepAC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; } } - drawTexturedAlphaScanline(Static129.pixels, texels, yB, xA >> 16, xB >> 16, colorB, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yB, xA >> 16, xB >> 16, colorB, colorStepA, local182, local212, local242, local192, local222, local252); xA += xStepAB; xB += xStepBC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; @@ -1004,22 +1004,22 @@ public final class Rasteriser { return; } - drawTexturedAlphaScanline(Static129.pixels, texels, yB, xC >> 16, xA >> 16, colorB, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yB, xC >> 16, xA >> 16, colorB, colorStepA, local182, local212, local242, local192, local222, local252); xA += xStepAB; xC += xStepAC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; } } - drawTexturedAlphaScanline(Static129.pixels, texels, yB, xB >> 16, xA >> 16, colorB, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yB, xB >> 16, xA >> 16, colorB, colorStepA, local182, local212, local242, local192, local222, local252); xA += xStepAB; xB += xStepBC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; @@ -1057,22 +1057,22 @@ public final class Rasteriser { return; } - drawTexturedAlphaScanline(Static129.pixels, texels, yB, xA >> 16, xB >> 16, colorB, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yB, xA >> 16, xB >> 16, colorB, colorStepA, local182, local212, local242, local192, local222, local252); xA += xStepAC; xB += xStepBC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; } } - drawTexturedAlphaScanline(Static129.pixels, texels, yB, xC >> 16, xB >> 16, colorB, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yB, xC >> 16, xB >> 16, colorB, colorStepA, local182, local212, local242, local192, local222, local252); xC += xStepAB; xB += xStepBC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; @@ -1090,22 +1090,22 @@ public final class Rasteriser { return; } - drawTexturedAlphaScanline(Static129.pixels, texels, yB, xB >> 16, xA >> 16, colorB, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yB, xB >> 16, xA >> 16, colorB, colorStepA, local182, local212, local242, local192, local222, local252); xA += xStepAC; xB += xStepBC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; } } - drawTexturedAlphaScanline(Static129.pixels, texels, yB, xB >> 16, xC >> 16, colorB, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yB, xB >> 16, xC >> 16, colorB, colorStepA, local182, local212, local242, local192, local222, local252); xC += xStepAB; xB += xStepBC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; @@ -1153,22 +1153,22 @@ public final class Rasteriser { return; } - drawTexturedAlphaScanline(Static129.pixels, texels, yC, xB >> 16, xA >> 16, colorC, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yC, xB >> 16, xA >> 16, colorC, colorStepA, local182, local212, local242, local192, local222, local252); xB += xStepBC; xA += xStepAB; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; } } - drawTexturedAlphaScanline(Static129.pixels, texels, yC, xB >> 16, xC >> 16, colorC, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yC, xB >> 16, xC >> 16, colorC, colorStepA, local182, local212, local242, local192, local222, local252); xB += xStepBC; xC += xStepAC; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; @@ -1186,22 +1186,22 @@ public final class Rasteriser { return; } - drawTexturedAlphaScanline(Static129.pixels, texels, yC, xA >> 16, xB >> 16, colorC, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yC, xA >> 16, xB >> 16, colorC, colorStepA, local182, local212, local242, local192, local222, local252); xB += xStepBC; xA += xStepAB; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; } } - drawTexturedAlphaScanline(Static129.pixels, texels, yC, xC >> 16, xB >> 16, colorC, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yC, xC >> 16, xB >> 16, colorC, colorStepA, local182, local212, local242, local192, local222, local252); xB += xStepBC; xC += xStepAC; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; @@ -1239,22 +1239,22 @@ public final class Rasteriser { return; } - drawTexturedAlphaScanline(Static129.pixels, texels, yC, xB >> 16, xC >> 16, colorC, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yC, xB >> 16, xC >> 16, colorC, colorStepA, local182, local212, local242, local192, local222, local252); xB += xStepAB; xC += xStepAC; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; } } - drawTexturedAlphaScanline(Static129.pixels, texels, yC, xA >> 16, xC >> 16, colorC, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yC, xA >> 16, xC >> 16, colorC, colorStepA, local182, local212, local242, local192, local222, local252); xA += xStepBC; xC += xStepAC; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; @@ -1272,22 +1272,22 @@ public final class Rasteriser { return; } - drawTexturedAlphaScanline(Static129.pixels, texels, yC, xC >> 16, xB >> 16, colorC, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yC, xC >> 16, xB >> 16, colorC, colorStepA, local182, local212, local242, local192, local222, local252); xB += xStepAB; xC += xStepAC; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; } } - drawTexturedAlphaScanline(Static129.pixels, texels, yC, xC >> 16, xA >> 16, colorC, colorStepA, local182, local212, local242, local192, local222, local252); + drawTexturedAlphaScanline(SoftwareRaster.pixels, texels, yC, xC >> 16, xA >> 16, colorC, colorStepA, local182, local212, local242, local192, local222, local252); xA += xStepBC; xC += xStepAC; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; local182 += local202; local212 += local232; local242 += local262; @@ -1299,7 +1299,7 @@ public final class Rasteriser { @OriginalMember(owner = "client!hf", name = "b", descriptor = "()I") public static int getOffsetRemainder() { - return offsets[0] % Static129.width; + return offsets[0] % SoftwareRaster.width; } @OriginalMember(owner = "client!hf", name = "a", descriptor = "(Lclient!m;)V") @@ -2121,17 +2121,17 @@ public final class Rasteriser { return; } - drawScanline(Static129.pixels, yA, color, xC >> 16, xB >> 16); + drawScanline(SoftwareRaster.pixels, yA, color, xC >> 16, xB >> 16); xC += mAC; xB += mBC; - yA += Static129.width; + yA += SoftwareRaster.width; } } - drawScanline(Static129.pixels, yA, color, xC >> 16, xA >> 16); + drawScanline(SoftwareRaster.pixels, yA, color, xC >> 16, xA >> 16); xC += mAC; xA += mAB; - yA += Static129.width; + yA += SoftwareRaster.width; } } else { yC -= yB; @@ -2146,17 +2146,17 @@ public final class Rasteriser { return; } - drawScanline(Static129.pixels, yA, color, xB >> 16, xC >> 16); + drawScanline(SoftwareRaster.pixels, yA, color, xB >> 16, xC >> 16); xC += mAC; xB += mBC; - yA += Static129.width; + yA += SoftwareRaster.width; } } - drawScanline(Static129.pixels, yA, color, xA >> 16, xC >> 16); + drawScanline(SoftwareRaster.pixels, yA, color, xA >> 16, xC >> 16); xC += mAC; xA += mAB; - yA += Static129.width; + yA += SoftwareRaster.width; } } } else { @@ -2186,17 +2186,17 @@ public final class Rasteriser { return; } - drawScanline(Static129.pixels, yA, color, xC >> 16, xA >> 16); + drawScanline(SoftwareRaster.pixels, yA, color, xC >> 16, xA >> 16); xC += mBC; xA += mAB; - yA += Static129.width; + yA += SoftwareRaster.width; } } - drawScanline(Static129.pixels, yA, color, xB >> 16, xA >> 16); + drawScanline(SoftwareRaster.pixels, yA, color, xB >> 16, xA >> 16); xB += mAC; xA += mAB; - yA += Static129.width; + yA += SoftwareRaster.width; } } else { yB -= yC; @@ -2211,17 +2211,17 @@ public final class Rasteriser { return; } - drawScanline(Static129.pixels, yA, color, xA >> 16, xC >> 16); + drawScanline(SoftwareRaster.pixels, yA, color, xA >> 16, xC >> 16); xC += mBC; xA += mAB; - yA += Static129.width; + yA += SoftwareRaster.width; } } - drawScanline(Static129.pixels, yA, color, xA >> 16, xB >> 16); + drawScanline(SoftwareRaster.pixels, yA, color, xA >> 16, xB >> 16); xB += mAC; xA += mAB; - yA += Static129.width; + yA += SoftwareRaster.width; } } } @@ -2263,17 +2263,17 @@ public final class Rasteriser { return; } - drawScanline(Static129.pixels, yB, color, xA >> 16, xC >> 16); + drawScanline(SoftwareRaster.pixels, yB, color, xA >> 16, xC >> 16); xA += mAB; xC += mAC; - yB += Static129.width; + yB += SoftwareRaster.width; } } - drawScanline(Static129.pixels, yB, color, xA >> 16, xB >> 16); + drawScanline(SoftwareRaster.pixels, yB, color, xA >> 16, xB >> 16); xA += mAB; xB += mBC; - yB += Static129.width; + yB += SoftwareRaster.width; } } else { yA -= yC; @@ -2288,17 +2288,17 @@ public final class Rasteriser { return; } - drawScanline(Static129.pixels, yB, color, xC >> 16, xA >> 16); + drawScanline(SoftwareRaster.pixels, yB, color, xC >> 16, xA >> 16); xA += mAB; xC += mAC; - yB += Static129.width; + yB += SoftwareRaster.width; } } - drawScanline(Static129.pixels, yB, color, xB >> 16, xA >> 16); + drawScanline(SoftwareRaster.pixels, yB, color, xB >> 16, xA >> 16); xA += mAB; xB += mBC; - yB += Static129.width; + yB += SoftwareRaster.width; } } } else { @@ -2328,17 +2328,17 @@ public final class Rasteriser { return; } - drawScanline(Static129.pixels, yB, color, xA >> 16, xB >> 16); + drawScanline(SoftwareRaster.pixels, yB, color, xA >> 16, xB >> 16); xA += mAC; xB += mBC; - yB += Static129.width; + yB += SoftwareRaster.width; } } - drawScanline(Static129.pixels, yB, color, xC >> 16, xB >> 16); + drawScanline(SoftwareRaster.pixels, yB, color, xC >> 16, xB >> 16); xC += mAB; xB += mBC; - yB += Static129.width; + yB += SoftwareRaster.width; } } else { yC -= yA; @@ -2353,17 +2353,17 @@ public final class Rasteriser { return; } - drawScanline(Static129.pixels, yB, color, xB >> 16, xA >> 16); + drawScanline(SoftwareRaster.pixels, yB, color, xB >> 16, xA >> 16); xA += mAC; xB += mBC; - yB += Static129.width; + yB += SoftwareRaster.width; } } - drawScanline(Static129.pixels, yB, color, xB >> 16, xC >> 16); + drawScanline(SoftwareRaster.pixels, yB, color, xB >> 16, xC >> 16); xC += mAB; xB += mBC; - yB += Static129.width; + yB += SoftwareRaster.width; } } } @@ -2404,17 +2404,17 @@ public final class Rasteriser { return; } - drawScanline(Static129.pixels, yC, color, xB >> 16, xA >> 16); + drawScanline(SoftwareRaster.pixels, yC, color, xB >> 16, xA >> 16); xB += mBC; xA += mAB; - yC += Static129.width; + yC += SoftwareRaster.width; } } - drawScanline(Static129.pixels, yC, color, xB >> 16, xC >> 16); + drawScanline(SoftwareRaster.pixels, yC, color, xB >> 16, xC >> 16); xB += mBC; xC += mAC; - yC += Static129.width; + yC += SoftwareRaster.width; } } else { yB -= yA; @@ -2429,17 +2429,17 @@ public final class Rasteriser { return; } - drawScanline(Static129.pixels, yC, color, xA >> 16, xB >> 16); + drawScanline(SoftwareRaster.pixels, yC, color, xA >> 16, xB >> 16); xB += mBC; xA += mAB; - yC += Static129.width; + yC += SoftwareRaster.width; } } - drawScanline(Static129.pixels, yC, color, xC >> 16, xB >> 16); + drawScanline(SoftwareRaster.pixels, yC, color, xC >> 16, xB >> 16); xB += mBC; xC += mAC; - yC += Static129.width; + yC += SoftwareRaster.width; } } } else { @@ -2469,17 +2469,17 @@ public final class Rasteriser { return; } - drawScanline(Static129.pixels, yC, color, xB >> 16, xC >> 16); + drawScanline(SoftwareRaster.pixels, yC, color, xB >> 16, xC >> 16); xB += mAB; xC += mAC; - yC += Static129.width; + yC += SoftwareRaster.width; } } - drawScanline(Static129.pixels, yC, color, xA >> 16, xC >> 16); + drawScanline(SoftwareRaster.pixels, yC, color, xA >> 16, xC >> 16); xA += mBC; xC += mAC; - yC += Static129.width; + yC += SoftwareRaster.width; } } else { yA -= yB; @@ -2494,17 +2494,17 @@ public final class Rasteriser { return; } - drawScanline(Static129.pixels, yC, color, xC >> 16, xB >> 16); + drawScanline(SoftwareRaster.pixels, yC, color, xC >> 16, xB >> 16); xB += mAB; xC += mAC; - yC += Static129.width; + yC += SoftwareRaster.width; } } - drawScanline(Static129.pixels, yC, color, xC >> 16, xA >> 16); + drawScanline(SoftwareRaster.pixels, yC, color, xC >> 16, xA >> 16); xA += mBC; xC += mAC; - yC += Static129.width; + yC += SoftwareRaster.width; } } } @@ -2514,8 +2514,8 @@ public final class Rasteriser { @OriginalMember(owner = "client!hf", name = "b", descriptor = "(II)V") public static void setBounds(@OriginalArg(0) int right, @OriginalArg(1) int bottom) { @Pc(3) int offset = offsets[0]; - @Pc(7) int top = offset / Static129.width; - @Pc(13) int left = offset - top * Static129.width; + @Pc(7) int top = offset / SoftwareRaster.width; + @Pc(13) int left = offset - top * SoftwareRaster.width; centerX = right - left; centerY = bottom - top; Static240.screenLowerX = -centerX; @@ -3234,10 +3234,10 @@ public final class Rasteriser { if (offsets.length < height) { offsets = new int[Static165.clp2(height)]; } - @Pc(23) int x = top * Static129.width + left; + @Pc(23) int x = top * SoftwareRaster.width + left; for (@Pc(25) int y = 0; y < height; y++) { offsets[y] = x; - x += Static129.width; + x += SoftwareRaster.width; } } @@ -3249,7 +3249,7 @@ public final class Rasteriser { @OriginalMember(owner = "client!hf", name = "d", descriptor = "()I") public static int getOffset() { - return offsets[0] / Static129.width; + return offsets[0] / SoftwareRaster.width; } @OriginalMember(owner = "client!hf", name = "a", descriptor = "(IIIIIIIII)V") @@ -3327,19 +3327,19 @@ public final class Rasteriser { return; } - drawGouraudScanline(Static129.pixels, yA, xB >> 16, xC >> 16, colorA, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yA, xB >> 16, xC >> 16, colorA, colorStepA); xC += xStepAC; xB += xStepBC; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; } } - drawGouraudScanline(Static129.pixels, yA, xA >> 16, xC >> 16, colorA, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yA, xA >> 16, xC >> 16, colorA, colorStepA); xC += xStepAC; xA += xStepAB; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; } } else { yC -= yB; @@ -3354,19 +3354,19 @@ public final class Rasteriser { return; } - drawGouraudScanline(Static129.pixels, yA, xC >> 16, xB >> 16, colorA, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yA, xC >> 16, xB >> 16, colorA, colorStepA); xC += xStepAC; xB += xStepBC; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; } } - drawGouraudScanline(Static129.pixels, yA, xC >> 16, xA >> 16, colorA, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yA, xC >> 16, xA >> 16, colorA, colorStepA); xC += xStepAC; xA += xStepAB; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; } } } else { @@ -3397,19 +3397,19 @@ public final class Rasteriser { return; } - drawGouraudScanline(Static129.pixels, yA, xC >> 16, xA >> 16, colorA, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yA, xC >> 16, xA >> 16, colorA, colorStepA); xC += xStepBC; xA += xStepAB; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; } } - drawGouraudScanline(Static129.pixels, yA, xB >> 16, xA >> 16, colorA, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yA, xB >> 16, xA >> 16, colorA, colorStepA); xB += xStepAC; xA += xStepAB; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; } } else { yB -= yC; @@ -3424,19 +3424,19 @@ public final class Rasteriser { return; } - drawGouraudScanline(Static129.pixels, yA, xA >> 16, xC >> 16, colorA, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yA, xA >> 16, xC >> 16, colorA, colorStepA); xC += xStepBC; xA += xStepAB; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; } } - drawGouraudScanline(Static129.pixels, yA, xA >> 16, xB >> 16, colorA, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yA, xA >> 16, xB >> 16, colorA, colorStepA); xB += xStepAC; xA += xStepAB; colorA += colorStepB; - yA += Static129.width; + yA += SoftwareRaster.width; } } } @@ -3477,19 +3477,19 @@ public final class Rasteriser { return; } - drawGouraudScanline(Static129.pixels, yB, xC >> 16, xA >> 16, colorB, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yB, xC >> 16, xA >> 16, colorB, colorStepA); xA += xStepAB; xC += xStepAC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; } } - drawGouraudScanline(Static129.pixels, yB, xB >> 16, xA >> 16, colorB, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yB, xB >> 16, xA >> 16, colorB, colorStepA); xA += xStepAB; xB += xStepBC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; } } else { yA -= yC; @@ -3504,19 +3504,19 @@ public final class Rasteriser { return; } - drawGouraudScanline(Static129.pixels, yB, xA >> 16, xC >> 16, colorB, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yB, xA >> 16, xC >> 16, colorB, colorStepA); xA += xStepAB; xC += xStepAC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; } } - drawGouraudScanline(Static129.pixels, yB, xA >> 16, xB >> 16, colorB, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yB, xA >> 16, xB >> 16, colorB, colorStepA); xA += xStepAB; xB += xStepBC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; } } } else { @@ -3547,19 +3547,19 @@ public final class Rasteriser { return; } - drawGouraudScanline(Static129.pixels, yB, xA >> 16, xB >> 16, colorB, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yB, xA >> 16, xB >> 16, colorB, colorStepA); xA += xStepAC; xB += xStepBC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; } } - drawGouraudScanline(Static129.pixels, yB, xC >> 16, xB >> 16, colorB, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yB, xC >> 16, xB >> 16, colorB, colorStepA); xC += xStepAB; xB += xStepBC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; } } else { yC -= yA; @@ -3574,19 +3574,19 @@ public final class Rasteriser { return; } - drawGouraudScanline(Static129.pixels, yB, xB >> 16, xA >> 16, colorB, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yB, xB >> 16, xA >> 16, colorB, colorStepA); xA += xStepAC; xB += xStepBC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; } } - drawGouraudScanline(Static129.pixels, yB, xB >> 16, xC >> 16, colorB, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yB, xB >> 16, xC >> 16, colorB, colorStepA); xC += xStepAB; xB += xStepBC; colorB += colorStepB; - yB += Static129.width; + yB += SoftwareRaster.width; } } } @@ -3628,19 +3628,19 @@ public final class Rasteriser { return; } - drawGouraudScanline(Static129.pixels, yC, xB >> 16, xA >> 16, colorC, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yC, xB >> 16, xA >> 16, colorC, colorStepA); xB += xStepBC; xA += xStepAB; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; } } - drawGouraudScanline(Static129.pixels, yC, xB >> 16, xC >> 16, colorC, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yC, xB >> 16, xC >> 16, colorC, colorStepA); xB += xStepBC; xC += xStepAC; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; } } else { yB -= yA; @@ -3655,19 +3655,19 @@ public final class Rasteriser { return; } - drawGouraudScanline(Static129.pixels, yC, xA >> 16, xB >> 16, colorC, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yC, xA >> 16, xB >> 16, colorC, colorStepA); xB += xStepBC; xA += xStepAB; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; } } - drawGouraudScanline(Static129.pixels, yC, xC >> 16, xB >> 16, colorC, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yC, xC >> 16, xB >> 16, colorC, colorStepA); xB += xStepBC; xC += xStepAC; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; } } } else { @@ -3698,19 +3698,19 @@ public final class Rasteriser { return; } - drawGouraudScanline(Static129.pixels, yC, xB >> 16, xC >> 16, colorC, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yC, xB >> 16, xC >> 16, colorC, colorStepA); xB += xStepAB; xC += xStepAC; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; } } - drawGouraudScanline(Static129.pixels, yC, xA >> 16, xC >> 16, colorC, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yC, xA >> 16, xC >> 16, colorC, colorStepA); xA += xStepBC; xC += xStepAC; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; } } else { yA -= yB; @@ -3725,19 +3725,19 @@ public final class Rasteriser { return; } - drawGouraudScanline(Static129.pixels, yC, xC >> 16, xB >> 16, colorC, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yC, xC >> 16, xB >> 16, colorC, colorStepA); xB += xStepAB; xC += xStepAC; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; } } - drawGouraudScanline(Static129.pixels, yC, xC >> 16, xA >> 16, colorC, colorStepA); + drawGouraudScanline(SoftwareRaster.pixels, yC, xC >> 16, xA >> 16, colorC, colorStepA); xA += xStepBC; xC += xStepAC; colorC += colorStepB; - yC += Static129.width; + yC += SoftwareRaster.width; } } } diff --git a/client/src/main/java/SceneGraph.java b/client/src/main/java/SceneGraph.java new file mode 100644 index 0000000..dbf6e3f --- /dev/null +++ b/client/src/main/java/SceneGraph.java @@ -0,0 +1,8 @@ +import org.openrs2.deob.annotation.OriginalMember; + +public class SceneGraph { + @OriginalMember(owner = "client!km", name = "f", descriptor = "(I)Z") + public static boolean allLevelsAreVisible() { + return GlRenderer.enabled ? true : Preferences.allLevelsVisible; + } +} diff --git a/client/src/main/java/SecondaryLinkedList.java b/client/src/main/java/SecondaryLinkedList.java index 545cc43..af031f7 100644 --- a/client/src/main/java/SecondaryLinkedList.java +++ b/client/src/main/java/SecondaryLinkedList.java @@ -76,7 +76,7 @@ public final class SecondaryLinkedList { } @OriginalMember(owner = "client!ce", name = "d", descriptor = "(I)V") - public final void method802() { + public final void clear() { while (true) { @Pc(15) SecondaryNode local15 = this.aClass3_Sub2_21.aClass3_Sub2_67; if (this.aClass3_Sub2_21 == local15) { diff --git a/client/src/main/java/Shadow.java b/client/src/main/java/Shadow.java index e7c5ac0..0b524cc 100644 --- a/client/src/main/java/Shadow.java +++ b/client/src/main/java/Shadow.java @@ -9,7 +9,9 @@ import org.openrs2.deob.annotation.Pc; @OriginalClass("client!wm") public final class Shadow { - @OriginalMember(owner = "client!wm", name = "a", descriptor = "Lclient!vi;") + @OriginalMember(owner = "client!wm", name = "g", descriptor = "[B") + public static final byte[] pixels = new byte[16384]; + @OriginalMember(owner = "client!wm", name = "a", descriptor = "Lclient!vi;") private GlVertexBufferObject aClass155_6; @OriginalMember(owner = "client!wm", name = "c", descriptor = "Ljava/nio/ByteBuffer;") @@ -144,16 +146,16 @@ public final class Shadow { if (local2[local19 + local5] != 0) { local96++; } - Static281.aByteArray82[local23++] = (byte) (local96 * 17); + pixels[local23++] = (byte) (local96 * 17); } else { - Static281.aByteArray82[local23++] = 68; + pixels[local23++] = 68; } local19++; } local19 += local5 - 128; } @Pc(145) GL2 local145 = GlRenderer.gl; - @Pc(148) ByteBuffer local148 = ByteBuffer.wrap(Static281.aByteArray82); + @Pc(148) ByteBuffer local148 = ByteBuffer.wrap(pixels); local148.limit(16384); GlRenderer.setTextureId(this.anInt5901); local145.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_ALPHA, 128, 128, 0, GL2.GL_ALPHA, GL2.GL_UNSIGNED_BYTE, local148); diff --git a/client/src/main/java/SoftLruHashTable.java b/client/src/main/java/SoftLruHashTable.java index 0fbac03..77d8c10 100644 --- a/client/src/main/java/SoftLruHashTable.java +++ b/client/src/main/java/SoftLruHashTable.java @@ -100,8 +100,8 @@ public final class SoftLruHashTable { @OriginalMember(owner = "client!n", name = "c", descriptor = "(I)V") public final void clear() { - this.aClass16_8.method802(); - this.aClass133_18.method3856(); + this.aClass16_8.clear(); + this.aClass133_18.clear(); this.anInt3966 = this.anInt3970; } diff --git a/client/src/main/java/SoftwareAlphaSprite.java b/client/src/main/java/SoftwareAlphaSprite.java index 718943f..e5045fa 100644 --- a/client/src/main/java/SoftwareAlphaSprite.java +++ b/client/src/main/java/SoftwareAlphaSprite.java @@ -21,23 +21,23 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { @Pc(33) int local33 = local21 * 256 >> 8; @Pc(45) int local45 = local27 * -10 + local33 * -10 + 983040; @Pc(57) int local57 = local33 * -10 + 983040 - local27 * -10; - @Pc(63) int local63 = arg0 + arg1 * Static129.width; + @Pc(63) int local63 = arg0 + arg1 * SoftwareRaster.width; for (@Pc(65) int local65 = 0; local65 < 20; local65++) { @Pc(70) int local70 = local63; @Pc(72) int local72 = local45; @Pc(74) int local74 = local57; for (@Pc(77) int local77 = -20; local77 < 0; local77++) { @Pc(93) int local93 = this.anIntArray20[(local72 >> 16) + (local74 >> 16) * this.anInt1867]; - @Pc(97) int local97 = Static129.pixels[local70]; + @Pc(97) int local97 = SoftwareRaster.pixels[local70]; @Pc(101) int local101 = local93 >>> 24; @Pc(105) int local105 = 256 - local101; - Static129.pixels[local70++] = ((local93 & 0xFF00FF) * local101 + (local97 & 0xFF00FF) * local105 & 0xFF00FF00) + ((local93 & 0xFF00) * local101 + (local97 & 0xFF00) * local105 & 0xFF0000) >>> 8; + SoftwareRaster.pixels[local70++] = ((local93 & 0xFF00FF) * local101 + (local97 & 0xFF00FF) * local105 & 0xFF00FF00) + ((local93 & 0xFF00) * local101 + (local97 & 0xFF00) * local105 & 0xFF0000) >>> 8; local72 += local33; local74 -= local27; } local45 += local27; local57 += local33; - local63 += Static129.width; + local63 += SoftwareRaster.width; } } catch (@Pc(164) Exception local164) { } @@ -48,40 +48,40 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { public final void method1423(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { arg0 += this.anInt1863; arg1 += this.anInt1861; - @Pc(15) int local15 = arg0 + arg1 * Static129.width; + @Pc(15) int local15 = arg0 + arg1 * SoftwareRaster.width; @Pc(17) int local17 = 0; @Pc(20) int local20 = this.anInt1859; @Pc(23) int local23 = this.anInt1867; - @Pc(27) int local27 = Static129.width - local23; + @Pc(27) int local27 = SoftwareRaster.width - local23; @Pc(29) int local29 = 0; @Pc(36) int local36; - if (arg1 < Static129.clipTop) { - local36 = Static129.clipTop - arg1; + if (arg1 < SoftwareRaster.clipTop) { + local36 = SoftwareRaster.clipTop - arg1; local20 -= local36; - arg1 = Static129.clipTop; + arg1 = SoftwareRaster.clipTop; local17 = local36 * local23; - local15 += local36 * Static129.width; + local15 += local36 * SoftwareRaster.width; } - if (arg1 + local20 > Static129.clipBottom) { - local20 -= arg1 + local20 - Static129.clipBottom; + if (arg1 + local20 > SoftwareRaster.clipBottom) { + local20 -= arg1 + local20 - SoftwareRaster.clipBottom; } - if (arg0 < Static129.clipLeft) { - local36 = Static129.clipLeft - arg0; + if (arg0 < SoftwareRaster.clipLeft) { + local36 = SoftwareRaster.clipLeft - arg0; local23 -= local36; - arg0 = Static129.clipLeft; + arg0 = SoftwareRaster.clipLeft; local17 += local36; local15 += local36; local29 = local36; local27 += local36; } - if (arg0 + local23 > Static129.clipRight) { - local36 = arg0 + local23 - Static129.clipRight; + if (arg0 + local23 > SoftwareRaster.clipRight) { + local36 = arg0 + local23 - SoftwareRaster.clipRight; local23 -= local36; local29 += local36; local27 += local36; } if (local23 > 0 && local20 > 0) { - Static283.method319(Static129.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29); + Static283.method319(SoftwareRaster.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29); } } @@ -90,40 +90,40 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { public final void method1415(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { arg0 += this.anInt1863; arg1 += this.anInt1861; - @Pc(15) int local15 = arg0 + arg1 * Static129.width; + @Pc(15) int local15 = arg0 + arg1 * SoftwareRaster.width; @Pc(17) int local17 = 0; @Pc(20) int local20 = this.anInt1859; @Pc(23) int local23 = this.anInt1867; - @Pc(27) int local27 = Static129.width - local23; + @Pc(27) int local27 = SoftwareRaster.width - local23; @Pc(29) int local29 = 0; @Pc(36) int local36; - if (arg1 < Static129.clipTop) { - local36 = Static129.clipTop - arg1; + if (arg1 < SoftwareRaster.clipTop) { + local36 = SoftwareRaster.clipTop - arg1; local20 -= local36; - arg1 = Static129.clipTop; + arg1 = SoftwareRaster.clipTop; local17 = local36 * local23; - local15 += local36 * Static129.width; + local15 += local36 * SoftwareRaster.width; } - if (arg1 + local20 > Static129.clipBottom) { - local20 -= arg1 + local20 - Static129.clipBottom; + if (arg1 + local20 > SoftwareRaster.clipBottom) { + local20 -= arg1 + local20 - SoftwareRaster.clipBottom; } - if (arg0 < Static129.clipLeft) { - local36 = Static129.clipLeft - arg0; + if (arg0 < SoftwareRaster.clipLeft) { + local36 = SoftwareRaster.clipLeft - arg0; local23 -= local36; - arg0 = Static129.clipLeft; + arg0 = SoftwareRaster.clipLeft; local17 += local36; local15 += local36; local29 = local36; local27 += local36; } - if (arg0 + local23 > Static129.clipRight) { - local36 = arg0 + local23 - Static129.clipRight; + if (arg0 + local23 > SoftwareRaster.clipRight) { + local36 = arg0 + local23 - SoftwareRaster.clipRight; local23 -= local36; local29 += local36; local27 += local36; } if (local23 > 0 && local20 > 0) { - Static283.method319(Static129.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29); + Static283.method319(SoftwareRaster.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29); } } @@ -200,17 +200,17 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { local166 = local166 + 15 >> 4; local196 >>= 0x4; local198 = local198 + 15 >> 4; - if (local164 < Static129.clipLeft) { - local164 = Static129.clipLeft; + if (local164 < SoftwareRaster.clipLeft) { + local164 = SoftwareRaster.clipLeft; } - if (local166 > Static129.clipRight) { - local166 = Static129.clipRight; + if (local166 > SoftwareRaster.clipRight) { + local166 = SoftwareRaster.clipRight; } - if (local196 < Static129.clipTop) { - local196 = Static129.clipTop; + if (local196 < SoftwareRaster.clipTop) { + local196 = SoftwareRaster.clipTop; } - if (local198 > Static129.clipBottom) { - local198 = Static129.clipBottom; + if (local198 > SoftwareRaster.clipBottom) { + local198 = SoftwareRaster.clipBottom; } local166 = local164 - local166; if (local166 >= 0) { @@ -220,7 +220,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { if (local198 >= 0) { return; } - @Pc(319) int local319 = local196 * Static129.width + local164; + @Pc(319) int local319 = local196 * SoftwareRaster.width + local164; @Pc(324) double local324 = 1.6777216E7D / (double) arg5; @Pc(333) int local333 = (int) Math.floor(Math.sin(local23) * local324 + 0.5D); @Pc(342) int local342 = (int) Math.floor(Math.cos(local23) * local324 + 0.5D); @@ -260,17 +260,17 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { } while (local394 < 0) { local432 = this.anIntArray20[(local378 >> 12) * this.anInt1867 + (local802 >> 12)]; - local436 = Static129.pixels[local388]; + local436 = SoftwareRaster.pixels[local388]; local440 = local432 >>> 24; local444 = 256 - local440; - Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; + SoftwareRaster.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; local802 += local342; local394++; } } local384++; local378 += local342; - local319 += Static129.width; + local319 += SoftwareRaster.width; } } else if (local333 < 0) { local384 = local198; @@ -305,10 +305,10 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { } while (local394 < 0) { local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local802 >> 12)]; - local436 = Static129.pixels[local388]; + local436 = SoftwareRaster.pixels[local388]; local440 = local432 >>> 24; local444 = 256 - local440; - Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; + SoftwareRaster.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; local802 += local342; local504 += local333; local394++; @@ -316,7 +316,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { local384++; local368 -= local333; local378 += local342; - local319 += Static129.width; + local319 += SoftwareRaster.width; } } else { local384 = local198; @@ -350,10 +350,10 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { } while (local394 < 0) { local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local802 >> 12)]; - local436 = Static129.pixels[local388]; + local436 = SoftwareRaster.pixels[local388]; local440 = local432 >>> 24; local444 = 256 - local440; - Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; + SoftwareRaster.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; local802 += local342; local504 += local333; local394++; @@ -361,7 +361,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { local384++; local368 -= local333; local378 += local342; - local319 += Static129.width; + local319 += SoftwareRaster.width; } } } else if (local333 == 0) { @@ -383,17 +383,17 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { } while (local394 < 0) { local432 = this.anIntArray20[(local378 >> 12) * this.anInt1867 + (local802 >> 12)]; - local436 = Static129.pixels[local388]; + local436 = SoftwareRaster.pixels[local388]; local440 = local432 >>> 24; local444 = 256 - local440; - Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; + SoftwareRaster.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; local802 += local342; local394++; } } local384++; local378 += local342; - local319 += Static129.width; + local319 += SoftwareRaster.width; } } else if (local333 < 0) { local384 = local198; @@ -427,10 +427,10 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { } while (local394 < 0) { local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local802 >> 12)]; - local436 = Static129.pixels[local388]; + local436 = SoftwareRaster.pixels[local388]; local440 = local432 >>> 24; local444 = 256 - local440; - Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; + SoftwareRaster.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; local802 += local342; local504 += local333; local394++; @@ -438,7 +438,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { local384++; local368 -= local333; local378 += local342; - local319 += Static129.width; + local319 += SoftwareRaster.width; } } else { local384 = local198; @@ -471,10 +471,10 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { } while (local394 < 0) { local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local802 >> 12)]; - local436 = Static129.pixels[local388]; + local436 = SoftwareRaster.pixels[local388]; local440 = local432 >>> 24; local444 = 256 - local440; - Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; + SoftwareRaster.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; local802 += local342; local504 += local333; local394++; @@ -482,7 +482,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { local384++; local368 -= local333; local378 += local342; - local319 += Static129.width; + local319 += SoftwareRaster.width; } } } else if (local333 == 0) { @@ -493,15 +493,15 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { if (local368 >= 0 && local378 >= 0 && local368 - (this.anInt1867 << 12) < 0 && local378 - (this.anInt1859 << 12) < 0) { while (local394 < 0) { local432 = this.anIntArray20[(local378 >> 12) * this.anInt1867 + (local368 >> 12)]; - local436 = Static129.pixels[local388]; + local436 = SoftwareRaster.pixels[local388]; local440 = local432 >>> 24; local444 = 256 - local440; - Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; + SoftwareRaster.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; local394++; } } local384++; - local319 += Static129.width; + local319 += SoftwareRaster.width; } } else if (local333 < 0) { local384 = local198; @@ -523,17 +523,17 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { } while (local394 < 0) { local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local368 >> 12)]; - local436 = Static129.pixels[local388]; + local436 = SoftwareRaster.pixels[local388]; local440 = local432 >>> 24; local444 = 256 - local440; - Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; + SoftwareRaster.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; local504 += local333; local394++; } } local384++; local368 -= local333; - local319 += Static129.width; + local319 += SoftwareRaster.width; } } else { local384 = local198; @@ -554,17 +554,17 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { } while (local394 < 0) { local432 = this.anIntArray20[(local504 >> 12) * this.anInt1867 + (local368 >> 12)]; - local436 = Static129.pixels[local388]; + local436 = SoftwareRaster.pixels[local388]; local440 = local432 >>> 24; local444 = 256 - local440; - Static129.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; + SoftwareRaster.pixels[local388++] = ((local432 & 0xFF00FF) * local440 + (local436 & 0xFF00FF) * local444 & 0xFF00FF00) + ((local432 & 0xFF00) * local440 + (local436 & 0xFF00) * local444 & 0xFF0000) >>> 8; local504 += local333; local394++; } } local384++; local368 -= local333; - local319 += Static129.width; + local319 += SoftwareRaster.width; } } } @@ -581,7 +581,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { @Pc(39) int local39 = local27 * arg7 >> 8; @Pc(51) int local51 = (arg4 << 16) + local9 * local33 + local4 * local39; @Pc(63) int local63 = (arg5 << 16) + (local9 * local39 - local4 * local33); - @Pc(69) int local69 = arg0 + arg1 * Static129.width; + @Pc(69) int local69 = arg0 + arg1 * SoftwareRaster.width; for (@Pc(71) int local71 = 0; local71 < arg3; local71++) { @Pc(78) int local78 = arg8[local71]; @Pc(82) int local82 = local69 + local78; @@ -589,16 +589,16 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { @Pc(94) int local94 = local63 - local33 * local78; for (@Pc(99) int local99 = -arg9[local71]; local99 < 0; local99++) { @Pc(115) int local115 = this.anIntArray20[(local88 >> 16) + (local94 >> 16) * this.anInt1867]; - @Pc(119) int local119 = Static129.pixels[local82]; + @Pc(119) int local119 = SoftwareRaster.pixels[local82]; @Pc(123) int local123 = local115 >>> 24; @Pc(127) int local127 = 256 - local123; - Static129.pixels[local82++] = ((local115 & 0xFF00FF) * local123 + (local119 & 0xFF00FF) * local127 & 0xFF00FF00) + ((local115 & 0xFF00) * local123 + (local119 & 0xFF00) * local127 & 0xFF0000) >>> 8; + SoftwareRaster.pixels[local82++] = ((local115 & 0xFF00FF) * local123 + (local119 & 0xFF00FF) * local127 & 0xFF00FF00) + ((local115 & 0xFF00) * local123 + (local119 & 0xFF00) * local127 & 0xFF0000) >>> 8; local88 += local39; local94 -= local33; } local51 += local33; local63 += local39; - local69 += Static129.width; + local69 += SoftwareRaster.width; } } catch (@Pc(186) Exception local186) { } @@ -616,7 +616,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { @Pc(39) int local39 = local27 * 256 >> 8; @Pc(51) int local51 = (arg4 << 16) + local9 * local33 + local4 * local39; @Pc(63) int local63 = (arg5 << 16) + (local9 * local39 - local4 * local33); - @Pc(69) int local69 = arg0 + arg1 * Static129.width; + @Pc(69) int local69 = arg0 + arg1 * SoftwareRaster.width; for (@Pc(71) int local71 = 0; local71 < arg3; local71++) { @Pc(78) int local78 = arg7[local71]; @Pc(82) int local82 = local69 + local78; @@ -624,16 +624,16 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { @Pc(94) int local94 = local63 - local33 * local78; for (@Pc(99) int local99 = -arg8[local71]; local99 < 0; local99++) { @Pc(115) int local115 = this.anIntArray20[(local88 >> 16) + (local94 >> 16) * this.anInt1867]; - @Pc(119) int local119 = Static129.pixels[local82]; + @Pc(119) int local119 = SoftwareRaster.pixels[local82]; @Pc(123) int local123 = local115 >>> 24; @Pc(127) int local127 = 256 - local123; - Static129.pixels[local82++] = ((local115 & 0xFF00FF) * local123 + (local119 & 0xFF00FF) * local127 & 0xFF00FF00) + ((local115 & 0xFF00) * local123 + (local119 & 0xFF00) * local127 & 0xFF0000) >>> 8; + SoftwareRaster.pixels[local82++] = ((local115 & 0xFF00FF) * local123 + (local119 & 0xFF00FF) * local127 & 0xFF00FF00) + ((local115 & 0xFF00) * local123 + (local119 & 0xFF00) * local127 & 0xFF0000) >>> 8; local88 += local39; local94 -= local33; } local51 += local33; local63 += local39; - local69 += Static129.width; + local69 += SoftwareRaster.width; } } catch (@Pc(186) Exception local186) { } @@ -670,31 +670,31 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { if (local10 < local20) { arg3 = ((local10 << 16) + local32 - local14 - 1) / local32; } - local46 = arg0 + arg1 * Static129.width; - @Pc(130) int local130 = Static129.width - arg2; - if (arg1 + arg3 > Static129.clipBottom) { - arg3 -= arg1 + arg3 - Static129.clipBottom; + local46 = arg0 + arg1 * SoftwareRaster.width; + @Pc(130) int local130 = SoftwareRaster.width - arg2; + if (arg1 + arg3 > SoftwareRaster.clipBottom) { + arg3 -= arg1 + arg3 - SoftwareRaster.clipBottom; } @Pc(150) int local150; - if (arg1 < Static129.clipTop) { - local150 = Static129.clipTop - arg1; + if (arg1 < SoftwareRaster.clipTop) { + local150 = SoftwareRaster.clipTop - arg1; arg3 -= local150; - local46 += local150 * Static129.width; + local46 += local150 * SoftwareRaster.width; local14 += local32 * local150; } - if (arg0 + arg2 > Static129.clipRight) { - local150 = arg0 + arg2 - Static129.clipRight; + if (arg0 + arg2 > SoftwareRaster.clipRight) { + local150 = arg0 + arg2 - SoftwareRaster.clipRight; arg2 -= local150; local130 += local150; } - if (arg0 < Static129.clipLeft) { - local150 = Static129.clipLeft - arg0; + if (arg0 < SoftwareRaster.clipLeft) { + local150 = SoftwareRaster.clipLeft - arg0; arg2 -= local150; local46 += local150; local12 += local26 * local150; local130 += local150; } - Static283.method317(Static129.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7, arg4); + Static283.method317(SoftwareRaster.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7, arg4); } @OriginalMember(owner = "client!am", name = "a", descriptor = "(IIII)V") @@ -728,31 +728,31 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { if (local10 < local20) { arg3 = ((local10 << 16) + local32 - local14 - 1) / local32; } - local46 = arg0 + arg1 * Static129.width; - @Pc(130) int local130 = Static129.width - arg2; - if (arg1 + arg3 > Static129.clipBottom) { - arg3 -= arg1 + arg3 - Static129.clipBottom; + local46 = arg0 + arg1 * SoftwareRaster.width; + @Pc(130) int local130 = SoftwareRaster.width - arg2; + if (arg1 + arg3 > SoftwareRaster.clipBottom) { + arg3 -= arg1 + arg3 - SoftwareRaster.clipBottom; } @Pc(150) int local150; - if (arg1 < Static129.clipTop) { - local150 = Static129.clipTop - arg1; + if (arg1 < SoftwareRaster.clipTop) { + local150 = SoftwareRaster.clipTop - arg1; arg3 -= local150; - local46 += local150 * Static129.width; + local46 += local150 * SoftwareRaster.width; local14 += local32 * local150; } - if (arg0 + arg2 > Static129.clipRight) { - local150 = arg0 + arg2 - Static129.clipRight; + if (arg0 + arg2 > SoftwareRaster.clipRight) { + local150 = arg0 + arg2 - SoftwareRaster.clipRight; arg2 -= local150; local130 += local150; } - if (arg0 < Static129.clipLeft) { - local150 = Static129.clipLeft - arg0; + if (arg0 < SoftwareRaster.clipLeft) { + local150 = SoftwareRaster.clipLeft - arg0; arg2 -= local150; local46 += local150; local12 += local26 * local150; local130 += local150; } - Static283.method321(Static129.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7); + Static283.method321(SoftwareRaster.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7); } @OriginalMember(owner = "client!am", name = "d", descriptor = "(II)V") @@ -760,40 +760,40 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { public final void method1421(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { arg0 += this.anInt1860 - this.anInt1867 - this.anInt1863; arg1 += this.anInt1861; - @Pc(21) int local21 = arg0 + arg1 * Static129.width; + @Pc(21) int local21 = arg0 + arg1 * SoftwareRaster.width; @Pc(26) int local26 = this.anInt1867 - 1; @Pc(29) int local29 = this.anInt1859; @Pc(32) int local32 = this.anInt1867; - @Pc(36) int local36 = Static129.width - local32; + @Pc(36) int local36 = SoftwareRaster.width - local32; @Pc(40) int local40 = local32 + local32; @Pc(47) int local47; - if (arg1 < Static129.clipTop) { - local47 = Static129.clipTop - arg1; + if (arg1 < SoftwareRaster.clipTop) { + local47 = SoftwareRaster.clipTop - arg1; local29 -= local47; - arg1 = Static129.clipTop; + arg1 = SoftwareRaster.clipTop; local26 += local47 * local32; - local21 += local47 * Static129.width; + local21 += local47 * SoftwareRaster.width; } - if (arg1 + local29 > Static129.clipBottom) { - local29 -= arg1 + local29 - Static129.clipBottom; + if (arg1 + local29 > SoftwareRaster.clipBottom) { + local29 -= arg1 + local29 - SoftwareRaster.clipBottom; } - if (arg0 < Static129.clipLeft) { - local47 = Static129.clipLeft - arg0; + if (arg0 < SoftwareRaster.clipLeft) { + local47 = SoftwareRaster.clipLeft - arg0; local32 -= local47; - arg0 = Static129.clipLeft; + arg0 = SoftwareRaster.clipLeft; local26 -= local47; local21 += local47; local40 -= local47; local36 += local47; } - if (arg0 + local32 > Static129.clipRight) { - local47 = arg0 + local32 - Static129.clipRight; + if (arg0 + local32 > SoftwareRaster.clipRight) { + local47 = arg0 + local32 - SoftwareRaster.clipRight; local32 -= local47; local40 -= local47; local36 += local47; } if (local32 > 0 && local29 > 0) { - Static283.method318(Static129.pixels, this.anIntArray20, local26, local21, local32, local29, local36, local40); + Static283.method318(SoftwareRaster.pixels, this.anIntArray20, local26, local21, local32, local29, local36, local40); } } @@ -802,40 +802,40 @@ public final class SoftwareAlphaSprite extends SoftwareSprite { public final void method1417(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { arg0 += this.anInt1863; arg1 += this.anInt1861; - @Pc(15) int local15 = arg0 + arg1 * Static129.width; + @Pc(15) int local15 = arg0 + arg1 * SoftwareRaster.width; @Pc(17) int local17 = 0; @Pc(20) int local20 = this.anInt1859; @Pc(23) int local23 = this.anInt1867; - @Pc(27) int local27 = Static129.width - local23; + @Pc(27) int local27 = SoftwareRaster.width - local23; @Pc(29) int local29 = 0; @Pc(36) int local36; - if (arg1 < Static129.clipTop) { - local36 = Static129.clipTop - arg1; + if (arg1 < SoftwareRaster.clipTop) { + local36 = SoftwareRaster.clipTop - arg1; local20 -= local36; - arg1 = Static129.clipTop; + arg1 = SoftwareRaster.clipTop; local17 = local36 * local23; - local15 += local36 * Static129.width; + local15 += local36 * SoftwareRaster.width; } - if (arg1 + local20 > Static129.clipBottom) { - local20 -= arg1 + local20 - Static129.clipBottom; + if (arg1 + local20 > SoftwareRaster.clipBottom) { + local20 -= arg1 + local20 - SoftwareRaster.clipBottom; } - if (arg0 < Static129.clipLeft) { - local36 = Static129.clipLeft - arg0; + if (arg0 < SoftwareRaster.clipLeft) { + local36 = SoftwareRaster.clipLeft - arg0; local23 -= local36; - arg0 = Static129.clipLeft; + arg0 = SoftwareRaster.clipLeft; local17 += local36; local15 += local36; local29 = local36; local27 += local36; } - if (arg0 + local23 > Static129.clipRight) { - local36 = arg0 + local23 - Static129.clipRight; + if (arg0 + local23 > SoftwareRaster.clipRight) { + local36 = arg0 + local23 - SoftwareRaster.clipRight; local23 -= local36; local29 += local36; local27 += local36; } if (local23 > 0 && local20 > 0) { - Static283.method320(Static129.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29, arg2); + Static283.method320(SoftwareRaster.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29, arg2); } } } diff --git a/client/src/main/java/SoftwareFont.java b/client/src/main/java/SoftwareFont.java index 3ccf6df..fbff8bd 100644 --- a/client/src/main/java/SoftwareFont.java +++ b/client/src/main/java/SoftwareFont.java @@ -23,70 +23,70 @@ public final class SoftwareFont extends Font { @OriginalMember(owner = "client!dd", name = "a", descriptor = "(IIIIIIIZ)V") @Override protected final void renderGlyphTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) { - @Pc(5) int local5 = arg1 + arg2 * Static129.width; - @Pc(9) int local9 = Static129.width - arg3; + @Pc(5) int local5 = arg1 + arg2 * SoftwareRaster.width; + @Pc(9) int local9 = SoftwareRaster.width - arg3; @Pc(11) int local11 = 0; @Pc(13) int local13 = 0; @Pc(20) int local20; - if (arg2 < Static129.clipTop) { - local20 = Static129.clipTop - arg2; + if (arg2 < SoftwareRaster.clipTop) { + local20 = SoftwareRaster.clipTop - arg2; arg4 -= local20; - arg2 = Static129.clipTop; + arg2 = SoftwareRaster.clipTop; local13 = local20 * arg3; - local5 += local20 * Static129.width; + local5 += local20 * SoftwareRaster.width; } - if (arg2 + arg4 > Static129.clipBottom) { - arg4 -= arg2 + arg4 - Static129.clipBottom; + if (arg2 + arg4 > SoftwareRaster.clipBottom) { + arg4 -= arg2 + arg4 - SoftwareRaster.clipBottom; } - if (arg1 < Static129.clipLeft) { - local20 = Static129.clipLeft - arg1; + if (arg1 < SoftwareRaster.clipLeft) { + local20 = SoftwareRaster.clipLeft - arg1; arg3 -= local20; - arg1 = Static129.clipLeft; + arg1 = SoftwareRaster.clipLeft; local13 += local20; local5 += local20; local11 = local20; local9 += local20; } - if (arg1 + arg3 > Static129.clipRight) { - local20 = arg1 + arg3 - Static129.clipRight; + if (arg1 + arg3 > SoftwareRaster.clipRight) { + local20 = arg1 + arg3 - SoftwareRaster.clipRight; arg3 -= local20; local11 += local20; local9 += local20; } if (arg3 > 0 && arg4 > 0) { - Static285.method1139(Static129.pixels, this.aByteArrayArray7[arg0], arg5, local13, local5, arg3, arg4, local9, local11, arg6); + Static285.method1139(SoftwareRaster.pixels, this.aByteArrayArray7[arg0], arg5, local13, local5, arg3, arg4, local9, local11, arg6); } } @OriginalMember(owner = "client!dd", name = "a", descriptor = "(IIIIIIZ)V") @Override protected final void renderGlyph(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { - @Pc(5) int local5 = arg1 + arg2 * Static129.width; - @Pc(9) int local9 = Static129.width - arg3; + @Pc(5) int local5 = arg1 + arg2 * SoftwareRaster.width; + @Pc(9) int local9 = SoftwareRaster.width - arg3; @Pc(11) int local11 = 0; @Pc(13) int local13 = 0; @Pc(20) int local20; - if (arg2 < Static129.clipTop) { - local20 = Static129.clipTop - arg2; + if (arg2 < SoftwareRaster.clipTop) { + local20 = SoftwareRaster.clipTop - arg2; arg4 -= local20; - arg2 = Static129.clipTop; + arg2 = SoftwareRaster.clipTop; local13 = local20 * arg3; - local5 += local20 * Static129.width; + local5 += local20 * SoftwareRaster.width; } - if (arg2 + arg4 > Static129.clipBottom) { - arg4 -= arg2 + arg4 - Static129.clipBottom; + if (arg2 + arg4 > SoftwareRaster.clipBottom) { + arg4 -= arg2 + arg4 - SoftwareRaster.clipBottom; } - if (arg1 < Static129.clipLeft) { - local20 = Static129.clipLeft - arg1; + if (arg1 < SoftwareRaster.clipLeft) { + local20 = SoftwareRaster.clipLeft - arg1; arg3 -= local20; - arg1 = Static129.clipLeft; + arg1 = SoftwareRaster.clipLeft; local13 += local20; local5 += local20; local11 = local20; local9 += local20; } - if (arg1 + arg3 > Static129.clipRight) { - local20 = arg1 + arg3 - Static129.clipRight; + if (arg1 + arg3 > SoftwareRaster.clipRight) { + local20 = arg1 + arg3 - SoftwareRaster.clipRight; arg3 -= local20; local11 += local20; local9 += local20; @@ -94,10 +94,10 @@ public final class SoftwareFont extends Font { if (arg3 <= 0 || arg4 <= 0) { return; } - if (Static129.anIntArray295 == null) { - Static285.method1137(Static129.pixels, this.aByteArrayArray7[arg0], arg5, local13, local5, arg3, arg4, local9, local11); + if (SoftwareRaster.anIntArray295 == null) { + Static285.method1137(SoftwareRaster.pixels, this.aByteArrayArray7[arg0], arg5, local13, local5, arg3, arg4, local9, local11); } else { - Static285.method1138(Static129.pixels, this.aByteArrayArray7[arg0], arg1, arg2, arg3, arg4, arg5, local13, local5, local9, local11, Static129.anIntArray295, Static129.anIntArray296); + Static285.method1138(SoftwareRaster.pixels, this.aByteArrayArray7[arg0], arg1, arg2, arg3, arg4, arg5, local13, local5, local9, local11, SoftwareRaster.anIntArray295, SoftwareRaster.anIntArray296); } } } diff --git a/client/src/main/java/SoftwareIndexedSprite.java b/client/src/main/java/SoftwareIndexedSprite.java index 9373968..d27b248 100644 --- a/client/src/main/java/SoftwareIndexedSprite.java +++ b/client/src/main/java/SoftwareIndexedSprite.java @@ -88,31 +88,31 @@ public final class SoftwareIndexedSprite extends IndexedSprite { if (local5 < local15) { arg3 = ((local5 << 16) + local27 - local9 - 1) / local27; } - local41 = arg0 + arg1 * Static129.width; - @Pc(125) int local125 = Static129.width - arg2; - if (arg1 + arg3 > Static129.clipBottom) { - arg3 -= arg1 + arg3 - Static129.clipBottom; + local41 = arg0 + arg1 * SoftwareRaster.width; + @Pc(125) int local125 = SoftwareRaster.width - arg2; + if (arg1 + arg3 > SoftwareRaster.clipBottom) { + arg3 -= arg1 + arg3 - SoftwareRaster.clipBottom; } @Pc(145) int local145; - if (arg1 < Static129.clipTop) { - local145 = Static129.clipTop - arg1; + if (arg1 < SoftwareRaster.clipTop) { + local145 = SoftwareRaster.clipTop - arg1; arg3 -= local145; - local41 += local145 * Static129.width; + local41 += local145 * SoftwareRaster.width; local9 += local27 * local145; } - if (arg0 + arg2 > Static129.clipRight) { - local145 = arg0 + arg2 - Static129.clipRight; + if (arg0 + arg2 > SoftwareRaster.clipRight) { + local145 = arg0 + arg2 - SoftwareRaster.clipRight; arg2 -= local145; local125 += local145; } - if (arg0 < Static129.clipLeft) { - local145 = Static129.clipLeft - arg0; + if (arg0 < SoftwareRaster.clipLeft) { + local145 = SoftwareRaster.clipLeft - arg0; arg2 -= local145; local41 += local145; local7 += local21 * local145; local125 += local145; } - Static286.method1394(Static129.pixels, this.aByteArray18, this.anIntArray144, local7, local9, local41, local125, arg2, arg3, local21, local27, local2, arg4); + Static286.method1394(SoftwareRaster.pixels, this.aByteArray18, this.anIntArray144, local7, local9, local41, local125, arg2, arg3, local21, local27, local2, arg4); } @OriginalMember(owner = "client!ek", name = "a", descriptor = "()V") @@ -162,45 +162,45 @@ public final class SoftwareIndexedSprite extends IndexedSprite { public final void method3335(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { arg0 += this.anInt4280; arg1 += this.anInt4273; - @Pc(15) int local15 = arg0 + arg1 * Static129.width; + @Pc(15) int local15 = arg0 + arg1 * SoftwareRaster.width; @Pc(17) int local17 = 0; @Pc(20) int local20 = this.height; @Pc(23) int local23 = this.width; - @Pc(27) int local27 = Static129.width - local23; + @Pc(27) int local27 = SoftwareRaster.width - local23; @Pc(29) int local29 = 0; @Pc(36) int local36; - if (arg1 < Static129.clipTop) { - local36 = Static129.clipTop - arg1; + if (arg1 < SoftwareRaster.clipTop) { + local36 = SoftwareRaster.clipTop - arg1; local20 -= local36; - arg1 = Static129.clipTop; + arg1 = SoftwareRaster.clipTop; local17 = local36 * local23; - local15 += local36 * Static129.width; + local15 += local36 * SoftwareRaster.width; } - if (arg1 + local20 > Static129.clipBottom) { - local20 -= arg1 + local20 - Static129.clipBottom; + if (arg1 + local20 > SoftwareRaster.clipBottom) { + local20 -= arg1 + local20 - SoftwareRaster.clipBottom; } - if (arg0 < Static129.clipLeft) { - local36 = Static129.clipLeft - arg0; + if (arg0 < SoftwareRaster.clipLeft) { + local36 = SoftwareRaster.clipLeft - arg0; local23 -= local36; - arg0 = Static129.clipLeft; + arg0 = SoftwareRaster.clipLeft; local17 += local36; local15 += local36; local29 = local36; local27 += local36; } - if (arg0 + local23 > Static129.clipRight) { - local36 = arg0 + local23 - Static129.clipRight; + if (arg0 + local23 > SoftwareRaster.clipRight) { + local36 = arg0 + local23 - SoftwareRaster.clipRight; local23 -= local36; local29 += local36; local27 += local36; } if (local23 > 0 && local20 > 0) { - Static286.method1397(Static129.pixels, this.aByteArray18, this.anIntArray144, local17, local15, local23, local20, local27, local29, arg2); + Static286.method1397(SoftwareRaster.pixels, this.aByteArray18, this.anIntArray144, local17, local15, local23, local20, local27, local29, arg2); } } @OriginalMember(owner = "client!ek", name = "c", descriptor = "()V") - public final void method1396() { + public final void trim() { if (this.width == this.innerWidth && this.height == this.innerHeight) { return; } @@ -245,31 +245,31 @@ public final class SoftwareIndexedSprite extends IndexedSprite { if (local5 < local15) { arg3 = ((local5 << 16) + local27 - local9 - 1) / local27; } - local41 = arg0 + arg1 * Static129.width; - @Pc(125) int local125 = Static129.width - arg2; - if (arg1 + arg3 > Static129.clipBottom) { - arg3 -= arg1 + arg3 - Static129.clipBottom; + local41 = arg0 + arg1 * SoftwareRaster.width; + @Pc(125) int local125 = SoftwareRaster.width - arg2; + if (arg1 + arg3 > SoftwareRaster.clipBottom) { + arg3 -= arg1 + arg3 - SoftwareRaster.clipBottom; } @Pc(145) int local145; - if (arg1 < Static129.clipTop) { - local145 = Static129.clipTop - arg1; + if (arg1 < SoftwareRaster.clipTop) { + local145 = SoftwareRaster.clipTop - arg1; arg3 -= local145; - local41 += local145 * Static129.width; + local41 += local145 * SoftwareRaster.width; local9 += local27 * local145; } - if (arg0 + arg2 > Static129.clipRight) { - local145 = arg0 + arg2 - Static129.clipRight; + if (arg0 + arg2 > SoftwareRaster.clipRight) { + local145 = arg0 + arg2 - SoftwareRaster.clipRight; arg2 -= local145; local125 += local145; } - if (arg0 < Static129.clipLeft) { - local145 = Static129.clipLeft - arg0; + if (arg0 < SoftwareRaster.clipLeft) { + local145 = SoftwareRaster.clipLeft - arg0; arg2 -= local145; local41 += local145; local7 += local21 * local145; local125 += local145; } - Static286.method1391(Static129.pixels, this.aByteArray18, this.anIntArray144, local7, local9, local41, local125, arg2, arg3, local21, local27, local2); + Static286.method1391(SoftwareRaster.pixels, this.aByteArray18, this.anIntArray144, local7, local9, local41, local125, arg2, arg3, local21, local27, local2); } @OriginalMember(owner = "client!ek", name = "a", descriptor = "(II)V") @@ -277,40 +277,40 @@ public final class SoftwareIndexedSprite extends IndexedSprite { public final void renderTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { arg0 += this.anInt4280; arg1 += this.anInt4273; - @Pc(15) int local15 = arg0 + arg1 * Static129.width; + @Pc(15) int local15 = arg0 + arg1 * SoftwareRaster.width; @Pc(17) int local17 = 0; @Pc(20) int local20 = this.height; @Pc(23) int local23 = this.width; - @Pc(27) int local27 = Static129.width - local23; + @Pc(27) int local27 = SoftwareRaster.width - local23; @Pc(29) int local29 = 0; @Pc(36) int local36; - if (arg1 < Static129.clipTop) { - local36 = Static129.clipTop - arg1; + if (arg1 < SoftwareRaster.clipTop) { + local36 = SoftwareRaster.clipTop - arg1; local20 -= local36; - arg1 = Static129.clipTop; + arg1 = SoftwareRaster.clipTop; local17 = local36 * local23; - local15 += local36 * Static129.width; + local15 += local36 * SoftwareRaster.width; } - if (arg1 + local20 > Static129.clipBottom) { - local20 -= arg1 + local20 - Static129.clipBottom; + if (arg1 + local20 > SoftwareRaster.clipBottom) { + local20 -= arg1 + local20 - SoftwareRaster.clipBottom; } - if (arg0 < Static129.clipLeft) { - local36 = Static129.clipLeft - arg0; + if (arg0 < SoftwareRaster.clipLeft) { + local36 = SoftwareRaster.clipLeft - arg0; local23 -= local36; - arg0 = Static129.clipLeft; + arg0 = SoftwareRaster.clipLeft; local17 += local36; local15 += local36; local29 = local36; local27 += local36; } - if (arg0 + local23 > Static129.clipRight) { - local36 = arg0 + local23 - Static129.clipRight; + if (arg0 + local23 > SoftwareRaster.clipRight) { + local36 = arg0 + local23 - SoftwareRaster.clipRight; local23 -= local36; local29 += local36; local27 += local36; } if (local23 > 0 && local20 > 0) { - Static286.method1393(Static129.pixels, this.aByteArray18, this.anIntArray144, local17, local15, local23, local20, local27, local29); + Static286.method1393(SoftwareRaster.pixels, this.aByteArray18, this.anIntArray144, local17, local15, local23, local20, local27, local29); } } } diff --git a/client/src/main/java/Static129.java b/client/src/main/java/SoftwareRaster.java similarity index 93% rename from client/src/main/java/Static129.java rename to client/src/main/java/SoftwareRaster.java index 675ec7f..2ff14d7 100644 --- a/client/src/main/java/Static129.java +++ b/client/src/main/java/SoftwareRaster.java @@ -2,13 +2,13 @@ import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; -public final class Static129 { +public final class SoftwareRaster { @OriginalMember(owner = "client!kb", name = "a", descriptor = "I") public static int width; @OriginalMember(owner = "client!kb", name = "c", descriptor = "I") - public static int anInt3146; + public static int height; @OriginalMember(owner = "client!kb", name = "f", descriptor = "[I") public static int[] anIntArray295; @@ -38,11 +38,11 @@ public final class Static129 { } @OriginalMember(owner = "client!kb", name = "a", descriptor = "(IIIII)V") - public static void method2483(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { - method2489(arg0, arg1, arg2, arg4); - method2489(arg0, arg1 + arg3 - 1, arg2, arg4); - method2490(arg0, arg1, arg3, arg4); - method2490(arg0 + arg2 - 1, arg1, arg3, arg4); + public static void drawRect(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { + drawHorizontalLine(arg0, arg1, arg2, arg4); + drawHorizontalLine(arg0, arg1 + arg3 - 1, arg2, arg4); + drawVerticalLine(arg0, arg1, arg3, arg4); + drawVerticalLine(arg0 + arg2 - 1, arg1, arg3, arg4); } @OriginalMember(owner = "client!kb", name = "a", descriptor = "(IIIIII)V") @@ -111,7 +111,7 @@ public final class Static129 { } @OriginalMember(owner = "client!kb", name = "a", descriptor = "(IIII)V") - public static void method2489(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { + public static void drawHorizontalLine(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { if (arg1 < clipTop || arg1 >= clipBottom) { return; } @@ -129,7 +129,7 @@ public final class Static129 { } @OriginalMember(owner = "client!kb", name = "b", descriptor = "(IIII)V") - public static void method2490(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { + public static void drawVerticalLine(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { if (arg0 < clipLeft || arg0 >= clipRight) { return; } @@ -150,14 +150,14 @@ public final class Static129 { public static void method2491(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { pixels = arg0; width = arg1; - anInt3146 = arg2; + height = arg2; method2496(0, 0, arg1, arg2); } @OriginalMember(owner = "client!kb", name = "b", descriptor = "()V") public static void clear() { @Pc(1) int local1 = 0; - @Pc(7) int local7 = width * anInt3146 - 7; + @Pc(7) int local7 = width * height - 7; while (local1 < local7) { pixels[local1++] = 0; pixels[local1++] = 0; @@ -241,7 +241,7 @@ public final class Static129 { } @OriginalMember(owner = "client!kb", name = "c", descriptor = "(IIIII)V") - public static void method2495(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { + public static void fillRect(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { if (arg0 < clipLeft) { arg2 -= clipLeft - arg0; arg0 = clipLeft; @@ -277,8 +277,8 @@ public final class Static129 { if (arg2 > width) { arg2 = width; } - if (arg3 > anInt3146) { - arg3 = anInt3146; + if (arg3 > height) { + arg3 = height; } clipLeft = arg0; clipTop = arg1; @@ -345,9 +345,9 @@ public final class Static129 { arg3 -= arg1; if (arg3 == 0) { if (arg2 >= 0) { - method2489(arg0, arg1, arg2 + 1, arg4); + drawHorizontalLine(arg0, arg1, arg2 + 1, arg4); } else { - method2489(arg0 + arg2, arg1, 1 - arg2, arg4); + drawHorizontalLine(arg0 + arg2, arg1, 1 - arg2, arg4); } } else if (arg2 != 0) { if (arg2 + arg3 < 0) { @@ -402,9 +402,9 @@ public final class Static129 { } } } else if (arg3 >= 0) { - method2490(arg0, arg1, arg3 + 1, arg4); + drawVerticalLine(arg0, arg1, arg3 + 1, arg4); } else { - method2490(arg0, arg1 + arg3, -arg3 + 1, arg4); + drawVerticalLine(arg0, arg1 + arg3, -arg3 + 1, arg4); } } @@ -587,7 +587,7 @@ public final class Static129 { clipLeft = 0; clipTop = 0; clipRight = width; - clipBottom = anInt3146; + clipBottom = height; method2482(); } diff --git a/client/src/main/java/SoftwareSprite.java b/client/src/main/java/SoftwareSprite.java index f7eabbc..73c4c37 100644 --- a/client/src/main/java/SoftwareSprite.java +++ b/client/src/main/java/SoftwareSprite.java @@ -82,40 +82,40 @@ public class SoftwareSprite extends Sprite { public void method1415(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { arg0 += this.anInt1863; arg1 += this.anInt1861; - @Pc(15) int local15 = arg0 + arg1 * Static129.width; + @Pc(15) int local15 = arg0 + arg1 * SoftwareRaster.width; @Pc(17) int local17 = 0; @Pc(20) int local20 = this.anInt1859; @Pc(23) int local23 = this.anInt1867; - @Pc(27) int local27 = Static129.width - local23; + @Pc(27) int local27 = SoftwareRaster.width - local23; @Pc(29) int local29 = 0; @Pc(36) int local36; - if (arg1 < Static129.clipTop) { - local36 = Static129.clipTop - arg1; + if (arg1 < SoftwareRaster.clipTop) { + local36 = SoftwareRaster.clipTop - arg1; local20 -= local36; - arg1 = Static129.clipTop; + arg1 = SoftwareRaster.clipTop; local17 = local36 * local23; - local15 += local36 * Static129.width; + local15 += local36 * SoftwareRaster.width; } - if (arg1 + local20 > Static129.clipBottom) { - local20 -= arg1 + local20 - Static129.clipBottom; + if (arg1 + local20 > SoftwareRaster.clipBottom) { + local20 -= arg1 + local20 - SoftwareRaster.clipBottom; } - if (arg0 < Static129.clipLeft) { - local36 = Static129.clipLeft - arg0; + if (arg0 < SoftwareRaster.clipLeft) { + local36 = SoftwareRaster.clipLeft - arg0; local23 -= local36; - arg0 = Static129.clipLeft; + arg0 = SoftwareRaster.clipLeft; local17 += local36; local15 += local36; local29 = local36; local27 += local36; } - if (arg0 + local23 > Static129.clipRight) { - local36 = arg0 + local23 - Static129.clipRight; + if (arg0 + local23 > SoftwareRaster.clipRight) { + local36 = arg0 + local23 - SoftwareRaster.clipRight; local23 -= local36; local29 += local36; local27 += local36; } if (local23 > 0 && local20 > 0) { - Static290.method305(Static129.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29); + Static290.method305(SoftwareRaster.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29); } } @@ -206,17 +206,17 @@ public class SoftwareSprite extends Sprite { local166 = local166 + 15 >> 4; local196 >>= 0x4; local198 = local198 + 15 >> 4; - if (local164 < Static129.clipLeft) { - local164 = Static129.clipLeft; + if (local164 < SoftwareRaster.clipLeft) { + local164 = SoftwareRaster.clipLeft; } - if (local166 > Static129.clipRight) { - local166 = Static129.clipRight; + if (local166 > SoftwareRaster.clipRight) { + local166 = SoftwareRaster.clipRight; } - if (local196 < Static129.clipTop) { - local196 = Static129.clipTop; + if (local196 < SoftwareRaster.clipTop) { + local196 = SoftwareRaster.clipTop; } - if (local198 > Static129.clipBottom) { - local198 = Static129.clipBottom; + if (local198 > SoftwareRaster.clipBottom) { + local198 = SoftwareRaster.clipBottom; } local166 = local164 - local166; if (local166 >= 0) { @@ -226,7 +226,7 @@ public class SoftwareSprite extends Sprite { if (local198 >= 0) { return; } - @Pc(319) int local319 = local196 * Static129.width + local164; + @Pc(319) int local319 = local196 * SoftwareRaster.width + local164; @Pc(324) double local324 = 1.6777216E7D / (double) arg5; @Pc(333) int local333 = (int) Math.floor(Math.sin(local23) * local324 + 0.5D); @Pc(342) int local342 = (int) Math.floor(Math.cos(local23) * local324 + 0.5D); @@ -266,7 +266,7 @@ public class SoftwareSprite extends Sprite { if (local432 == 0) { local388++; } else { - Static129.pixels[local388++] = local432; + SoftwareRaster.pixels[local388++] = local432; } local694 += local342; local394++; @@ -274,7 +274,7 @@ public class SoftwareSprite extends Sprite { } local384++; local378 += local342; - local319 += Static129.width; + local319 += SoftwareRaster.width; } } else if (local333 < 0) { local384 = local198; @@ -312,7 +312,7 @@ public class SoftwareSprite extends Sprite { if (local432 == 0) { local388++; } else { - Static129.pixels[local388++] = local432; + SoftwareRaster.pixels[local388++] = local432; } local694 += local342; local468 += local333; @@ -321,7 +321,7 @@ public class SoftwareSprite extends Sprite { local384++; local368 -= local333; local378 += local342; - local319 += Static129.width; + local319 += SoftwareRaster.width; } } else { local384 = local198; @@ -358,7 +358,7 @@ public class SoftwareSprite extends Sprite { if (local432 == 0) { local388++; } else { - Static129.pixels[local388++] = local432; + SoftwareRaster.pixels[local388++] = local432; } local694 += local342; local468 += local333; @@ -367,7 +367,7 @@ public class SoftwareSprite extends Sprite { local384++; local368 -= local333; local378 += local342; - local319 += Static129.width; + local319 += SoftwareRaster.width; } } } else if (local333 == 0) { @@ -392,7 +392,7 @@ public class SoftwareSprite extends Sprite { if (local432 == 0) { local388++; } else { - Static129.pixels[local388++] = local432; + SoftwareRaster.pixels[local388++] = local432; } local694 += local342; local394++; @@ -400,7 +400,7 @@ public class SoftwareSprite extends Sprite { } local384++; local378 += local342; - local319 += Static129.width; + local319 += SoftwareRaster.width; } } else if (local333 < 0) { local384 = local198; @@ -437,7 +437,7 @@ public class SoftwareSprite extends Sprite { if (local432 == 0) { local388++; } else { - Static129.pixels[local388++] = local432; + SoftwareRaster.pixels[local388++] = local432; } local694 += local342; local468 += local333; @@ -446,7 +446,7 @@ public class SoftwareSprite extends Sprite { local384++; local368 -= local333; local378 += local342; - local319 += Static129.width; + local319 += SoftwareRaster.width; } } else { local384 = local198; @@ -482,7 +482,7 @@ public class SoftwareSprite extends Sprite { if (local432 == 0) { local388++; } else { - Static129.pixels[local388++] = local432; + SoftwareRaster.pixels[local388++] = local432; } local694 += local342; local468 += local333; @@ -491,7 +491,7 @@ public class SoftwareSprite extends Sprite { local384++; local368 -= local333; local378 += local342; - local319 += Static129.width; + local319 += SoftwareRaster.width; } } } else if (local333 == 0) { @@ -505,13 +505,13 @@ public class SoftwareSprite extends Sprite { if (local432 == 0) { local388++; } else { - Static129.pixels[local388++] = local432; + SoftwareRaster.pixels[local388++] = local432; } local394++; } } local384++; - local319 += Static129.width; + local319 += SoftwareRaster.width; } } else if (local333 < 0) { local384 = local198; @@ -536,7 +536,7 @@ public class SoftwareSprite extends Sprite { if (local432 == 0) { local388++; } else { - Static129.pixels[local388++] = local432; + SoftwareRaster.pixels[local388++] = local432; } local468 += local333; local394++; @@ -544,7 +544,7 @@ public class SoftwareSprite extends Sprite { } local384++; local368 -= local333; - local319 += Static129.width; + local319 += SoftwareRaster.width; } } else { local384 = local198; @@ -568,7 +568,7 @@ public class SoftwareSprite extends Sprite { if (local432 == 0) { local388++; } else { - Static129.pixels[local388++] = local432; + SoftwareRaster.pixels[local388++] = local432; } local468 += local333; local394++; @@ -576,7 +576,7 @@ public class SoftwareSprite extends Sprite { } local384++; local368 -= local333; - local319 += Static129.width; + local319 += SoftwareRaster.width; } } } @@ -607,7 +607,7 @@ public class SoftwareSprite extends Sprite { @OriginalMember(owner = "client!mm", name = "c", descriptor = "()V") public final void method304() { - Static129.method2491(this.anIntArray20, this.anInt1867, this.anInt1859); + SoftwareRaster.method2491(this.anIntArray20, this.anInt1867, this.anInt1859); } @OriginalMember(owner = "client!mm", name = "a", descriptor = "(IIIIIIDI)V") @@ -619,7 +619,7 @@ public class SoftwareSprite extends Sprite { @Pc(33) int local33 = local21 * 256 >> 8; @Pc(45) int local45 = local27 * -10 + local33 * -10 + 983040; @Pc(57) int local57 = local33 * -10 + 983040 - local27 * -10; - @Pc(63) int local63 = arg0 + arg1 * Static129.width; + @Pc(63) int local63 = arg0 + arg1 * SoftwareRaster.width; for (@Pc(65) int local65 = 0; local65 < 20; local65++) { @Pc(70) int local70 = local63; @Pc(72) int local72 = local45; @@ -629,14 +629,14 @@ public class SoftwareSprite extends Sprite { if (local93 == 0) { local70++; } else { - Static129.pixels[local70++] = local93; + SoftwareRaster.pixels[local70++] = local93; } local72 += local33; local74 -= local27; } local45 += local27; local57 += local33; - local63 += Static129.width; + local63 += SoftwareRaster.width; } } catch (@Pc(128) Exception local128) { } @@ -647,40 +647,40 @@ public class SoftwareSprite extends Sprite { public void method1421(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { arg0 += this.anInt1860 - this.anInt1867 - this.anInt1863; arg1 += this.anInt1861; - @Pc(21) int local21 = arg0 + arg1 * Static129.width; + @Pc(21) int local21 = arg0 + arg1 * SoftwareRaster.width; @Pc(26) int local26 = this.anInt1867 - 1; @Pc(29) int local29 = this.anInt1859; @Pc(32) int local32 = this.anInt1867; - @Pc(36) int local36 = Static129.width - local32; + @Pc(36) int local36 = SoftwareRaster.width - local32; @Pc(40) int local40 = local32 + local32; @Pc(47) int local47; - if (arg1 < Static129.clipTop) { - local47 = Static129.clipTop - arg1; + if (arg1 < SoftwareRaster.clipTop) { + local47 = SoftwareRaster.clipTop - arg1; local29 -= local47; - arg1 = Static129.clipTop; + arg1 = SoftwareRaster.clipTop; local26 += local47 * local32; - local21 += local47 * Static129.width; + local21 += local47 * SoftwareRaster.width; } - if (arg1 + local29 > Static129.clipBottom) { - local29 -= arg1 + local29 - Static129.clipBottom; + if (arg1 + local29 > SoftwareRaster.clipBottom) { + local29 -= arg1 + local29 - SoftwareRaster.clipBottom; } - if (arg0 < Static129.clipLeft) { - local47 = Static129.clipLeft - arg0; + if (arg0 < SoftwareRaster.clipLeft) { + local47 = SoftwareRaster.clipLeft - arg0; local32 -= local47; - arg0 = Static129.clipLeft; + arg0 = SoftwareRaster.clipLeft; local26 -= local47; local21 += local47; local40 -= local47; local36 += local47; } - if (arg0 + local32 > Static129.clipRight) { - local47 = arg0 + local32 - Static129.clipRight; + if (arg0 + local32 > SoftwareRaster.clipRight) { + local47 = arg0 + local32 - SoftwareRaster.clipRight; local32 -= local47; local40 -= local47; local36 += local47; } if (local32 > 0 && local29 > 0) { - Static290.method302(Static129.pixels, this.anIntArray20, local26, local21, local32, local29, local36, local40); + Static290.method302(SoftwareRaster.pixels, this.anIntArray20, local26, local21, local32, local29, local36, local40); } } @@ -689,40 +689,40 @@ public class SoftwareSprite extends Sprite { public void method1417(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { arg0 += this.anInt1863; arg1 += this.anInt1861; - @Pc(15) int local15 = arg0 + arg1 * Static129.width; + @Pc(15) int local15 = arg0 + arg1 * SoftwareRaster.width; @Pc(17) int local17 = 0; @Pc(20) int local20 = this.anInt1859; @Pc(23) int local23 = this.anInt1867; - @Pc(27) int local27 = Static129.width - local23; + @Pc(27) int local27 = SoftwareRaster.width - local23; @Pc(29) int local29 = 0; @Pc(36) int local36; - if (arg1 < Static129.clipTop) { - local36 = Static129.clipTop - arg1; + if (arg1 < SoftwareRaster.clipTop) { + local36 = SoftwareRaster.clipTop - arg1; local20 -= local36; - arg1 = Static129.clipTop; + arg1 = SoftwareRaster.clipTop; local17 = local36 * local23; - local15 += local36 * Static129.width; + local15 += local36 * SoftwareRaster.width; } - if (arg1 + local20 > Static129.clipBottom) { - local20 -= arg1 + local20 - Static129.clipBottom; + if (arg1 + local20 > SoftwareRaster.clipBottom) { + local20 -= arg1 + local20 - SoftwareRaster.clipBottom; } - if (arg0 < Static129.clipLeft) { - local36 = Static129.clipLeft - arg0; + if (arg0 < SoftwareRaster.clipLeft) { + local36 = SoftwareRaster.clipLeft - arg0; local23 -= local36; - arg0 = Static129.clipLeft; + arg0 = SoftwareRaster.clipLeft; local17 += local36; local15 += local36; local29 = local36; local27 += local36; } - if (arg0 + local23 > Static129.clipRight) { - local36 = arg0 + local23 - Static129.clipRight; + if (arg0 + local23 > SoftwareRaster.clipRight) { + local36 = arg0 + local23 - SoftwareRaster.clipRight; local23 -= local36; local29 += local36; local27 += local36; } if (local23 > 0 && local20 > 0) { - Static290.method308(Static129.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29, arg2); + Static290.method308(SoftwareRaster.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29, arg2); } } @@ -731,40 +731,40 @@ public class SoftwareSprite extends Sprite { public void method1423(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { arg0 += this.anInt1863; arg1 += this.anInt1861; - @Pc(15) int local15 = arg0 + arg1 * Static129.width; + @Pc(15) int local15 = arg0 + arg1 * SoftwareRaster.width; @Pc(17) int local17 = 0; @Pc(20) int local20 = this.anInt1859; @Pc(23) int local23 = this.anInt1867; - @Pc(27) int local27 = Static129.width - local23; + @Pc(27) int local27 = SoftwareRaster.width - local23; @Pc(29) int local29 = 0; @Pc(36) int local36; - if (arg1 < Static129.clipTop) { - local36 = Static129.clipTop - arg1; + if (arg1 < SoftwareRaster.clipTop) { + local36 = SoftwareRaster.clipTop - arg1; local20 -= local36; - arg1 = Static129.clipTop; + arg1 = SoftwareRaster.clipTop; local17 = local36 * local23; - local15 += local36 * Static129.width; + local15 += local36 * SoftwareRaster.width; } - if (arg1 + local20 > Static129.clipBottom) { - local20 -= arg1 + local20 - Static129.clipBottom; + if (arg1 + local20 > SoftwareRaster.clipBottom) { + local20 -= arg1 + local20 - SoftwareRaster.clipBottom; } - if (arg0 < Static129.clipLeft) { - local36 = Static129.clipLeft - arg0; + if (arg0 < SoftwareRaster.clipLeft) { + local36 = SoftwareRaster.clipLeft - arg0; local23 -= local36; - arg0 = Static129.clipLeft; + arg0 = SoftwareRaster.clipLeft; local17 += local36; local15 += local36; local29 = local36; local27 += local36; } - if (arg0 + local23 > Static129.clipRight) { - local36 = arg0 + local23 - Static129.clipRight; + if (arg0 + local23 > SoftwareRaster.clipRight) { + local36 = arg0 + local23 - SoftwareRaster.clipRight; local23 -= local36; local29 += local36; local27 += local36; } if (local23 > 0 && local20 > 0) { - Static290.method300(Static129.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29); + Static290.method300(SoftwareRaster.pixels, this.anIntArray20, local17, local15, local23, local20, local27, local29); } } @@ -792,27 +792,27 @@ public class SoftwareSprite extends Sprite { @Pc(39) int local39 = local27 * arg7 >> 8; @Pc(51) int local51 = (arg4 << 16) + local9 * local33 + local4 * local39; @Pc(63) int local63 = (arg5 << 16) + (local9 * local39 - local4 * local33); - @Pc(69) int local69 = arg0 + arg1 * Static129.width; + @Pc(69) int local69 = arg0 + arg1 * SoftwareRaster.width; for (@Pc(71) int local71 = 0; local71 < arg3; local71++) { @Pc(78) int local78 = arg8[local71]; @Pc(82) int local82 = local69 + local78; @Pc(88) int local88 = local51 + local39 * local78; @Pc(94) int local94 = local63 - local33 * local78; for (@Pc(99) int local99 = -arg9[local71]; local99 < 0; local99++) { - Static129.pixels[local82++] = this.anIntArray20[(local88 >> 16) + (local94 >> 16) * this.anInt1867]; + SoftwareRaster.pixels[local82++] = this.anIntArray20[(local88 >> 16) + (local94 >> 16) * this.anInt1867]; local88 += local39; local94 -= local33; } local51 += local33; local63 += local39; - local69 += Static129.width; + local69 += SoftwareRaster.width; } } catch (@Pc(144) Exception local144) { } } @OriginalMember(owner = "client!mm", name = "e", descriptor = "()V") - public final void method311() { + public final void trim() { if (this.anInt1867 == this.anInt1860 && this.anInt1859 == this.anInt1866) { return; } @@ -831,7 +831,7 @@ public class SoftwareSprite extends Sprite { @OriginalMember(owner = "client!mm", name = "a", descriptor = "(II[I[I)V") public final void method312(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int[] arg2, @OriginalArg(3) int[] arg3) { - if (Static129.clipBottom - Static129.clipTop != arg2.length) { + if (SoftwareRaster.clipBottom - SoftwareRaster.clipTop != arg2.length) { throw new IllegalStateException(); } arg0 += this.anInt1863; @@ -839,31 +839,31 @@ public class SoftwareSprite extends Sprite { @Pc(21) int local21 = 0; @Pc(24) int local24 = this.anInt1859; @Pc(27) int local27 = this.anInt1867; - @Pc(31) int local31 = Static129.width - local27; + @Pc(31) int local31 = SoftwareRaster.width - local27; @Pc(33) int local33 = 0; - @Pc(39) int local39 = arg0 + arg1 * Static129.width; + @Pc(39) int local39 = arg0 + arg1 * SoftwareRaster.width; @Pc(46) int local46; - if (arg1 < Static129.clipTop) { - local46 = Static129.clipTop - arg1; + if (arg1 < SoftwareRaster.clipTop) { + local46 = SoftwareRaster.clipTop - arg1; local24 -= local46; - arg1 = Static129.clipTop; + arg1 = SoftwareRaster.clipTop; local21 = local46 * local27; - local39 += local46 * Static129.width; + local39 += local46 * SoftwareRaster.width; } - if (arg1 + local24 > Static129.clipBottom) { - local24 -= arg1 + local24 - Static129.clipBottom; + if (arg1 + local24 > SoftwareRaster.clipBottom) { + local24 -= arg1 + local24 - SoftwareRaster.clipBottom; } - if (arg0 < Static129.clipLeft) { - local46 = Static129.clipLeft - arg0; + if (arg0 < SoftwareRaster.clipLeft) { + local46 = SoftwareRaster.clipLeft - arg0; local27 -= local46; - arg0 = Static129.clipLeft; + arg0 = SoftwareRaster.clipLeft; local21 += local46; local39 += local46; local33 = local46; local31 += local46; } - if (arg0 + local27 > Static129.clipRight) { - local46 = arg0 + local27 - Static129.clipRight; + if (arg0 + local27 > SoftwareRaster.clipRight) { + local46 = arg0 + local27 - SoftwareRaster.clipRight; local27 -= local46; local33 += local46; local31 += local46; @@ -871,8 +871,8 @@ public class SoftwareSprite extends Sprite { if (local27 <= 0 || local24 <= 0) { return; } - local46 = arg0 - Static129.clipLeft; - @Pc(142) int local142 = arg1 - Static129.clipTop; + local46 = arg0 - SoftwareRaster.clipLeft; + @Pc(142) int local142 = arg1 - SoftwareRaster.clipTop; for (@Pc(144) int local144 = local142; local144 < local142 + local24; local144++) { @Pc(153) int local153 = arg2[local144]; @Pc(157) int local157 = arg3[local144]; @@ -908,7 +908,7 @@ public class SoftwareSprite extends Sprite { if (local242 == 0) { local39++; } else { - Static129.pixels[local39++] = local242; + SoftwareRaster.pixels[local39++] = local242; } } local21 += local166 + local33; @@ -927,7 +927,7 @@ public class SoftwareSprite extends Sprite { @Pc(39) int local39 = local27 * 256 >> 8; @Pc(51) int local51 = (arg4 << 16) + local9 * local33 + local4 * local39; @Pc(63) int local63 = (arg5 << 16) + (local9 * local39 - local4 * local33); - @Pc(69) int local69 = arg0 + arg1 * Static129.width; + @Pc(69) int local69 = arg0 + arg1 * SoftwareRaster.width; for (@Pc(71) int local71 = 0; local71 < arg3; local71++) { @Pc(78) int local78 = arg7[local71]; @Pc(82) int local82 = local69 + local78; @@ -938,14 +938,14 @@ public class SoftwareSprite extends Sprite { if (local115 == 0) { local82++; } else { - Static129.pixels[local82++] = local115; + SoftwareRaster.pixels[local82++] = local115; } local88 += local39; local94 -= local33; } local51 += local33; local63 += local39; - local69 += Static129.width; + local69 += SoftwareRaster.width; } } catch (@Pc(150) Exception local150) { } @@ -994,31 +994,31 @@ public class SoftwareSprite extends Sprite { if (local10 < local20) { arg3 = ((local10 << 16) + local32 - local14 - 1) / local32; } - local46 = arg0 + arg1 * Static129.width; - @Pc(130) int local130 = Static129.width - arg2; - if (arg1 + arg3 > Static129.clipBottom) { - arg3 -= arg1 + arg3 - Static129.clipBottom; + local46 = arg0 + arg1 * SoftwareRaster.width; + @Pc(130) int local130 = SoftwareRaster.width - arg2; + if (arg1 + arg3 > SoftwareRaster.clipBottom) { + arg3 -= arg1 + arg3 - SoftwareRaster.clipBottom; } @Pc(150) int local150; - if (arg1 < Static129.clipTop) { - local150 = Static129.clipTop - arg1; + if (arg1 < SoftwareRaster.clipTop) { + local150 = SoftwareRaster.clipTop - arg1; arg3 -= local150; - local46 += local150 * Static129.width; + local46 += local150 * SoftwareRaster.width; local14 += local32 * local150; } - if (arg0 + arg2 > Static129.clipRight) { - local150 = arg0 + arg2 - Static129.clipRight; + if (arg0 + arg2 > SoftwareRaster.clipRight) { + local150 = arg0 + arg2 - SoftwareRaster.clipRight; arg2 -= local150; local130 += local150; } - if (arg0 < Static129.clipLeft) { - local150 = Static129.clipLeft - arg0; + if (arg0 < SoftwareRaster.clipLeft) { + local150 = SoftwareRaster.clipLeft - arg0; arg2 -= local150; local46 += local150; local12 += local26 * local150; local130 += local150; } - Static290.method307(Static129.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7, arg4); + Static290.method307(SoftwareRaster.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7, arg4); } @OriginalMember(owner = "client!mm", name = "b", descriptor = "(III)V") @@ -1083,30 +1083,30 @@ public class SoftwareSprite extends Sprite { if (local10 < local20) { arg3 = ((local10 << 16) + local32 - local14 - 1) / local32; } - local46 = arg0 + arg1 * Static129.width; - @Pc(130) int local130 = Static129.width - arg2; - if (arg1 + arg3 > Static129.clipBottom) { - arg3 -= arg1 + arg3 - Static129.clipBottom; + local46 = arg0 + arg1 * SoftwareRaster.width; + @Pc(130) int local130 = SoftwareRaster.width - arg2; + if (arg1 + arg3 > SoftwareRaster.clipBottom) { + arg3 -= arg1 + arg3 - SoftwareRaster.clipBottom; } @Pc(150) int local150; - if (arg1 < Static129.clipTop) { - local150 = Static129.clipTop - arg1; + if (arg1 < SoftwareRaster.clipTop) { + local150 = SoftwareRaster.clipTop - arg1; arg3 -= local150; - local46 += local150 * Static129.width; + local46 += local150 * SoftwareRaster.width; local14 += local32 * local150; } - if (arg0 + arg2 > Static129.clipRight) { - local150 = arg0 + arg2 - Static129.clipRight; + if (arg0 + arg2 > SoftwareRaster.clipRight) { + local150 = arg0 + arg2 - SoftwareRaster.clipRight; arg2 -= local150; local130 += local150; } - if (arg0 < Static129.clipLeft) { - local150 = Static129.clipLeft - arg0; + if (arg0 < SoftwareRaster.clipLeft) { + local150 = SoftwareRaster.clipLeft - arg0; arg2 -= local150; local46 += local150; local12 += local26 * local150; local130 += local150; } - Static290.method316(Static129.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7); + Static290.method316(SoftwareRaster.pixels, this.anIntArray20, local12, local14, local46, local130, arg2, arg3, local26, local32, local7); } } diff --git a/client/src/main/java/Song.java b/client/src/main/java/Song.java index 10c10d9..90b1233 100644 --- a/client/src/main/java/Song.java +++ b/client/src/main/java/Song.java @@ -297,7 +297,13 @@ public final class Song extends Node { } } - @OriginalMember(owner = "client!rf", name = "a", descriptor = "()V") + @OriginalMember(owner = "client!rf", name = "a", descriptor = "(Lclient!ve;II)Lclient!rf;") + public static Song create(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { + @Pc(5) byte[] local5 = arg0.getFile(arg1, arg2); + return local5 == null ? null : new Song(new Buffer(local5)); + } + + @OriginalMember(owner = "client!rf", name = "a", descriptor = "()V") public final void method3740() { this.aClass133_22 = null; } diff --git a/client/src/main/java/SoundBank.java b/client/src/main/java/SoundBank.java index c9666bc..c3452e8 100644 --- a/client/src/main/java/SoundBank.java +++ b/client/src/main/java/SoundBank.java @@ -33,7 +33,7 @@ public final class SoundBank { if (local37 != null) { return local37; } else if (arg0 == null || arg0[0] > 0) { - @Pc(59) SynthSound local59 = Static292.method3988(this.aClass153_52, arg1, arg2); + @Pc(59) SynthSound local59 = SynthSound.create(this.aClass153_52, arg1, arg2); if (local59 == null) { return null; } diff --git a/client/src/main/java/SoundPlayer.java b/client/src/main/java/SoundPlayer.java new file mode 100644 index 0000000..735d1a3 --- /dev/null +++ b/client/src/main/java/SoundPlayer.java @@ -0,0 +1,37 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class SoundPlayer { + @OriginalMember(owner = "client!ma", name = "a", descriptor = "(ILclient!tk;IIZI)V") + public static void playSeqSound(@OriginalArg(0) int arg0, @OriginalArg(1) SeqType arg1, @OriginalArg(3) int arg2, @OriginalArg(4) boolean arg3, @OriginalArg(5) int arg4) { + if (Static189.anInt4451 >= 50 || (arg1.anIntArrayArray38 == null || arg4 >= arg1.anIntArrayArray38.length || arg1.anIntArrayArray38[arg4] == null)) { + return; + } + @Pc(36) int local36 = arg1.anIntArrayArray38[arg4][0]; + @Pc(40) int local40 = local36 >> 8; + @Pc(57) int local57; + if (arg1.anIntArrayArray38[arg4].length > 1) { + local57 = (int) ((double) arg1.anIntArrayArray38[arg4].length * Math.random()); + if (local57 > 0) { + local40 = arg1.anIntArrayArray38[arg4][local57]; + } + } + @Pc(73) int local73 = local36 >> 5 & 0x7; + @Pc(77) int local77 = local36 & 0x1F; + if (local77 == 0) { + if (arg3) { + Static26.method744(local73, local40, 0); + } + } else if (Preferences.ambientSoundsVolume != 0) { + Static200.anIntArray421[Static189.anInt4451] = local40; + Static276.anIntArray563[Static189.anInt4451] = local73; + @Pc(111) int local111 = (arg0 - 64) / 128; + local57 = (arg2 - 64) / 128; + Static164.anIntArray362[Static189.anInt4451] = 0; + Static173.aClass138Array1[Static189.anInt4451] = null; + Static26.anIntArray68[Static189.anInt4451] = local77 + (local57 << 16) + (local111 << 8); + Static189.anInt4451++; + } + } +} diff --git a/client/src/main/java/SpecularMaterialRenderer.java b/client/src/main/java/SpecularMaterialRenderer.java index 2be48c8..46222c6 100644 --- a/client/src/main/java/SpecularMaterialRenderer.java +++ b/client/src/main/java/SpecularMaterialRenderer.java @@ -126,7 +126,7 @@ public final class SpecularMaterialRenderer implements MaterialRenderer { @Override public final void method4602() { @Pc(1) GL2 local1 = GlRenderer.gl; - if (Static178.highDetailLighting) { + if (Preferences.highDetailLighting) { local1.glCallList(this.anInt5777 + 1); } else { local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_ALPHA, GL2.GL_TEXTURE); @@ -144,7 +144,7 @@ public final class SpecularMaterialRenderer implements MaterialRenderer { public final void method4603() { @Pc(1) GL2 local1 = GlRenderer.gl; GlRenderer.setTextureCombineAlphaMode(1); - if (Static178.highDetailLighting) { + if (Preferences.highDetailLighting) { local1.glCallList(this.anInt5777); } else { local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_ALPHA, GL2.GL_PRIMARY_COLOR); @@ -155,7 +155,7 @@ public final class SpecularMaterialRenderer implements MaterialRenderer { @Override public final void method4604(@OriginalArg(0) int arg0) { @Pc(1) GL2 local1 = GlRenderer.gl; - if (Static178.highDetailLighting && this.anIntArray519 != null) { + if (Preferences.highDetailLighting && this.anIntArray519 != null) { local1.glActiveTexture(GL2.GL_TEXTURE1); local1.glBindTexture(GL2.GL_TEXTURE_CUBE_MAP, this.anIntArray519[arg0 - 1]); local1.glActiveTexture(GL2.GL_TEXTURE0); diff --git a/client/src/main/java/SpriteLoader.java b/client/src/main/java/SpriteLoader.java new file mode 100644 index 0000000..82eb481 --- /dev/null +++ b/client/src/main/java/SpriteLoader.java @@ -0,0 +1,313 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class SpriteLoader { + @OriginalMember(owner = "client!uj", name = "x", descriptor = "[I") + public static int[] innerWidths; + @OriginalMember(owner = "client!wa", name = "z", descriptor = "[I") + public static int[] yOffsets; + @OriginalMember(owner = "client!ca", name = "Y", descriptor = "[I") + public static int[] innerHeights; + @OriginalMember(owner = "client!ah", name = "l", descriptor = "[[B") + public static byte[][] pixels; + @OriginalMember(owner = "client!wf", name = "b", descriptor = "[I") + public static int[] xOffsets; + @OriginalMember(owner = "client!vc", name = "R", descriptor = "[I") + public static int[] palette; + @OriginalMember(owner = "client!nb", name = "h", descriptor = "I") + public static int frames; + @OriginalMember(owner = "client!fb", name = "n", descriptor = "[[B") + public static byte[][] alpha; + @OriginalMember(owner = "client!mi", name = "W", descriptor = "[Z") + public static boolean[] hasAlpha; + @OriginalMember(owner = "client!jk", name = "x", descriptor = "I") + public static int width; + @OriginalMember(owner = "client!sg", name = "h", descriptor = "I") + public static int height; + + @OriginalMember(owner = "client!cg", name = "a", descriptor = "(ZILclient!ve;I)[Lclient!ek;") + static SoftwareIndexedSprite[] loadSoftwareIndexedSprites(@OriginalArg(1) int arg0, @OriginalArg(2) Js5 arg1) { + return decode(arg1, 0, arg0) ? createSoftwareIndexedSprites() : null; + } + + @OriginalMember(owner = "client!ta", name = "a", descriptor = "(Lclient!ve;III)Z") + public static boolean decode(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { + @Pc(9) byte[] local9 = arg0.getFile(arg2, arg1); + if (local9 == null) { + return false; + } else { + decode(local9); + return true; + } + } + + @OriginalMember(owner = "client!jg", name = "a", descriptor = "(I)[Lclient!ek;") + public static SoftwareIndexedSprite[] createSoftwareIndexedSprites() { + @Pc(2) SoftwareIndexedSprite[] sprites = new SoftwareIndexedSprite[frames]; + for (@Pc(8) int local8 = 0; local8 < frames; local8++) { + sprites[local8] = new SoftwareIndexedSprite(width, height, xOffsets[local8], yOffsets[local8], innerWidths[local8], innerHeights[local8], pixels[local8], palette); + } + clear(); + return sprites; + } + + @OriginalMember(owner = "client!gk", name = "a", descriptor = "([BI)V") + public static void decode(@OriginalArg(0) byte[] arg0) { + @Pc(4) Buffer buffer = new Buffer(arg0); + buffer.offset = arg0.length - 2; + frames = buffer.g2(); + innerHeights = new int[frames]; + innerWidths = new int[frames]; + xOffsets = new int[frames]; + hasAlpha = new boolean[frames]; + alpha = new byte[frames][]; + yOffsets = new int[frames]; + pixels = new byte[frames][]; + buffer.offset = arg0.length - frames * 8 - 7; + width = buffer.g2(); + height = buffer.g2(); + @Pc(66) int paletteSize = (buffer.g1() & 0xFF) + 1; + @Pc(68) int i; + for (i = 0; i < frames; i++) { + xOffsets[i] = buffer.g2(); + } + for (i = 0; i < frames; i++) { + yOffsets[i] = buffer.g2(); + } + for (i = 0; i < frames; i++) { + innerWidths[i] = buffer.g2(); + } + for (i = 0; i < frames; i++) { + innerHeights[i] = buffer.g2(); + } + buffer.offset = arg0.length + 3 - frames * 8 - paletteSize * 3 - 7; + palette = new int[paletteSize]; + for (i = 1; i < paletteSize; i++) { + palette[i] = buffer.g3(); + if (palette[i] == 0) { + palette[i] = 1; + } + } + buffer.offset = 0; + for (i = 0; i < frames; i++) { + @Pc(195) int local195 = innerWidths[i]; + @Pc(199) int local199 = innerHeights[i]; + @Pc(203) int local203 = local195 * local199; + @Pc(206) byte[] local206 = new byte[local203]; + @Pc(208) boolean local208 = false; + pixels[i] = local206; + @Pc(215) byte[] local215 = new byte[local203]; + alpha[i] = local215; + @Pc(223) int local223 = buffer.g1(); + @Pc(232) int local232; + if ((local223 & 0x1) == 0) { + for (local232 = 0; local232 < local203; local232++) { + local206[local232] = buffer.g1s(); + } + if ((local223 & 0x2) != 0) { + for (local232 = 0; local232 < local203; local232++) { + @Pc(343) byte local343 = local215[local232] = buffer.g1s(); + local208 |= local343 != -1; + } + } + } else { + local232 = 0; + label88: while (true) { + @Pc(241) int local241; + if (local232 >= local195) { + if ((local223 & 0x2) == 0) { + break; + } + local232 = 0; + while (true) { + if (local232 >= local195) { + break label88; + } + for (local241 = 0; local241 < local199; local241++) { + @Pc(291) byte local291 = local215[local195 * local241 + local232] = buffer.g1s(); + local208 |= local291 != -1; + } + local232++; + } + } + for (local241 = 0; local241 < local199; local241++) { + local206[local232 + local241 * local195] = buffer.g1s(); + } + local232++; + } + } + hasAlpha[i] = local208; + } + } + + @OriginalMember(owner = "client!g", name = "a", descriptor = "(B)V") + public static void clear() { + innerWidths = null; + yOffsets = null; + innerHeights = null; + pixels = null; + xOffsets = null; + palette = null; + } + + @OriginalMember(owner = "client!ra", name = "a", descriptor = "(IBILclient!ve;)[Lclient!qf;") + public static Sprite[] loadAlphaSprites(@OriginalArg(2) int arg0, @OriginalArg(3) Js5 arg1) { + return decode(arg1, 0, arg0) ? method3730() : null; + } + + @OriginalMember(owner = "client!vj", name = "a", descriptor = "(IIILclient!ve;)[Lclient!mm;") + public static SoftwareSprite[] loadSoftwareSprites(@OriginalArg(2) int arg0, @OriginalArg(3) Js5 arg1) { + return decode(arg1, 0, arg0) ? method474() : null; + } + + @OriginalMember(owner = "client!gd", name = "a", descriptor = "(ILclient!ve;II)Lclient!mm;") + public static SoftwareSprite loadSoftwareSprite(@OriginalArg(0) int arg0, @OriginalArg(1) Js5 arg1, @OriginalArg(3) int arg2) { + return decode(arg1, arg0, arg2) ? method3537() : null; + } + + @OriginalMember(owner = "client!lg", name = "a", descriptor = "(Lclient!ve;BII)[Lclient!ok;") + public static IndexedSprite[] loadIndexedSprites(@OriginalArg(0) Js5 arg0, @OriginalArg(3) int arg1) { + return decode(arg0, 0, arg1) ? method4331() : null; + } + + @OriginalMember(owner = "client!kd", name = "a", descriptor = "(IIILclient!ve;)[Lclient!qf;") + public static Sprite[] method2580(@OriginalArg(2) int arg0, @OriginalArg(3) Js5 arg1) { + return decode(arg1, 0, arg0) ? method870() : null; + } + + @OriginalMember(owner = "client!lk", name = "a", descriptor = "(IIBLclient!ve;)Lclient!qf;") + public static Sprite loadSprites(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1) { + return decode(arg1, 0, arg0) ? method1764() : null; + } + + @OriginalMember(owner = "client!re", name = "b", descriptor = "(I)[Lclient!qf;") + public static Sprite[] method3730() { + @Pc(14) Sprite[] local14 = new Sprite[frames]; + for (@Pc(16) int local16 = 0; local16 < frames; local16++) { + @Pc(23) byte[] local23 = pixels[local16]; + @Pc(31) int local31 = innerHeights[local16] * innerWidths[local16]; + if (hasAlpha[local16]) { + @Pc(38) int[] local38 = new int[local31]; + @Pc(42) byte[] local42 = alpha[local16]; + for (@Pc(44) int local44 = 0; local44 < local31; local44++) { + local38[local44] = palette[local23[local44] & 0xFF] | (local42[local44] & 0xFF) << 24; + } + if (GlRenderer.enabled) { + local14[local16] = new GlAlphaSprite(width, height, xOffsets[local16], yOffsets[local16], innerWidths[local16], innerHeights[local16], local38); + } else { + local14[local16] = new SoftwareAlphaSprite(width, height, xOffsets[local16], yOffsets[local16], innerWidths[local16], innerHeights[local16], local38); + } + } else { + @Pc(119) int[] local119 = new int[local31]; + for (@Pc(121) int local121 = 0; local121 < local31; local121++) { + local119[local121] = palette[local23[local121] & 0xFF]; + } + if (GlRenderer.enabled) { + local14[local16] = new GlSprite(width, height, xOffsets[local16], yOffsets[local16], innerWidths[local16], innerHeights[local16], local119); + } else { + local14[local16] = new SoftwareSprite(width, height, xOffsets[local16], yOffsets[local16], innerWidths[local16], innerHeights[local16], local119); + } + } + } + clear(); + return local14; + } + + @OriginalMember(owner = "client!bd", name = "a", descriptor = "(Z)[Lclient!mm;") + public static SoftwareSprite[] method474() { + @Pc(4) SoftwareSprite[] local4 = new SoftwareSprite[frames]; + for (@Pc(12) int local12 = 0; local12 < frames; local12++) { + @Pc(27) int local27 = innerHeights[local12] * innerWidths[local12]; + @Pc(31) byte[] local31 = pixels[local12]; + @Pc(34) int[] local34 = new int[local27]; + for (@Pc(36) int local36 = 0; local36 < local27; local36++) { + local34[local36] = palette[local31[local36] & 0xFF]; + } + local4[local12] = new SoftwareSprite(width, height, xOffsets[local12], yOffsets[local12], innerWidths[local12], innerHeights[local12], local34); + } + clear(); + return local4; + } + + @OriginalMember(owner = "client!pl", name = "a", descriptor = "(I)Lclient!mm;") + public static SoftwareSprite method3537() { + @Pc(13) int local13 = innerWidths[0] * innerHeights[0]; + @Pc(17) byte[] local17 = pixels[0]; + @Pc(20) int[] local20 = new int[local13]; + for (@Pc(22) int local22 = 0; local22 < local13; local22++) { + local20[local22] = palette[local17[local22] & 0xFF]; + } + @Pc(57) SoftwareSprite local57 = new SoftwareSprite(width, height, xOffsets[0], yOffsets[0], innerWidths[0], innerHeights[0], local20); + clear(); + return local57; + } + + @OriginalMember(owner = "client!ui", name = "h", descriptor = "(I)[Lclient!ok;") + public static IndexedSprite[] method4331() { + @Pc(8) IndexedSprite[] local8 = new IndexedSprite[frames]; + for (@Pc(10) int local10 = 0; local10 < frames; local10++) { + if (GlRenderer.enabled) { + local8[local10] = new GlIndexedSprite(width, height, xOffsets[local10], yOffsets[local10], innerWidths[local10], innerHeights[local10], pixels[local10], palette); + } else { + local8[local10] = new SoftwareIndexedSprite(width, height, xOffsets[local10], yOffsets[local10], innerWidths[local10], innerHeights[local10], pixels[local10], palette); + } + } + clear(); + return local8; + } + + @OriginalMember(owner = "client!cj", name = "a", descriptor = "(I)[Lclient!qf;") + public static Sprite[] method870() { + @Pc(6) Sprite[] local6 = new Sprite[frames]; + for (@Pc(15) int local15 = 0; local15 < frames; local15++) { + @Pc(30) int local30 = innerWidths[local15] * innerHeights[local15]; + @Pc(34) byte[] local34 = pixels[local15]; + @Pc(37) int[] local37 = new int[local30]; + for (@Pc(39) int local39 = 0; local39 < local30; local39++) { + local37[local39] = palette[local34[local39] & 0xFF]; + } + if (GlRenderer.enabled) { + local6[local15] = new GlSprite(width, height, xOffsets[local15], yOffsets[local15], innerWidths[local15], innerHeights[local15], local37); + } else { + local6[local15] = new SoftwareSprite(width, height, xOffsets[local15], yOffsets[local15], innerWidths[local15], innerHeights[local15], local37); + } + } + clear(); + return local6; + } + + @OriginalMember(owner = "client!gi", name = "b", descriptor = "(I)Lclient!qf;") + public static Sprite method1764() { + @Pc(9) byte[] local9 = pixels[0]; + @Pc(17) int local17 = innerWidths[0] * innerHeights[0]; + @Pc(20) int[] local20 = new int[local17]; + for (@Pc(28) int local28 = 0; local28 < local17; local28++) { + local20[local28] = palette[local9[local28] & 0xFF]; + } + @Pc(69) Sprite local69; + if (GlRenderer.enabled) { + local69 = new GlSprite(width, height, xOffsets[0], yOffsets[0], innerWidths[0], innerHeights[0], local20); + } else { + local69 = new SoftwareSprite(width, height, xOffsets[0], yOffsets[0], innerWidths[0], innerHeights[0], local20); + } + clear(); + return local69; + } + + @OriginalMember(owner = "client!uj", name = "a", descriptor = "(BLclient!ve;I)Z") + public static boolean decode(@OriginalArg(1) Js5 arg0, @OriginalArg(2) int arg1) { + @Pc(13) byte[] local13 = arg0.method4500(arg1); + if (local13 == null) { + return false; + } else { + decode(local13); + return true; + } + } + + @OriginalMember(owner = "client!ml", name = "a", descriptor = "(BILclient!ve;)[Lclient!ek;") + public static SoftwareIndexedSprite[] method3088(@OriginalArg(1) int arg0, @OriginalArg(2) Js5 arg1) { + return decode(arg1, arg0) ? createSoftwareIndexedSprites() : null; + } +} diff --git a/client/src/main/java/Sprites.java b/client/src/main/java/Sprites.java new file mode 100644 index 0000000..1d408f0 --- /dev/null +++ b/client/src/main/java/Sprites.java @@ -0,0 +1,273 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class Sprites { + @OriginalMember(owner = "client!bh", name = "s", descriptor = "Lclient!na;") + public static final JagString P11_FULL = Static28.parse("p11_full"); + + @OriginalMember(owner = "client!ee", name = "e", descriptor = "Lclient!na;") + public static final JagString P12_FULL = Static28.parse("p12_full"); + + @OriginalMember(owner = "client!fm", name = "eb", descriptor = "Lclient!na;") + public static final JagString B12_FULL = Static28.parse("b12_full"); + + @OriginalMember(owner = "client!bg", name = "N", descriptor = "Lclient!na;") + public static final JagString MAPFUNCTION = Static28.parse("mapfunction"); + + @OriginalMember(owner = "client!rl", name = "S", descriptor = "Lclient!na;") + public static final JagString HITMARKS = Static28.parse("hitmarks"); + + @OriginalMember(owner = "client!vd", name = "v", descriptor = "Lclient!na;") + public static final JagString HITBAR_DEFAULT = Static28.parse("hitbar_default"); + + @OriginalMember(owner = "client!jj", name = "d", descriptor = "Lclient!na;") + public static final JagString HEADICONS_PK = Static28.parse("headicons_pk"); + + @OriginalMember(owner = "client!sh", name = "j", descriptor = "Lclient!na;") + public static final JagString HEADICONS_PRAYER = Static28.parse("headicons_prayer"); + + @OriginalMember(owner = "client!hj", name = "d", descriptor = "Lclient!na;") + public static final JagString HINT_HEADICONS = Static28.parse("hint_headicons"); + + @OriginalMember(owner = "client!pe", name = "n", descriptor = "Lclient!na;") + public static final JagString HINT_MAPMARKERS = Static28.parse("hint_mapmarkers"); + + @OriginalMember(owner = "client!vc", name = "ab", descriptor = "Lclient!na;") + public static final JagString MAPFLAG = Static28.parse("mapflag"); + + @OriginalMember(owner = "client!gm", name = "db", descriptor = "Lclient!na;") + public static final JagString CROSS = Static28.parse("cross"); + + @OriginalMember(owner = "client!pe", name = "z", descriptor = "Lclient!na;") + public static final JagString MAPDOTS = Static28.parse("mapdots"); + + @OriginalMember(owner = "client!uf", name = "o", descriptor = "Lclient!na;") + public static final JagString SCROLLBAR = Static28.parse("scrollbar"); + + @OriginalMember(owner = "client!cb", name = "eb", descriptor = "Lclient!na;") + public static final JagString NAME_ICONS = Static28.parse("name_icons"); + + @OriginalMember(owner = "client!bh", name = "v", descriptor = "Lclient!na;") + public static final JagString FLOORSHADOWS = Static28.parse("floorshadows"); + + @OriginalMember(owner = "client!wl", name = "d", descriptor = "Lclient!na;") + public static final JagString COMPASS = Static28.parse("compass"); + + @OriginalMember(owner = "client!af", name = "g", descriptor = "Lclient!na;") + public static final JagString HINT_MAPEDGE = Static28.parse("hint_mapedge"); + + @OriginalMember(owner = "client!nc", name = "h", descriptor = "I") + public static int p11FullId; + + @OriginalMember(owner = "client!kc", name = "t", descriptor = "I") + public static int p12FullId; + + @OriginalMember(owner = "client!fm", name = "V", descriptor = "I") + public static int b12FullId; + + @OriginalMember(owner = "client!wl", name = "A", descriptor = "I") + public static int mapfunctionId; + + @OriginalMember(owner = "client!kd", name = "Cb", descriptor = "I") + public static int hitmarksId; + + @OriginalMember(owner = "client!client", name = "W", descriptor = "I") + public static int hitbarId; + + @OriginalMember(owner = "client!rg", name = "C", descriptor = "I") + public static int headiconsPkId; + + @OriginalMember(owner = "client!ck", name = "F", descriptor = "I") + public static int headiconsPrayerId; + + @OriginalMember(owner = "client!qg", name = "R", descriptor = "I") + public static int hintHeadId; + + @OriginalMember(owner = "client!lj", name = "s", descriptor = "I") + public static int hintMapMarkId; + + @OriginalMember(owner = "client!bi", name = "fb", descriptor = "I") + public static int mapflagId; + + @OriginalMember(owner = "client!ci", name = "t", descriptor = "I") + public static int crossId; + + @OriginalMember(owner = "client!gd", name = "l", descriptor = "I") + public static int mapdotsId; + + @OriginalMember(owner = "client!jk", name = "J", descriptor = "I") + public static int scrollbarId; + + @OriginalMember(owner = "client!sd", name = "I", descriptor = "I") + public static int nameIconsId; + + @OriginalMember(owner = "client!gk", name = "j", descriptor = "I") + public static int floorShadowsId; + + @OriginalMember(owner = "client!n", name = "b", descriptor = "I") + public static int compassId; + + @OriginalMember(owner = "client!ka", name = "u", descriptor = "I") + public static int hintMapEdgeId; + @OriginalMember(owner = "client!tj", name = "d", descriptor = "[Lclient!ek;") + public static SoftwareIndexedSprite[] floorShadows; + @OriginalMember(owner = "client!nk", name = "L", descriptor = "[Lclient!mm;") + public static SoftwareSprite[] mapfunctions; + @OriginalMember(owner = "client!re", name = "w", descriptor = "[Lclient!qf;") + public static Sprite[] hitmarks; + @OriginalMember(owner = "client!jb", name = "k", descriptor = "[Lclient!qf;") + public static Sprite[] hitbars; + @OriginalMember(owner = "client!rl", name = "V", descriptor = "[Lclient!qf;") + public static Sprite[] headiconPks; + @OriginalMember(owner = "client!km", name = "sc", descriptor = "[Lclient!qf;") + public static Sprite[] headiconPrayers; + @OriginalMember(owner = "client!wh", name = "l", descriptor = "[Lclient!qf;") + public static Sprite[] headhints; + @OriginalMember(owner = "client!lj", name = "t", descriptor = "[Lclient!qf;") + public static Sprite[] mapmarkhints; + @OriginalMember(owner = "client!tg", name = "d", descriptor = "[Lclient!qf;") + public static Sprite[] crosses; + @OriginalMember(owner = "client!gk", name = "l", descriptor = "Lclient!qf;") + public static Sprite mapflags; + @OriginalMember(owner = "client!l", name = "j", descriptor = "[Lclient!qf;") + public static Sprite[] mapdots; + @OriginalMember(owner = "client!mi", name = "T", descriptor = "[Lclient!ok;") + public static IndexedSprite[] nameIcons; + @OriginalMember(owner = "client!th", name = "f", descriptor = "[Lclient!ok;") + public static IndexedSprite[] scrollbars; + + @OriginalMember(owner = "client!g", name = "a", descriptor = "(ILclient!ve;)V") + public static void init(@OriginalArg(1) Js5 archive) { + p11FullId = archive.getGroupId(P11_FULL); + p12FullId = archive.getGroupId(P12_FULL); + b12FullId = archive.getGroupId(B12_FULL); + mapfunctionId = archive.getGroupId(MAPFUNCTION); + hitmarksId = archive.getGroupId(HITMARKS); + hitbarId = archive.getGroupId(HITBAR_DEFAULT); + headiconsPkId = archive.getGroupId(HEADICONS_PK); + headiconsPrayerId = archive.getGroupId(HEADICONS_PRAYER); + hintHeadId = archive.getGroupId(HINT_HEADICONS); + hintMapMarkId = archive.getGroupId(HINT_MAPMARKERS); + mapflagId = archive.getGroupId(MAPFLAG); + crossId = archive.getGroupId(CROSS); + mapdotsId = archive.getGroupId(MAPDOTS); + scrollbarId = archive.getGroupId(SCROLLBAR); + nameIconsId = archive.getGroupId(NAME_ICONS); + floorShadowsId = archive.getGroupId(FLOORSHADOWS); + compassId = archive.getGroupId(COMPASS); + hintMapEdgeId = archive.getGroupId(HINT_MAPEDGE); + } + + @OriginalMember(owner = "client!cd", name = "a", descriptor = "(Lclient!ve;B)I") + public static int getReady(@OriginalArg(0) Js5 archive) { + @Pc(5) int ready = 0; + if (archive.isFileReady(mapfunctionId)) { + ready++; + } + if (archive.isFileReady(hitmarksId)) { + ready++; + } + if (archive.isFileReady(hitbarId)) { + ready++; + } + if (archive.isFileReady(headiconsPkId)) { + ready++; + } + if (archive.isFileReady(headiconsPrayerId)) { + ready++; + } + if (archive.isFileReady(hintHeadId)) { + ready++; + } + if (archive.isFileReady(hintMapMarkId)) { + ready++; + } + if (archive.isFileReady(mapflagId)) { + ready++; + } + if (archive.isFileReady(crossId)) { + ready++; + } + if (archive.isFileReady(mapdotsId)) { + ready++; + } + if (archive.isFileReady(scrollbarId)) { + ready++; + } + if (archive.isFileReady(nameIconsId)) { + ready++; + } + if (archive.isFileReady(floorShadowsId)) { + ready++; + } + if (archive.isFileReady(compassId)) { + ready++; + } + if (archive.isFileReady(hintMapEdgeId)) { + ready++; + } + return ready; + } + + @OriginalMember(owner = "client!cg", name = "a", descriptor = "(ILclient!ve;)V") + public static void load(@OriginalArg(1) Js5 arg0) { + mapfunctions = SpriteLoader.loadSoftwareSprites(mapfunctionId, arg0); + hitmarks = SpriteLoader.loadAlphaSprites(hitmarksId, arg0); + hitbars = SpriteLoader.loadAlphaSprites(hitbarId, arg0); + headiconPks = SpriteLoader.loadAlphaSprites(headiconsPkId, arg0); + headiconPrayers = SpriteLoader.loadAlphaSprites(headiconsPrayerId, arg0); + headhints = SpriteLoader.loadAlphaSprites(hintHeadId, arg0); + mapmarkhints = SpriteLoader.loadAlphaSprites(hintMapMarkId, arg0); + mapflags = SpriteLoader.loadSprites(mapflagId, arg0); + crosses = SpriteLoader.method2580(crossId, arg0); + mapdots = SpriteLoader.method2580(mapdotsId, arg0); + scrollbars = SpriteLoader.loadIndexedSprites(arg0, scrollbarId); + nameIcons = SpriteLoader.loadIndexedSprites(arg0, nameIconsId); + Fonts.p11Full.setNameIcons(nameIcons, null); + Fonts.p12Full.setNameIcons(nameIcons, null); + Fonts.b12Full.setNameIcons(nameIcons, null); + if (GlRenderer.enabled) { + floorShadows = SpriteLoader.loadSoftwareIndexedSprites(floorShadowsId, arg0); + for (@Pc(101) int local101 = 0; local101 < floorShadows.length; local101++) { + floorShadows[local101].trim(); + } + } + @Pc(124) SoftwareSprite compass = SpriteLoader.loadSoftwareSprite(0, arg0, compassId); + compass.trim(); + if (GlRenderer.enabled) { + Static106.compass = new GlSprite(compass); + } else { + Static106.compass = compass; + } + @Pc(143) SoftwareSprite[] local143 = SpriteLoader.loadSoftwareSprites(hintMapEdgeId, arg0); + @Pc(145) int local145; + for (local145 = 0; local145 < local143.length; local145++) { + local143[local145].trim(); + } + if (GlRenderer.enabled) { + Static277.hintMapEdge = new Sprite[local143.length]; + for (local145 = 0; local145 < local143.length; local145++) { + Static277.hintMapEdge[local145] = new GlSprite(local143[local145]); + } + } else { + Static277.hintMapEdge = local143; + } + @Pc(196) int local196 = (int) ((double) 21 * Math.random()) - 10; + local145 = (int) (Math.random() * 21.0D) - 10; + @Pc(210) int local210 = (int) (Math.random() * 21.0D) - 10; + @Pc(217) int local217 = (int) (Math.random() * 41.0D) - 20; + @Pc(219) int local219; + for (local219 = 0; local219 < mapfunctions.length; local219++) { + mapfunctions[local219].method315(local145 + local217, local217 + local196, local217 + local210); + } + if (GlRenderer.enabled) { + Static67.mapfuncs = new Sprite[mapfunctions.length]; + for (local219 = 0; local219 < mapfunctions.length; local219++) { + Static67.mapfuncs[local219] = new GlSprite(mapfunctions[local219]); + } + } else { + Static67.mapfuncs = mapfunctions; + } + } +} diff --git a/client/src/main/java/Static1.java b/client/src/main/java/Static1.java index 65d20e2..5a6a608 100644 --- a/client/src/main/java/Static1.java +++ b/client/src/main/java/Static1.java @@ -539,42 +539,42 @@ public final class Static1 { Static46.method1187(arg0, arg3, arg2 + arg0, arg1 + arg3); Static46.method1186(arg0, arg3, arg2, arg1, 0); } else { - Static129.method2496(arg0, arg3, arg2 + arg0, arg3 + arg1); - Static129.method2495(arg0, arg3, arg2, arg1, 0); + SoftwareRaster.method2496(arg0, arg3, arg2 + arg0, arg3 + arg1); + SoftwareRaster.fillRect(arg0, arg3, arg2, arg1, 0); } - if (Static41.anInt1309 < 100) { + if (WorldMap.loadPercentage < 100) { return; } if (Static70.aClass3_Sub2_Sub1_2 == null || arg2 != Static70.aClass3_Sub2_Sub1_2.anInt1867 || Static70.aClass3_Sub2_Sub1_2.anInt1859 != arg1) { @Pc(63) SoftwareSprite local63 = new SoftwareSprite(arg2, arg1); - Static129.method2491(local63.anIntArray20, arg2, arg1); - Static214.method4364(arg2, 0, Static48.anInt1449, 0, 0, Static181.anInt4296, arg1, 0); + SoftwareRaster.method2491(local63.anIntArray20, arg2, arg1); + Static214.method4364(arg2, 0, WorldMap.width, 0, 0, WorldMap.length, arg1, 0); if (GlRenderer.enabled) { Static70.aClass3_Sub2_Sub1_2 = new GlSprite(local63); } else { Static70.aClass3_Sub2_Sub1_2 = local63; } if (GlRenderer.enabled) { - Static129.pixels = null; + SoftwareRaster.pixels = null; } else { - Static260.frameBuffer.makeTarget(); + client.frameBuffer.makeTarget(); } } Static70.aClass3_Sub2_Sub1_2.method1415(arg0, arg3); - @Pc(147) int local147 = arg1 * Static109.anInt2884 / Static181.anInt4296 + arg3; - @Pc(153) int local153 = Static37.anInt1176 * arg1 / Static181.anInt4296; - @Pc(161) int local161 = arg0 + arg2 * Static109.anInt2882 / Static48.anInt1449; - @Pc(167) int local167 = arg2 * Static89.anInt2387 / Static48.anInt1449; + @Pc(147) int local147 = arg1 * Static109.anInt2884 / WorldMap.length + arg3; + @Pc(153) int local153 = Static37.anInt1176 * arg1 / WorldMap.length; + @Pc(161) int local161 = arg0 + arg2 * Static109.anInt2882 / WorldMap.width; + @Pc(167) int local167 = arg2 * Static89.anInt2387 / WorldMap.width; @Pc(169) int local169 = 16711680; - if (Static266.game == 1) { + if (client.game == 1) { local169 = 16777215; } if (GlRenderer.enabled) { Static46.method1182(local161, local147, local167, local153, local169, 128); Static46.method1179(local161, local147, local167, local153, local169); } else { - Static129.method2484(local161, local147, local167, local153, local169, 128); - Static129.method2483(local161, local147, local167, local153, local169); + SoftwareRaster.method2484(local161, local147, local167, local153, local169, 128); + SoftwareRaster.drawRect(local161, local147, local167, local153, local169); } if (Static201.anInt1864 <= 0) { return; @@ -585,14 +585,14 @@ public final class Static1 { } else { local225 = Static91.anInt2428 * 25; } - for (@Pc(238) Class3_Sub26 local238 = (Class3_Sub26) Static145.aClass69_84.method2289(); local238 != null; local238 = (Class3_Sub26) Static145.aClass69_84.method2288()) { - if (local238.anInt4308 == Static9.anInt172) { - @Pc(258) int local258 = arg3 + local238.anInt4314 * arg1 / Static181.anInt4296; - @Pc(267) int local267 = arg2 * local238.anInt4307 / Static48.anInt1449 + arg0; + for (@Pc(238) MapElement local238 = (MapElement) WorldMap.mapElements.method2289(); local238 != null; local238 = (MapElement) WorldMap.mapElements.method2288()) { + if (local238.id == Static9.anInt172) { + @Pc(258) int local258 = arg3 + local238.anInt4314 * arg1 / WorldMap.length; + @Pc(267) int local267 = arg2 * local238.anInt4307 / WorldMap.width + arg0; if (GlRenderer.enabled) { Static46.method1182(local267 - 2, local258 + -2, 4, 4, 16776960, local225); } else { - Static129.method2484(local267 - 2, local258 + -2, 4, 4, 16776960, local225); + SoftwareRaster.method2484(local267 - 2, local258 + -2, 4, 4, 16776960, local225); } } } diff --git a/client/src/main/java/Static10.java b/client/src/main/java/Static10.java index c94e5cc..3f3c745 100644 --- a/client/src/main/java/Static10.java +++ b/client/src/main/java/Static10.java @@ -23,9 +23,9 @@ public final class Static10 { @OriginalMember(owner = "client!an", name = "a", descriptor = "(BI)I") public static int method347(@OriginalArg(1) int arg0) { - if (Static124.socket != null) { - Static124.socket.close(); - Static124.socket = null; + if (Protocol.socket != null) { + Protocol.socket.close(); + Protocol.socket = null; } Static127.anInt3132++; if (Static127.anInt3132 > 4) { @@ -76,11 +76,11 @@ public final class Static10 { Static175.method3279(); return true; } catch (@Pc(19) Exception local19) { - @Pc(61) String local61 = "T2 - " + Static164.anInt3985 + "," + Static5.anInt45 + "," + Static49.anInt1462 + " - " + Static223.anInt5028 + "," + (Static225.originX + Static173.self.movementQueueX[0]) + "," + (Static173.self.movementQueueZ[0] + Static142.originZ) + " - "; + @Pc(61) String local61 = "T2 - " + Static164.anInt3985 + "," + Static5.anInt45 + "," + Static49.anInt1462 + " - " + Static223.anInt5028 + "," + (Static225.originX + PlayerList.self.movementQueueX[0]) + "," + (PlayerList.self.movementQueueZ[0] + Static142.originZ) + " - "; for (@Pc(63) int local63 = 0; local63 < Static223.anInt5028 && local63 < 50; local63++) { local61 = local61 + Static57.aClass3_Sub15_Sub1_3.data[local63] + ","; } - Static89.report(local61, local19); + TracingException.report(local61, local19); Static278.processLogout(); return true; } diff --git a/client/src/main/java/Static102.java b/client/src/main/java/Static102.java index 4e4e7f2..c059434 100644 --- a/client/src/main/java/Static102.java +++ b/client/src/main/java/Static102.java @@ -11,32 +11,29 @@ public final class Static102 { @OriginalMember(owner = "client!hn", name = "W", descriptor = "Lclient!na;") public static JagString aClass100_545 = null; - @OriginalMember(owner = "client!hn", name = "X", descriptor = "I") - public static int windowMode = 0; - - @OriginalMember(owner = "client!hn", name = "Y", descriptor = "I") + @OriginalMember(owner = "client!hn", name = "Y", descriptor = "I") public static int anInt2680 = 0; @OriginalMember(owner = "client!hn", name = "d", descriptor = "(I)Lclient!mm;") public static SoftwareSprite method2071() { - @Pc(13) int local13 = Static26.anIntArray66[0] * Static254.anIntArray488[0]; - @Pc(17) byte[] local17 = Static7.aByteArrayArray5[0]; + @Pc(13) int local13 = SpriteLoader.innerHeights[0] * SpriteLoader.innerWidths[0]; + @Pc(17) byte[] local17 = SpriteLoader.pixels[0]; @Pc(78) SoftwareSprite local78; - if (Static159.aBooleanArray87[0]) { - @Pc(30) byte[] local30 = Static64.aByteArrayArray9[0]; + if (SpriteLoader.hasAlpha[0]) { + @Pc(30) byte[] local30 = SpriteLoader.alpha[0]; @Pc(33) int[] local33 = new int[local13]; for (@Pc(35) int local35 = 0; local35 < local13; local35++) { - local33[local35] = (local30[local35] & 0xFF) << 24 | Static259.anIntArray513[local17[local35] & 0xFF]; + local33[local35] = (local30[local35] & 0xFF) << 24 | SpriteLoader.palette[local17[local35] & 0xFF]; } - local78 = new SoftwareAlphaSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], local33); + local78 = new SoftwareAlphaSprite(SpriteLoader.width, SpriteLoader.height, SpriteLoader.xOffsets[0], SpriteLoader.yOffsets[0], SpriteLoader.innerWidths[0], SpriteLoader.innerHeights[0], local33); } else { @Pc(83) int[] local83 = new int[local13]; for (@Pc(85) int local85 = 0; local85 < local13; local85++) { - local83[local85] = Static259.anIntArray513[local17[local85] & 0xFF]; + local83[local85] = SpriteLoader.palette[local17[local85] & 0xFF]; } - local78 = new SoftwareSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], local83); + local78 = new SoftwareSprite(SpriteLoader.width, SpriteLoader.height, SpriteLoader.xOffsets[0], SpriteLoader.yOffsets[0], SpriteLoader.innerWidths[0], SpriteLoader.innerHeights[0], local83); } - Static75.method1631(); + SpriteLoader.clear(); return local78; } @@ -47,24 +44,24 @@ public final class Static102 { @OriginalMember(owner = "client!hn", name = "a", descriptor = "(Lclient!ve;ILclient!ve;)V") public static void load(@OriginalArg(0) Js5 arg0, @OriginalArg(2) Js5 arg1) { - Static114.aClass3_Sub2_Sub9_42 = Static127.method2462(Static166.anInt4049, arg1, arg0); + Fonts.p11Full = Static127.method2462(Sprites.p11FullId, arg1, arg0); if (GlRenderer.enabled) { - Static265.p11FullSoftware = Static122.method2412(Static166.anInt4049, arg0, arg1); + Static265.p11FullSoftware = Static122.method2412(Sprites.p11FullId, arg0, arg1); } else { - Static265.p11FullSoftware = (SoftwareFont) Static114.aClass3_Sub2_Sub9_42; + Static265.p11FullSoftware = (SoftwareFont) Fonts.p11Full; } - Static215.aClass3_Sub2_Sub9_32 = Static127.method2462(Static130.anInt3161, arg1, arg0); - Static280.aClass3_Sub2_Sub9_43 = Static127.method2462(Static73.anInt2077, arg1, arg0); + Fonts.p12Full = Static127.method2462(Sprites.p12FullId, arg1, arg0); + Fonts.b12Full = Static127.method2462(Sprites.b12FullId, arg1, arg0); } @OriginalMember(owner = "client!hn", name = "a", descriptor = "(IIIZIIIIIIII)Z") public static boolean method2075(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9, @OriginalArg(11) int arg10) { - if (Static173.self.getSize() == 2) { + if (PlayerList.self.getSize() == 2) { return Static2.method8(arg6, arg7, arg4, arg0, arg9, arg3, arg2, arg1, arg5, arg8, arg10); - } else if (Static173.self.getSize() <= 2) { + } else if (PlayerList.self.getSize() <= 2) { return Static45.method1171(arg5, arg4, arg10, arg9, arg8, arg2, arg1, arg3, arg7, arg0, arg6); } else { - return Static96.method1955(arg9, arg6, arg8, arg1, Static173.self.getSize(), arg5, arg7, arg4, arg10, arg2, arg3, arg0); + return Static96.method1955(arg9, arg6, arg8, arg1, PlayerList.self.getSize(), arg5, arg7, arg4, arg10, arg2, arg3, arg0); } } } diff --git a/client/src/main/java/Static103.java b/client/src/main/java/Static103.java index 05201e1..3b1f1ab 100644 --- a/client/src/main/java/Static103.java +++ b/client/src/main/java/Static103.java @@ -38,7 +38,7 @@ public final class Static103 { if (local23 == 31) { local43 = Static159.players[local36]; if (local43 != null) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static70.type = 2; Static17.milliseconds = 0; Static122.x = Static7.clickX; @@ -70,7 +70,7 @@ public final class Static103 { if (local23 == 19) { local192 = Static175.npcs[local36]; if (local192 != null) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static122.x = Static7.clickX; Static70.type = 2; Static17.milliseconds = 0; @@ -82,7 +82,7 @@ public final class Static103 { if (local23 == 17) { local192 = Static175.npcs[local36]; if (local192 != null) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static122.x = Static7.clickX; Static17.milliseconds = 0; Static70.type = 2; @@ -94,7 +94,7 @@ public final class Static103 { if (local23 == 44) { local43 = Static159.players[local36]; if (local43 != null) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static122.x = Static7.clickX; Static70.type = 2; Static25.y = Static60.clickY; @@ -125,7 +125,7 @@ public final class Static103 { if (local23 == 45) { local192 = Static175.npcs[local36]; if (local192 != null) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static122.x = Static7.clickX; Static70.type = 2; Static17.milliseconds = 0; @@ -138,12 +138,12 @@ public final class Static103 { } @Pc(560) boolean local560; if (local23 == 18) { - if (Static266.game == 1) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); + if (client.game == 1) { + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]); } else { - local560 = Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.self.movementQueueX[0]); + local560 = Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, PlayerList.self.movementQueueX[0]); if (!local560) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]); } } Static122.x = Static7.clickX; @@ -177,7 +177,7 @@ public final class Static103 { Static6.outboundBuffer.p1isaac(92); Static6.outboundBuffer.p2leadd(local36); } else { - method2231(Static186.EMPTY, 0, Static34.concatenate(new JagString[] { Static123.parseInt(local693.objCounts[local15]), Static249.aClass100_1039, Static71.get(local36).name})); + method2231(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { Static123.parseInt(local693.objCounts[local15]), Static249.aClass100_1039, Static71.get(local36).name})); } Static72.anInt2043 = 0; Static257.aClass13_7 = Static5.getComponent(local19); @@ -189,7 +189,7 @@ public final class Static103 { } else if (local36 == 1) { if (Static191.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) { Static61.teleport(Static225.originX + local15, Static142.originZ + local19, Static55.level); - } else if (Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, true, 0, local15, 0, 0, 1, local19, Static173.self.movementQueueX[0])) { + } else if (Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 0, true, 0, local15, 0, 0, 1, local19, PlayerList.self.movementQueueX[0])) { Static6.outboundBuffer.p1(Static1.anInt5); Static6.outboundBuffer.p1(Static107.anInt2878); Static6.outboundBuffer.p2((int)Camera.yawTarget); @@ -197,8 +197,8 @@ public final class Static103 { Static6.outboundBuffer.p1(Static59.anInt1814); Static6.outboundBuffer.p1(Static273.anInt4130); Static6.outboundBuffer.p1(89); - Static6.outboundBuffer.p2(Static173.self.xFine); - Static6.outboundBuffer.p2(Static173.self.zFine); + Static6.outboundBuffer.p2(PlayerList.self.xFine); + Static6.outboundBuffer.p2(PlayerList.self.zFine); Static6.outboundBuffer.p1(Static221.anInt4364); Static6.outboundBuffer.p1(63); } @@ -244,7 +244,7 @@ public final class Static103 { if (local23 == 10) { local43 = Static159.players[local36]; if (local43 != null) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static70.type = 2; Static25.y = Static60.clickY; Static122.x = Static7.clickX; @@ -286,7 +286,7 @@ public final class Static103 { if (local23 == 37) { local43 = Static159.players[local36]; if (local43 != null) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static17.milliseconds = 0; Static70.type = 2; Static25.y = Static60.clickY; @@ -308,12 +308,12 @@ public final class Static103 { Static250.anInt5444 = local15; } if (local23 == 21) { - if (Static266.game == 1) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); + if (client.game == 1) { + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]); } else { - local560 = Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.self.movementQueueX[0]); + local560 = Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, PlayerList.self.movementQueueX[0]); if (!local560) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]); } } Static70.type = 2; @@ -328,7 +328,7 @@ public final class Static103 { if (local23 == 4) { local192 = Static175.npcs[local36]; if (local192 != null) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static70.type = 2; Static17.milliseconds = 0; Static25.y = Static60.clickY; @@ -349,9 +349,9 @@ public final class Static103 { Static102.aClass100_545 = Static250.aClass100_1042; } if (local693.aBoolean32) { - Static78.aClass100_466 = Static34.concatenate(new JagString[] { local693.aClass100_88, Static204.aClass100_896 }); + Static78.aClass100_466 = JagString.concatenate(new JagString[] { local693.aClass100_88, Static204.aClass100_896 }); } else { - Static78.aClass100_466 = Static34.concatenate(new JagString[] { Static42.aClass100_332, local693.aClass100_85, Static204.aClass100_896 }); + Static78.aClass100_466 = JagString.concatenate(new JagString[] { MiniMenu.COLOR_GREEN, local693.aClass100_85, Static204.aClass100_896 }); } } return; @@ -359,7 +359,7 @@ public final class Static103 { if (local23 == 29) { local43 = Static159.players[local36]; if (local43 != null) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static25.y = Static60.clickY; Static17.milliseconds = 0; Static70.type = 2; @@ -380,7 +380,7 @@ public final class Static103 { if (local23 == 15) { local43 = Static159.players[local36]; if (local43 != null) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static17.milliseconds = 0; Static70.type = 2; Static122.x = Static7.clickX; @@ -392,12 +392,12 @@ public final class Static103 { } } if (local23 == 34) { - if (Static266.game == 1) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); + if (client.game == 1) { + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]); } else { - local560 = Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.self.movementQueueX[0]); + local560 = Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, PlayerList.self.movementQueueX[0]); if (!local560) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]); } } Static122.x = Static7.clickX; @@ -421,7 +421,7 @@ public final class Static103 { if (local23 == 2) { local192 = Static175.npcs[local36]; if (local192 != null) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static25.y = Static60.clickY; Static70.type = 2; Static122.x = Static7.clickX; @@ -446,7 +446,7 @@ public final class Static103 { if (local23 == 26) { local192 = Static175.npcs[local36]; if (local192 != null) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static70.type = 2; Static17.milliseconds = 0; Static25.y = Static60.clickY; @@ -469,9 +469,9 @@ public final class Static103 { } } if (local23 == 33) { - local560 = Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.self.movementQueueX[0]); + local560 = Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, PlayerList.self.movementQueueX[0]); if (!local560) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]); } Static122.x = Static7.clickX; Static17.milliseconds = 0; @@ -519,7 +519,7 @@ public final class Static103 { if (local23 == 1) { local43 = Static159.players[local36]; if (local43 != null) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static17.milliseconds = 0; Static25.y = Static60.clickY; Static70.type = 2; @@ -541,12 +541,12 @@ public final class Static103 { Static250.anInt5444 = local15; } if (local23 == 24) { - if (Static266.game == 1) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); + if (client.game == 1) { + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]); } else { - local560 = Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.self.movementQueueX[0]); + local560 = Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, PlayerList.self.movementQueueX[0]); if (!local560) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]); } } Static70.type = 2; @@ -578,7 +578,7 @@ public final class Static103 { if (local23 == 57) { local43 = Static159.players[local36]; if (local43 != null) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static70.type = 2; Static25.y = Static60.clickY; Static122.x = Static7.clickX; @@ -595,7 +595,7 @@ public final class Static103 { Static260.anInt5014 = 1; Static274.anInt4997 = local36; Static43.redraw(local693); - Static34.aClass100_203 = Static34.concatenate(new JagString[] { Static8.aClass100_32, Static71.get(local36).name, Static204.aClass100_896 }); + Static34.aClass100_203 = JagString.concatenate(new JagString[] { Static8.aClass100_32, Static71.get(local36).name, Static204.aClass100_896 }); if (Static34.aClass100_203 == null) { Static34.aClass100_203 = Static92.aClass100_510; } @@ -620,7 +620,7 @@ public final class Static103 { if (local23 == 30) { local43 = Static159.players[local36]; if (local43 != null) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static17.milliseconds = 0; Static122.x = Static7.clickX; Static25.y = Static60.clickY; @@ -639,9 +639,9 @@ public final class Static103 { Static250.anInt5444 = local15; } if (local23 == 39) { - local560 = Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.self.movementQueueX[0]); + local560 = Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, PlayerList.self.movementQueueX[0]); if (!local560) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]); } Static25.y = Static60.clickY; Static122.x = Static7.clickX; @@ -676,7 +676,7 @@ public final class Static103 { if (local23 == 6) { local43 = Static159.players[local36]; if (local43 != null) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static25.y = Static60.clickY; Static17.milliseconds = 0; Static70.type = 2; @@ -686,12 +686,12 @@ public final class Static103 { } } if (local23 == 20) { - if (Static266.game == 1) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); + if (client.game == 1) { + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]); } else { - local560 = Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.self.movementQueueX[0]); + local560 = Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, PlayerList.self.movementQueueX[0]); if (!local560) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]); } } Static25.y = Static60.clickY; @@ -706,7 +706,7 @@ public final class Static103 { if (local23 == 16) { local192 = Static175.npcs[local36]; if (local192 != null) { - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static122.x = Static7.clickX; Static17.milliseconds = 0; Static25.y = Static60.clickY; @@ -739,7 +739,7 @@ public final class Static103 { @Pc(31) int local31 = local15.anInt3526; @Pc(34) int local34 = local15.anInt3529; @Pc(37) int local37 = local15.anInt3525; - if (!Static71.fogEnabled) { + if (!Preferences.fogEnabled) { local34 = 0; } @Pc(44) float local44 = local15.aFloat17; diff --git a/client/src/main/java/Static104.java b/client/src/main/java/Static104.java index 805da39..d4d68b6 100644 --- a/client/src/main/java/Static104.java +++ b/client/src/main/java/Static104.java @@ -15,8 +15,8 @@ public final class Static104 { arg0.anInt3417 = 0; return; } - if (arg0.anInt3369 != -1 && arg0.anInt3420 == 0) { - @Pc(40) SeqType local40 = Static36.get(arg0.anInt3369); + if (arg0.seqId != -1 && arg0.anInt3420 == 0) { + @Pc(40) SeqType local40 = Static36.get(arg0.seqId); if (arg0.anInt3405 > 0 && local40.anInt5363 == 0) { arg0.anInt3417++; return; diff --git a/client/src/main/java/Static106.java b/client/src/main/java/Static106.java index cdec142..4deaf82 100644 --- a/client/src/main/java/Static106.java +++ b/client/src/main/java/Static106.java @@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static106 { @OriginalMember(owner = "client!ic", name = "a", descriptor = "Lclient!qf;") - public static Sprite aClass3_Sub2_Sub1_7; + public static Sprite compass; @OriginalMember(owner = "client!ic", name = "n", descriptor = "I") public static int anInt2871; diff --git a/client/src/main/java/Static107.java b/client/src/main/java/Static107.java index d427f10..c8d0816 100644 --- a/client/src/main/java/Static107.java +++ b/client/src/main/java/Static107.java @@ -9,9 +9,6 @@ public final class Static107 { @OriginalMember(owner = "client!id", name = "k", descriptor = "I") public static int anInt2878; - @OriginalMember(owner = "client!id", name = "l", descriptor = "Lclient!jb;") - public static Js5NetQueue js5NetQueue; - @OriginalMember(owner = "client!id", name = "b", descriptor = "I") public static int anInt2875 = -1; @@ -24,19 +21,16 @@ public final class Static107 { @OriginalMember(owner = "client!id", name = "e", descriptor = "[I") public static final int[] anIntArray259 = new int[14]; - @OriginalMember(owner = "client!id", name = "f", descriptor = "Z") - public static boolean clean = false; - @OriginalMember(owner = "client!id", name = "j", descriptor = "Lclient!of;") public static QuickChatCommandDecoder anInterface3_1 = null; @OriginalMember(owner = "client!id", name = "b", descriptor = "(I)V") public static void loop() { - if (Static147.soundChannel != null) { - Static147.soundChannel.loop(); + if (client.soundChannel != null) { + client.soundChannel.loop(); } - if (Static11.musicChannel != null) { - Static11.musicChannel.loop(); + if (client.musicChannel != null) { + client.musicChannel.loop(); } } diff --git a/client/src/main/java/Static11.java b/client/src/main/java/Static11.java index 44c1320..de8ff7d 100644 --- a/client/src/main/java/Static11.java +++ b/client/src/main/java/Static11.java @@ -4,16 +4,10 @@ import org.openrs2.deob.annotation.Pc; public final class Static11 { - @OriginalMember(owner = "client!ba", name = "D", descriptor = "Lclient!vh;") - public static AudioChannel musicChannel; - - @OriginalMember(owner = "client!ba", name = "w", descriptor = "I") + @OriginalMember(owner = "client!ba", name = "w", descriptor = "I") public static int anInt384 = 0; - @OriginalMember(owner = "client!ba", name = "x", descriptor = "Z") - public static boolean flickeringEffectsOn = true; - - @OriginalMember(owner = "client!ba", name = "e", descriptor = "(I)V") + @OriginalMember(owner = "client!ba", name = "e", descriptor = "(I)V") public static void method443() { Static262.headModels.clear(); } diff --git a/client/src/main/java/Static112.java b/client/src/main/java/Static112.java index fa1f8f9..3ea810f 100644 --- a/client/src/main/java/Static112.java +++ b/client/src/main/java/Static112.java @@ -32,7 +32,7 @@ public final class Static112 { } else if (GlRenderer.enabled) { Static46.method1182(local3, local9, local13, 20, Static40.anInt1275, 256 - Static111.anInt2910); } else { - Static129.method2484(local3, local9, local13, 20, Static40.anInt1275, 256 - Static111.anInt2910); + SoftwareRaster.method2484(local3, local9, local13, 20, Static40.anInt1275, 256 - Static111.anInt2910); } } @Pc(112) int local112; @@ -45,11 +45,11 @@ public final class Static112 { Static181.aClass3_Sub2_Sub1_9.method1423(local3, local9); Static181.aClass3_Sub2_Sub1_9.method1421(local3 + local13 - Static181.aClass3_Sub2_Sub1_9.anInt1867, local9); } - Static280.aClass3_Sub2_Sub9_43.method2857(LocalizedText.CHOOSE_OPTION, local3 + 3, local9 + 14, Static195.anInt4581, -1); + Fonts.b12Full.method2857(LocalizedText.CHOOSE_OPTION, local3 + 3, local9 + 14, Static195.anInt4581, -1); if (GlRenderer.enabled) { Static46.method1182(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static111.anInt2910); } else { - Static129.method2484(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static111.anInt2910); + SoftwareRaster.method2484(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static111.anInt2910); } local114 = Static223.anInt5032; local112 = Static215.anInt4873; @@ -61,7 +61,7 @@ public final class Static112 { if (GlRenderer.enabled) { Static46.method1182(local3, local219 - 13, local13, 16, Static251.anInt5457, 256 - Static232.anInt5208); } else { - Static129.method2484(local3, local219 - 13, local13, 16, Static251.anInt5457, 256 - Static232.anInt5208); + SoftwareRaster.method2484(local3, local219 - 13, local13, 16, Static251.anInt5457, 256 - Static232.anInt5208); } } } @@ -107,7 +107,7 @@ public final class Static112 { if (local3 < local112 && local13 + local3 > local112 && local219 - 13 < local114 && local114 < local219 + 3) { local418 = Static262.anInt5752; } - Static280.aClass3_Sub2_Sub9_43.method2857(Static269.method2228(local203), local3 + 3, local219, local418, 0); + Fonts.b12Full.method2857(Static269.method2228(local203), local3 + 3, local219, local418, 0); } Static121.method2407(Static183.anInt4271, Static229.anInt5138, Static13.anInt436, Static24.anInt761); } diff --git a/client/src/main/java/Static113.java b/client/src/main/java/Static113.java index 5100454..d7b9e35 100644 --- a/client/src/main/java/Static113.java +++ b/client/src/main/java/Static113.java @@ -7,10 +7,7 @@ public final class Static113 { @OriginalMember(owner = "client!il", name = "O", descriptor = "I") public static int anInt4612; - @OriginalMember(owner = "client!il", name = "I", descriptor = "I") - public static int brightness = 3; - - @OriginalMember(owner = "client!il", name = "a", descriptor = "(III)V") + @OriginalMember(owner = "client!il", name = "a", descriptor = "(III)V") public static void method3556(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { Static158.aBoolean187 = true; Static160.anInt3902 = arg0; diff --git a/client/src/main/java/Static114.java b/client/src/main/java/Static114.java index 391166d..d27f319 100644 --- a/client/src/main/java/Static114.java +++ b/client/src/main/java/Static114.java @@ -5,12 +5,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static114 { - @OriginalMember(owner = "client!j", name = "x", descriptor = "Lclient!rk;") - public static Font aClass3_Sub2_Sub9_42; - - @OriginalMember(owner = "client!j", name = "v", descriptor = "I") - public static int anInt5831 = 0; - @OriginalMember(owner = "client!j", name = "z", descriptor = "Lclient!na;") public static final JagString aClass100_1099 = Static28.parse("::shiftclick"); @@ -33,24 +27,24 @@ public final class Static114 { if (arg0 == null) { return null; } else { - @Pc(22) SoftwareFont local22 = new SoftwareFont(arg0, Static274.anIntArray440, Static269.anIntArray252, Static254.anIntArray488, Static26.anIntArray66, Static7.aByteArrayArray5); - Static75.method1631(); + @Pc(22) SoftwareFont local22 = new SoftwareFont(arg0, SpriteLoader.xOffsets, SpriteLoader.yOffsets, SpriteLoader.innerWidths, SpriteLoader.innerHeights, SpriteLoader.pixels); + SpriteLoader.clear(); return local22; } } @OriginalMember(owner = "client!j", name = "a", descriptor = "(BZLclient!na;)V") public static void drawTextOnScreen(@OriginalArg(1) boolean arg0, @OriginalArg(2) JagString arg1) { - @Pc(24) int local24 = Static215.aClass3_Sub2_Sub9_32.method2856(arg1, 250); - @Pc(31) int local31 = Static215.aClass3_Sub2_Sub9_32.getParagraphLineCount(arg1, 250) * 13; + @Pc(24) int local24 = Fonts.p12Full.method2856(arg1, 250); + @Pc(31) int local31 = Fonts.p12Full.getParagraphLineCount(arg1, 250) * 13; if (GlRenderer.enabled) { Static46.method1186(6, 6, local24 + 4 + 4, local31 + 8, 0); Static46.method1179(6, 6, local24 + 4 + 4, local31 + 4 + 4, 16777215); } else { - Static129.method2495(6, 6, local24 + 4 + 4, local31 + 8, 0); - Static129.method2483(6, 6, local24 + 8, 4 + 4 + local31, 16777215); + SoftwareRaster.fillRect(6, 6, local24 + 4 + 4, local31 + 8, 0); + SoftwareRaster.drawRect(6, 6, local24 + 8, 4 + 4 + local31, 16777215); } - Static215.aClass3_Sub2_Sub9_32.method2852(arg1, 10, 10, local24, local31, 16777215, -1, 1, 1, 0); + Fonts.p12Full.method2852(arg1, 10, 10, local24, local31, 16777215, -1, 1, 1, 0); Static133.method4012(6, local24 + 8, 6, local31 + 4 + 4); if (!arg0) { Static121.method2407(10, 10, local31, local24); @@ -59,7 +53,7 @@ public final class Static114 { } else { try { @Pc(159) Graphics local159 = GameShell.canvas.getGraphics(); - Static260.frameBuffer.draw(local159); + client.frameBuffer.draw(local159); } catch (@Pc(167) Exception local167) { GameShell.canvas.repaint(); } diff --git a/client/src/main/java/Static115.java b/client/src/main/java/Static115.java index df032e8..91a13de 100644 --- a/client/src/main/java/Static115.java +++ b/client/src/main/java/Static115.java @@ -57,10 +57,10 @@ public final class Static115 { @OriginalMember(owner = "client!ja", name = "a", descriptor = "(IIIIB)V") public static void method2310(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { if (Static70.type == 1) { - Static240.aClass3_Sub2_Sub1Array10[Static17.milliseconds / 100].method1423(Static122.x - 8, Static25.y + -8); + Sprites.crosses[Static17.milliseconds / 100].method1423(Static122.x - 8, Static25.y + -8); } if (Static70.type == 2) { - Static240.aClass3_Sub2_Sub1Array10[Static17.milliseconds / 100 + 4].method1423(Static122.x - 8, Static25.y + -8); + Sprites.crosses[Static17.milliseconds / 100 + 4].method1423(Static122.x - 8, Static25.y + -8); } Static256.method4392(); } @@ -142,24 +142,24 @@ public final class Static115 { @OriginalMember(owner = "client!ja", name = "a", descriptor = "(Z)V") public static void clear() { - Static215.aClass3_Sub2_Sub9_32 = null; - Static213.aClass3_Sub2_Sub1Array8 = null; - Static240.aClass3_Sub2_Sub1Array10 = null; - Static159.aClass36Array12 = null; + Fonts.p12Full = null; + Sprites.hitmarks = null; + Sprites.crosses = null; + Sprites.nameIcons = null; Static265.p11FullSoftware = null; - Static173.aClass3_Sub2_Sub1_Sub1Array9 = null; - Static67.aClass3_Sub2_Sub1Array4 = null; - Static149.aClass3_Sub2_Sub1Array7 = null; - Static138.aClass3_Sub2_Sub1Array5 = null; - Static280.aClass3_Sub2_Sub9_43 = null; - Static106.aClass3_Sub2_Sub1_7 = null; - Static139.aClass3_Sub2_Sub1Array6 = null; - Static114.aClass3_Sub2_Sub9_42 = null; - Static84.aClass3_Sub2_Sub1_4 = null; - Static116.aClass3_Sub2_Sub1Array3 = null; - Static277.aClass3_Sub2_Sub1Array12 = null; - Static276.aClass3_Sub2_Sub1Array11 = null; - Static219.aClass3_Sub2_Sub1Array9 = null; - Static241.aClass36Array16 = null; + Sprites.mapfunctions = null; + Static67.mapfuncs = null; + Sprites.mapmarkhints = null; + Sprites.headiconPrayers = null; + Fonts.b12Full = null; + Static106.compass = null; + Sprites.mapdots = null; + Fonts.p11Full = null; + Sprites.mapflags = null; + Sprites.hitbars = null; + Static277.hintMapEdge = null; + Sprites.headhints = null; + Sprites.headiconPks = null; + Sprites.scrollbars = null; } } diff --git a/client/src/main/java/Static116.java b/client/src/main/java/Static116.java index 68fdfcd..eeaa0fe 100644 --- a/client/src/main/java/Static116.java +++ b/client/src/main/java/Static116.java @@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static116 { - @OriginalMember(owner = "client!jb", name = "k", descriptor = "[Lclient!qf;") - public static Sprite[] aClass3_Sub2_Sub1Array3; - @OriginalMember(owner = "client!jb", name = "c", descriptor = "Lclient!na;") public static final JagString aClass100_583 = Static28.parse("(Y<)4col>"); @@ -30,36 +27,36 @@ public final class Static116 { @OriginalMember(owner = "client!jb", name = "a", descriptor = "(IZ)V") public static void clear(@OriginalArg(1) boolean arg0) { - Static90.aByteArrayArrayArray8 = null; - Static83.anIntArrayArrayArray3 = null; + WorldMap.aByteArrayArrayArray8 = null; + WorldMap.underlayColors = null; Static24.component = null; - Static34.aByteArrayArrayArray3 = null; - Static145.anIntArray330 = null; - Static125.aByteArrayArrayArray10 = null; - if (arg0 && Static269.aClass3_Sub2_Sub4_2 != null) { - Static153.aClass100_724 = Static269.aClass3_Sub2_Sub4_2.aClass100_138; + WorldMap.aByteArrayArrayArray3 = null; + WorldMap.overlayColors = null; + WorldMap.aByteArrayArrayArray10 = null; + if (arg0 && WorldMap.currentMap != null) { + Static153.aClass100_724 = WorldMap.currentMap.group; } else { Static153.aClass100_724 = null; } - Static70.aByteArrayArrayArray7 = null; - Static229.aByteArrayArrayArray12 = null; - Static58.anIntArrayArrayArray5 = null; - Static248.anIntArrayArrayArray17 = null; - Static41.anInt1309 = 0; - Static269.aClass3_Sub2_Sub4_2 = null; - Static145.aClass69_84.clear(); - Static203.aClass134_1 = null; - Static217.anInt4901 = -1; - Static130.aClass41_2 = null; - Static160.aClass41_4 = null; - Static152.aClass41_3 = null; - Static270.aClass41_9 = null; - Static273.aClass41_7 = null; - Static169.aClass41_5 = null; - Static130.aClass41_1 = null; - Static203.aClass41_8 = null; + WorldMap.aByteArrayArrayArray7 = null; + WorldMap.aByteArrayArrayArray12 = null; + WorldMap.scenery = null; + WorldMap.anIntArrayArrayArray17 = null; + WorldMap.loadPercentage = 0; + WorldMap.currentMap = null; + WorldMap.mapElements.clear(); + WorldMap.labels = null; + WorldMap.anInt4901 = -1; + WorldMap.font22 = null; + WorldMap.font30 = null; + WorldMap.font12 = null; + WorldMap.font26 = null; + WorldMap.font11 = null; + WorldMap.font14 = null; + WorldMap.font17 = null; + WorldMap.font19 = null; Static70.aClass3_Sub2_Sub1_2 = null; - Static142.anInt3482 = -1; + WorldMap.anInt3482 = -1; Static153.aClass3_Sub2_Sub1_Sub1_2 = null; } } diff --git a/client/src/main/java/Static118.java b/client/src/main/java/Static118.java index d79c786..ee3647a 100644 --- a/client/src/main/java/Static118.java +++ b/client/src/main/java/Static118.java @@ -91,28 +91,6 @@ public final class Static118 { } } - @OriginalMember(owner = "client!jd", name = "a", descriptor = "(II[Lclient!na;I)Lclient!na;") - public static JagString method2355(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) JagString[] arg2) { - @Pc(5) int local5 = 0; - for (@Pc(7) int local7 = 0; local7 < arg1; local7++) { - if (arg2[arg0 + local7] == null) { - arg2[local7 + arg0] = Static193.aClass100_853; - } - local5 += arg2[local7 + arg0].length; - } - @Pc(39) byte[] local39 = new byte[local5]; - @Pc(41) int local41 = 0; - for (@Pc(43) int local43 = 0; local43 < arg1; local43++) { - @Pc(52) JagString local52 = arg2[local43 + arg0]; - Static289.copy(local52.chars, 0, local39, local41, local52.length); - local41 += local52.length; - } - @Pc(71) JagString local71 = new JagString(); - local71.length = local5; - local71.chars = local39; - return local71; - } - @OriginalMember(owner = "client!jd", name = "a", descriptor = "(II)I") public static int method2356(@OriginalArg(1) int arg0) { return arg0 & 0x7F; diff --git a/client/src/main/java/Static119.java b/client/src/main/java/Static119.java index 5943513..ea51e85 100644 --- a/client/src/main/java/Static119.java +++ b/client/src/main/java/Static119.java @@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static119 { - @OriginalMember(owner = "client!je", name = "W", descriptor = "Lclient!ve;") - public static Js5 aClass153_44; - @OriginalMember(owner = "client!je", name = "eb", descriptor = "[I") public static int[] anIntArray282; @@ -65,11 +62,11 @@ public final class Static119 { @OriginalMember(owner = "client!je", name = "j", descriptor = "(I)I") public static int method2385() { - if (Static203.aClass134_1 == null) { + if (WorldMap.labels == null) { return -1; } - while (Static232.anInt5212 < Static203.aClass134_1.anInt5074) { - if (Static203.aClass134_1.method3897(Static232.anInt5212)) { + while (Static232.anInt5212 < WorldMap.labels.anInt5074) { + if (WorldMap.labels.method3897(Static232.anInt5212)) { return Static232.anInt5212++; } Static232.anInt5212++; @@ -94,10 +91,10 @@ public final class Static119 { @OriginalMember(owner = "client!je", name = "a", descriptor = "(IIIII)V") public static void method2387(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { - Static13.anInt435 = Static48.anInt1449 * arg2 / arg0; - Static28.anInt919 = Static181.anInt4296 * arg1 / arg3; - Static142.anInt3482 = -1; - Static217.anInt4901 = -1; - Static38.method965(); + WorldMap.anInt435 = WorldMap.width * arg2 / arg0; + WorldMap.anInt919 = WorldMap.length * arg1 / arg3; + WorldMap.anInt3482 = -1; + WorldMap.anInt4901 = -1; + WorldMap.method965(); } } diff --git a/client/src/main/java/Static12.java b/client/src/main/java/Static12.java index 5e7b756..eb37e60 100644 --- a/client/src/main/java/Static12.java +++ b/client/src/main/java/Static12.java @@ -12,10 +12,7 @@ public final class Static12 { @OriginalMember(owner = "client!bb", name = "m", descriptor = "Lclient!na;") public static final JagString aClass100_73 = Static28.parse("runes"); - @OriginalMember(owner = "client!bb", name = "n", descriptor = "I") - public static int musicVolume = 255; - - @OriginalMember(owner = "client!bb", name = "t", descriptor = "[[B") + @OriginalMember(owner = "client!bb", name = "t", descriptor = "[[B") public static final byte[][] aByteArrayArray2 = new byte[250][]; @OriginalMember(owner = "client!bb", name = "A", descriptor = "Lclient!na;") @@ -26,37 +23,37 @@ public final class Static12 { @OriginalMember(owner = "client!bb", name = "a", descriptor = "(I)V") public static void method447() { - if (Static83.aFloat3 < Static138.aFloat14) { - Static83.aFloat3 = (float) ((double) Static83.aFloat3 + (double) Static83.aFloat3 / 30.0D); - if (Static138.aFloat14 < Static83.aFloat3) { - Static83.aFloat3 = Static138.aFloat14; + if (WorldMap.zoom < WorldMap.targetZoom) { + WorldMap.zoom = (float) ((double) WorldMap.zoom + (double) WorldMap.zoom / 30.0D); + if (WorldMap.targetZoom < WorldMap.zoom) { + WorldMap.zoom = WorldMap.targetZoom; } - Static38.method965(); - } else if (Static138.aFloat14 < Static83.aFloat3) { - Static83.aFloat3 = (float) ((double) Static83.aFloat3 - (double) Static83.aFloat3 / 30.0D); - if (Static138.aFloat14 > Static83.aFloat3) { - Static83.aFloat3 = Static138.aFloat14; + WorldMap.method965(); + } else if (WorldMap.targetZoom < WorldMap.zoom) { + WorldMap.zoom = (float) ((double) WorldMap.zoom - (double) WorldMap.zoom / 30.0D); + if (WorldMap.targetZoom > WorldMap.zoom) { + WorldMap.zoom = WorldMap.targetZoom; } - Static38.method965(); + WorldMap.method965(); } - if (Static142.anInt3482 == -1 || Static217.anInt4901 == -1) { + if (WorldMap.anInt3482 == -1 || WorldMap.anInt4901 == -1) { return; } - @Pc(60) int local60 = Static142.anInt3482 - Static13.anInt435; + @Pc(60) int local60 = WorldMap.anInt3482 - WorldMap.anInt435; if (local60 < 2 || local60 > 2) { local60 >>= 0x4; } - @Pc(78) int local78 = Static217.anInt4901 - Static28.anInt919; + @Pc(78) int local78 = WorldMap.anInt4901 - WorldMap.anInt919; if (local78 < 2 || local78 > 2) { local78 >>= 0x4; } - Static28.anInt919 -= -local78; - Static13.anInt435 += local60; + WorldMap.anInt919 -= -local78; + WorldMap.anInt435 += local60; if (local60 == 0 && local78 == 0) { - Static142.anInt3482 = -1; - Static217.anInt4901 = -1; + WorldMap.anInt3482 = -1; + WorldMap.anInt4901 = -1; } - Static38.method965(); + WorldMap.method965(); } } diff --git a/client/src/main/java/Static120.java b/client/src/main/java/Static120.java index 3756aa4..c3121b1 100644 --- a/client/src/main/java/Static120.java +++ b/client/src/main/java/Static120.java @@ -55,7 +55,7 @@ public final class Static120 { @OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIIIII)V") public static void method2388(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) { - if (!Static178.highDetailLighting) { + if (!Preferences.highDetailLighting) { return; } if (arg0 == 1 && arg5 > 0) { @@ -96,7 +96,7 @@ public final class Static120 { @OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIIIIII)V") public static void method2391(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7) { - if (!Static178.highDetailLighting || anInt3031 == arg3 && anInt3033 == arg4 && anInt3029 == arg5 && anInt3035 == arg6 && anInt3030 == arg7) { + if (!Preferences.highDetailLighting || anInt3031 == arg3 && anInt3033 == arg4 && anInt3029 == arg5 && anInt3035 == arg6 && anInt3030 == arg7) { return; } @Pc(20) int local20; @@ -179,7 +179,7 @@ public final class Static120 { @OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIIII)V") public static void method2393(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { - if (!Static178.highDetailLighting || anInt3031 == arg3 && anInt3033 == arg4 && anInt3029 == arg5 && anInt3035 == arg4 && anInt3030 == arg5) { + if (!Preferences.highDetailLighting || anInt3031 == arg3 && anInt3033 == arg4 && anInt3029 == arg5 && anInt3035 == arg4 && anInt3030 == arg5) { return; } @Pc(20) int local20; @@ -301,7 +301,7 @@ public final class Static120 { @OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIII)V") public static void method2397(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { - if (!Static178.highDetailLighting) { + if (!Preferences.highDetailLighting) { return; } label43: for (@Pc(4) int local4 = 0; local4 < 4; local4++) { @@ -367,7 +367,7 @@ public final class Static120 { @OriginalMember(owner = "client!jf", name = "a", descriptor = "(II[[[Lclient!bj;)V") public static void method2402(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Tile[][][] arg2) { - if (!Static178.highDetailLighting) { + if (!Preferences.highDetailLighting) { return; } @Pc(4) GL2 local4 = GlRenderer.gl; diff --git a/client/src/main/java/Static121.java b/client/src/main/java/Static121.java index 705f0b4..458715b 100644 --- a/client/src/main/java/Static121.java +++ b/client/src/main/java/Static121.java @@ -10,10 +10,7 @@ public final class Static121 { @OriginalMember(owner = "client!jg", name = "b", descriptor = "I") public static int anInt3039; - @OriginalMember(owner = "client!jg", name = "c", descriptor = "Lclient!en;") - public static BufferedFile uid; - - @OriginalMember(owner = "client!jg", name = "g", descriptor = "I") + @OriginalMember(owner = "client!jg", name = "g", descriptor = "I") public static int anInt3041; @OriginalMember(owner = "client!jg", name = "j", descriptor = "Lclient!ve;") @@ -22,21 +19,11 @@ public final class Static121 { @OriginalMember(owner = "client!jg", name = "e", descriptor = "Z") public static boolean aBoolean154 = false; - @OriginalMember(owner = "client!jg", name = "a", descriptor = "(I)[Lclient!ek;") - public static SoftwareIndexedSprite[] method2406() { - @Pc(2) SoftwareIndexedSprite[] local2 = new SoftwareIndexedSprite[Static165.anInt4038]; - for (@Pc(8) int local8 = 0; local8 < Static165.anInt4038; local8++) { - local2[local8] = new SoftwareIndexedSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local8], Static269.anIntArray252[local8], Static254.anIntArray488[local8], Static26.anIntArray66[local8], Static7.aByteArrayArray5[local8], Static259.anIntArray513); - } - Static75.method1631(); - return local2; - } - @OriginalMember(owner = "client!jg", name = "a", descriptor = "(IBIII)V") public static void method2407(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { - for (@Pc(3) int local3 = 0; local3 < Static24.anInt766; local3++) { + for (@Pc(3) int local3 = 0; local3 < InterfaceList.anInt766; local3++) { if (arg0 < Static264.anIntArray410[local3] + Static224.anIntArray443[local3] && arg0 + arg3 > Static264.anIntArray410[local3] && Static50.anIntArray133[local3] + Static67.anIntArray320[local3] > arg1 && Static50.anIntArray133[local3] < arg2 + arg1) { - Static31.rectangleRedraw[local3] = true; + InterfaceList.rectangleRedraw[local3] = true; } } } diff --git a/client/src/main/java/Static122.java b/client/src/main/java/Static122.java index ad48fff..81467ad 100644 --- a/client/src/main/java/Static122.java +++ b/client/src/main/java/Static122.java @@ -61,7 +61,7 @@ public final class Static122 { if (local13.sounds != null) { local13.anInt2034 = local13.anInt2032 + (int) (Math.random() * (double) (local13.anInt2040 - local13.anInt2032)); } - Static3.aClass69_135.method2282(local13); + Static3.aClass69_135.addTail(local13); } else if (arg3 != null) { local13.npc = arg3; @Pc(138) NpcType local138 = arg3.type; @@ -75,7 +75,7 @@ public final class Static122 { local13.sound = Static112.getSound(arg3); local13.radius = local138.soundRadius * 128; } - Static152.aClass69_87.method2282(local13); + Static152.aClass69_87.addTail(local13); } else if (arg6 != null) { local13.player = arg6; local13.anInt2037 = (arg6.getSize() + arg4) * 128; @@ -88,6 +88,6 @@ public final class Static122 { @OriginalMember(owner = "client!jh", name = "a", descriptor = "(IILclient!ve;Lclient!ve;I)Lclient!dd;") public static SoftwareFont method2412(@OriginalArg(0) int arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) Js5 arg2) { - return Static234.method4016(arg2, 0, arg0) ? Static114.method4635(arg1.getFile(arg0, 0)) : null; + return SpriteLoader.decode(arg2, 0, arg0) ? Static114.method4635(arg1.getFile(arg0, 0)) : null; } } diff --git a/client/src/main/java/Static123.java b/client/src/main/java/Static123.java index 4bebead..3aeb5fe 100644 --- a/client/src/main/java/Static123.java +++ b/client/src/main/java/Static123.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static123 { - @OriginalMember(owner = "client!jj", name = "d", descriptor = "Lclient!na;") - public static final JagString aClass100_592 = Static28.parse("headicons_pk"); - - @OriginalMember(owner = "client!jj", name = "e", descriptor = "I") + @OriginalMember(owner = "client!jj", name = "e", descriptor = "I") public static int anInt3058 = 0; @OriginalMember(owner = "client!jj", name = "g", descriptor = "Lclient!na;") @@ -18,6 +15,8 @@ public final class Static123 { @OriginalMember(owner = "client!jj", name = "m", descriptor = "Lclient!na;") public static final JagString aClass100_594 = Static28.parse("<)4col>"); + @OriginalMember(owner = "client!ml", name = "K", descriptor = "I") + public static int anInt3947; @OriginalMember(owner = "client!jj", name = "a", descriptor = "(BI)Lclient!lk;") public static StructType method2417(@OriginalArg(1) int arg0) { @@ -28,7 +27,7 @@ public final class Static123 { @Pc(26) byte[] local26 = Static23.aClass153_11.getFile(26, arg0); local10 = new StructType(); if (local26 != null) { - local10.method2806(new Buffer(local26)); + local10.decode(new Buffer(local26)); } Static231.aClass54_13.put(local10, (long) arg0); return local10; @@ -36,9 +35,9 @@ public final class Static123 { @OriginalMember(owner = "client!jj", name = "a", descriptor = "(Z)V") public static void topBannerRefresh() { - if (!Static249.advertSuppressed && Static83.modeWhere != 2) { + if (!client.advertSuppressed && client.modeWhere != 2) { try { - Static206.aClass100_900.method3157(Static215.instance); + Static206.aClass100_900.method3157(client.instance); } catch (@Pc(26) Throwable local26) { } } @@ -92,8 +91,8 @@ public final class Static123 { } local10.anInt4454 = (local10.anInt4458 - Static217.anInt4903 << 8) / local158; local10.anInt4450 = (local10.anInt4449 - Static217.anInt4903 << 8) / local158; - local10.anInt4459 = (local10.anInt4444 - Static162.anInt3947 << 8) / local158; - local10.anInt4463 = (local10.anInt4447 - Static162.anInt3947 << 8) / local158; + local10.anInt4459 = (local10.anInt4444 - anInt3947 << 8) / local158; + local10.anInt4463 = (local10.anInt4447 - anInt3947 << 8) / local158; Static247.aClass120Array2[Static215.anInt4870++] = local10; } } @@ -128,13 +127,13 @@ public final class Static123 { } local10.anInt4448 = (local10.anInt4460 - Static149.anInt3555 << 8) / local158; local10.anInt4456 = (local10.anInt4445 - Static149.anInt3555 << 8) / local158; - local10.anInt4459 = (local10.anInt4444 - Static162.anInt3947 << 8) / local158; - local10.anInt4463 = (local10.anInt4447 - Static162.anInt3947 << 8) / local158; + local10.anInt4459 = (local10.anInt4444 - anInt3947 << 8) / local158; + local10.anInt4463 = (local10.anInt4447 - anInt3947 << 8) / local158; Static247.aClass120Array2[Static215.anInt4870++] = local10; } } } else if (local10.anInt4453 == 4) { - local14 = local10.anInt4444 - Static162.anInt3947; + local14 = local10.anInt4444 - anInt3947; if (local14 > 128) { local115 = local10.anInt4461 + Static277.tileVisibilityDistance - Static193.anInt4539; if (local115 < 0) { @@ -188,7 +187,7 @@ public final class Static123 { } else if (local4 < 0) { return Static229.aClass100_972; } else if (local4 > 9) { - return Static42.aClass100_332; + return MiniMenu.COLOR_GREEN; } else if (local4 > 6) { return Static6.aClass100_18; } else if (local4 <= 3) { @@ -198,21 +197,6 @@ public final class Static123 { } } - @OriginalMember(owner = "client!jj", name = "a", descriptor = "(B)[F") - public static float[] method2422() { - @Pc(3) float local3 = Static161.method3068() + Static161.method3059(); - @Pc(9) int local9 = Static161.method3064(); - @Pc(18) float local18 = (float) (local9 >> 16 & 0xFF) / 255.0F; - Static251.aFloatArray28[3] = 1.0F; - @Pc(37) float local37 = (float) (local9 >> 8 & 0xFF) / 255.0F; - @Pc(39) float local39 = 0.58823526F; - @Pc(46) float local46 = (float) (local9 & 0xFF) / 255.0F; - Static251.aFloatArray28[2] = Static257.aFloatArray2[2] * local46 * local39 * local3; - Static251.aFloatArray28[0] = Static257.aFloatArray2[0] * local18 * local39 * local3; - Static251.aFloatArray28[1] = local3 * local39 * local37 * Static257.aFloatArray2[1]; - return Static251.aFloatArray28; - } - @OriginalMember(owner = "client!jj", name = "b", descriptor = "(BI)Lclient!na;") public static JagString parseInt(@OriginalArg(1) int arg0) { return Static198.method1025(false, arg0); diff --git a/client/src/main/java/Static124.java b/client/src/main/java/Static124.java index 27265b5..5f3d792 100644 --- a/client/src/main/java/Static124.java +++ b/client/src/main/java/Static124.java @@ -4,16 +4,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static124 { - @OriginalMember(owner = "client!jk", name = "x", descriptor = "I") - public static int anInt3080; - - @OriginalMember(owner = "client!jk", name = "B", descriptor = "Lclient!ma;") - public static BufferedSocket socket; - - @OriginalMember(owner = "client!jk", name = "J", descriptor = "I") - public static int anInt3083; - - @OriginalMember(owner = "client!jk", name = "p", descriptor = "I") + @OriginalMember(owner = "client!jk", name = "p", descriptor = "I") public static int anInt3075 = -1; @OriginalMember(owner = "client!jk", name = "y", descriptor = "Z") @@ -36,7 +27,7 @@ public final class Static124 { @OriginalMember(owner = "client!jk", name = "a", descriptor = "(ILclient!na;)Lclient!bn;") public static Map method2434(@OriginalArg(1) JagString arg0) { for (@Pc(15) Map local15 = (Map) Static228.aClass69_120.method2289(); local15 != null; local15 = (Map) Static228.aClass69_120.method2288()) { - if (local15.aClass100_138.strEquals(arg0)) { + if (local15.group.strEquals(arg0)) { return local15; } } diff --git a/client/src/main/java/Static125.java b/client/src/main/java/Static125.java index 3711c77..7fcf362 100644 --- a/client/src/main/java/Static125.java +++ b/client/src/main/java/Static125.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static125 { - @OriginalMember(owner = "client!jl", name = "I", descriptor = "[[[B") - public static byte[][][] aByteArrayArrayArray10; - - @OriginalMember(owner = "client!jl", name = "v", descriptor = "I") + @OriginalMember(owner = "client!jl", name = "v", descriptor = "I") public static int anInt3096 = 0; @OriginalMember(owner = "client!jl", name = "x", descriptor = "Lclient!n;") @@ -19,10 +16,7 @@ public final class Static125 { @OriginalMember(owner = "client!jl", name = "H", descriptor = "I") public static int worldId = -1; - @OriginalMember(owner = "client!jl", name = "J", descriptor = "I") - public static int soundEffectVolume = 127; - - @OriginalMember(owner = "client!jl", name = "a", descriptor = "(ILclient!ve;Lclient!ve;)V") + @OriginalMember(owner = "client!jl", name = "a", descriptor = "(ILclient!ve;Lclient!ve;)V") public static void init(@OriginalArg(1) Js5 arg0, @OriginalArg(2) Js5 arg1) { Static14.modelsArchive = arg0; Static216.aClass153_31 = arg1; diff --git a/client/src/main/java/Static126.java b/client/src/main/java/Static126.java index af2bcb9..f6b09e1 100644 --- a/client/src/main/java/Static126.java +++ b/client/src/main/java/Static126.java @@ -17,12 +17,12 @@ public final class Static126 { @OriginalMember(owner = "client!jm", name = "a", descriptor = "(Z)V") public static void method2460() { - if (Static154.topLevelInterface != -1) { - Static96.method1949(Static154.topLevelInterface); + if (InterfaceList.topLevelInterface != -1) { + Static96.method1949(InterfaceList.topLevelInterface); } - for (@Pc(15) int local15 = 0; local15 < Static24.anInt766; local15++) { + for (@Pc(15) int local15 = 0; local15 < InterfaceList.anInt766; local15++) { if (Static186.aBooleanArray100[local15]) { - Static31.rectangleRedraw[local15] = true; + InterfaceList.rectangleRedraw[local15] = true; } Static223.aBooleanArray116[local15] = Static186.aBooleanArray100[local15]; Static186.aBooleanArray100[local15] = false; @@ -34,14 +34,14 @@ public final class Static126 { Static263.aBoolean299 = true; } Static214.anInt5574 = -1; - if (Static154.topLevelInterface != -1) { - Static24.anInt766 = 0; + if (InterfaceList.topLevelInterface != -1) { + InterfaceList.anInt766 = 0; Static9.method182(); } if (GlRenderer.enabled) { Static46.method1177(); } else { - Static129.method2503(); + SoftwareRaster.method2503(); } Static178.anInt4247 = 0; } diff --git a/client/src/main/java/Static127.java b/client/src/main/java/Static127.java index 6751c25..b27d335 100644 --- a/client/src/main/java/Static127.java +++ b/client/src/main/java/Static127.java @@ -11,9 +11,6 @@ public final class Static127 { @OriginalMember(owner = "client!k", name = "l", descriptor = "[I") public static int[] anIntArray292; - @OriginalMember(owner = "client!k", name = "c", descriptor = "Z") - public static boolean aBoolean159 = false; - @OriginalMember(owner = "client!k", name = "i", descriptor = "I") public static int anInt3125 = 0; @@ -25,18 +22,18 @@ public final class Static127 { @OriginalMember(owner = "client!k", name = "a", descriptor = "(IIBLclient!ve;Lclient!ve;)Lclient!rk;") public static Font method2462(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1, @OriginalArg(4) Js5 arg2) { - return Static234.method4016(arg1, 0, arg0) ? Static29.method799(arg2.getFile(arg0, 0)) : null; + return SpriteLoader.decode(arg1, 0, arg0) ? Static29.method799(arg2.getFile(arg0, 0)) : null; } @OriginalMember(owner = "client!k", name = "a", descriptor = "(IIIIZIZ)V") public static void method2463(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean arg4, @OriginalArg(5) int arg5) { - if (Static80.anInt4701 == arg2 && arg1 == Static52.anInt1695 && (Static41.anInt1316 == arg0 || Static138.allLevelsAreVisible())) { + if (Static80.anInt4701 == arg2 && arg1 == Static52.anInt1695 && (Static41.anInt1316 == arg0 || SceneGraph.allLevelsAreVisible())) { return; } Static80.anInt4701 = arg2; Static52.anInt1695 = arg1; Static41.anInt1316 = arg0; - if (Static138.allLevelsAreVisible()) { + if (SceneGraph.allLevelsAreVisible()) { Static41.anInt1316 = 0; } if (arg4) { @@ -52,7 +49,7 @@ public final class Static127 { Static158.aClass3_Sub2_Sub4_3 = Static29.method803(Static80.anInt4701 * 8, Static52.anInt1695 * 8); @Pc(81) int local81 = Static142.originZ - local53; @Pc(86) int local86 = Static225.originX - local55; - Static235.mapFunctionGroup = null; + Static235.mapElementList = null; @Pc(96) int local96; @Pc(103) Npc local103; @Pc(109) int local109; @@ -100,7 +97,7 @@ public final class Static127 { } } Static55.level = arg0; - Static173.self.method1265(arg5, false, arg3); + PlayerList.self.method1265(arg5, false, arg3); @Pc(322) byte local322 = 104; @Pc(324) byte local324 = 0; @Pc(326) byte local326 = 0; @@ -162,14 +159,14 @@ public final class Static127 { @OriginalMember(owner = "client!k", name = "a", descriptor = "(B)Lclient!da;") public static DelayedStateChange poll() { - @Pc(10) DelayedStateChange local10 = (DelayedStateChange) Static215.serverQueue.method795(); + @Pc(10) DelayedStateChange local10 = (DelayedStateChange) DelayedStateChange.serverQueue.method795(); if (local10 != null) { local10.unlink(); local10.method4365(); return local10; } do { - local10 = (DelayedStateChange) Static140.clientQueue.method795(); + local10 = (DelayedStateChange) DelayedStateChange.clientQueue.method795(); if (local10 == null) { return null; } @@ -207,7 +204,7 @@ public final class Static127 { if (local14 == -1) { return arg1; } - @Pc(246) JagString local246 = Static186.EMPTY; + @Pc(246) JagString local246 = JagString.EMPTY; if (Static232.aClass212_5 != null) { local246 = Static181.method3341(Static232.aClass212_5.intArg2); try { @@ -218,22 +215,22 @@ public final class Static127 { } catch (@Pc(274) UnsupportedEncodingException local274) { } } - arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), local246, arg1.substring(local14 + 4) }); + arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), local246, arg1.substring(local14 + 4) }); } } - arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(4, arg0)), arg1.substring(local14 + 2) }); + arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(4, arg0)), arg1.substring(local14 + 2) }); } } - arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(3, arg0)), arg1.substring(local14 + 2) }); + arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(3, arg0)), arg1.substring(local14 + 2) }); } } - arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(2, arg0)), arg1.substring(local14 + 2) }); + arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(2, arg0)), arg1.substring(local14 + 2) }); } } - arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(1, arg0)), arg1.substring(local14 + 2) }); + arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(1, arg0)), arg1.substring(local14 + 2) }); } } - arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(0, arg0)), arg1.substring(local14 + 2) }); + arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(0, arg0)), arg1.substring(local14 + 2) }); } } @@ -250,7 +247,7 @@ public final class Static127 { } local29 = Runtime.getRuntime(); local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L); - Static103.method2231(null, 0, Static34.concatenate(new JagString[] { Static202.aClass100_892, Static123.parseInt(local38), Static17.aClass100_101 })); + Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Static202.aClass100_892, Static123.parseInt(local38), Static17.aClass100_101 })); } @Pc(117) int local117; if (arg0.equalsIgnoreCase(Static154.aClass100_735)) { @@ -260,36 +257,36 @@ public final class Static127 { } local29 = Runtime.getRuntime(); local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L); - Static103.method2231(null, 0, Static34.concatenate(new JagString[] { Static203.aClass100_893, Static123.parseInt(local38), Static17.aClass100_101 })); + Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Static203.aClass100_893, Static123.parseInt(local38), Static17.aClass100_101 })); Static16.method501(); Static119.method2380(); for (local117 = 0; local117 < 10; local117++) { System.gc(); } local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L); - Static103.method2231(null, 0, Static34.concatenate(new JagString[] { Static270.aClass100_1093, Static123.parseInt(local38), Static17.aClass100_101 })); + Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Static270.aClass100_1093, Static123.parseInt(local38), Static17.aClass100_101 })); } if (arg0.equalsIgnoreCase(Static240.aClass100_1009)) { - Static103.method2231(null, 0, Static34.concatenate(new JagString[] { Static44.aClass100_335, Static123.parseInt(Static198.method1029()) })); + Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Static44.aClass100_335, Static123.parseInt(Static198.method1029()) })); } if (GlRenderer.enabled && arg0.equalsIgnoreCase(Static201.aClass100_406)) { System.out.println("oncard_geometry:" + Static63.anInt1945); System.out.println("oncard_2d:" + Static63.onCard2d); System.out.println("oncard_texture:" + Static63.onCardTexture); } - if (arg0.equalsIgnoreCase(Static257.aClass100_99)) { + if (arg0.equalsIgnoreCase(Cheat.CLIENTDROP)) { Static175.method3279(); } if (arg0.equalsIgnoreCase(Static279.aClass100_1106)) { - Static107.js5NetQueue.quit(); + client.js5NetQueue.quit(); } - if (arg0.equalsIgnoreCase(Static185.aClass100_823)) { - Static107.js5NetQueue.method2319(); + if (arg0.equalsIgnoreCase(Cheat.JS5DROP)) { + client.js5NetQueue.method2319(); } if (arg0.equalsIgnoreCase(Static165.aClass100_775)) { GameShell.signLink.breakConnection(); - Static124.socket.breakConnection(); - Static107.js5NetQueue.method2323(); + Protocol.socket.breakConnection(); + client.js5NetQueue.method2323(); } if (arg0.equalsIgnoreCase(Static114.aClass100_1100)) { GameShell.replaceCanvas = true; @@ -298,10 +295,10 @@ public final class Static127 { Static196.setGameState(25); } if (arg0.equalsIgnoreCase(Static107.aClass100_566)) { - Static43.displayFps = true; + Cheat.displayFps = true; } if (arg0.equalsIgnoreCase(Static61.aClass100_422)) { - Static43.displayFps = false; + Cheat.displayFps = false; } if (arg0.equalsIgnoreCase(Static96.aClass100_522)) { Static241.setWindowMode(false, 0, -1, -1); @@ -325,11 +322,11 @@ public final class Static127 { } } if (arg0.startsWith(Static241.aClass100_1088)) { - Static76.setParticles(arg0.substring(15).parseInt()); - Static203.savePreferences(GameShell.signLink); + Preferences.setParticles(arg0.substring(15).parseInt()); + Preferences.write(GameShell.signLink); Static18.serverUpdatedPreferences = false; } - if (arg0.startsWith(Static170.aClass100_623) && Static83.modeWhere != 0) { + if (arg0.startsWith(Static170.aClass100_623) && client.modeWhere != 0) { Static115.method2312(arg0.substring(6).parseInt()); } if (arg0.equalsIgnoreCase(Static272.aClass100_990)) { @@ -337,7 +334,7 @@ public final class Static127 { } if (arg0.startsWith(Static211.aClass100_232)) { Static199.rectDebug = arg0.substring(12).method3144().parseInt(); - Static103.method2231(null, 0, Static34.concatenate(new JagString[] { Static276.aClass100_1096, Static123.parseInt(Static199.rectDebug) })); + Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Static276.aClass100_1096, Static123.parseInt(Static199.rectDebug) })); } if (arg0.equalsIgnoreCase(Static181.aClass100_810)) { Static121.aBoolean154 = true; @@ -356,7 +353,7 @@ public final class Static127 { Static154.aClass100_736.method3129(); Static172.shiftClick = false; } else { - Static43.aClass100_333.method3129(); + Cheat.aClass100_333.method3129(); Static172.shiftClick = true; } } diff --git a/client/src/main/java/Static128.java b/client/src/main/java/Static128.java index c06beb4..a929cfe 100644 --- a/client/src/main/java/Static128.java +++ b/client/src/main/java/Static128.java @@ -7,10 +7,7 @@ public final class Static128 { @OriginalMember(owner = "client!ka", name = "r", descriptor = "[I") public static int[] anIntArray293; - @OriginalMember(owner = "client!ka", name = "u", descriptor = "I") - public static int anInt3143; - - @OriginalMember(owner = "client!ka", name = "q", descriptor = "Lclient!ih;") + @OriginalMember(owner = "client!ka", name = "q", descriptor = "Lclient!ih;") public static final LinkedList aClass69_77 = new LinkedList(); @OriginalMember(owner = "client!ka", name = "t", descriptor = "[I") diff --git a/client/src/main/java/Static13.java b/client/src/main/java/Static13.java index 9843312..cb23757 100644 --- a/client/src/main/java/Static13.java +++ b/client/src/main/java/Static13.java @@ -1,17 +1,10 @@ -import java.awt.Color; -import java.awt.Font; -import java.awt.Graphics; - import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; public final class Static13 { - @OriginalMember(owner = "client!bc", name = "W", descriptor = "I") - public static int anInt435; - - @OriginalMember(owner = "client!bc", name = "X", descriptor = "I") + @OriginalMember(owner = "client!bc", name = "X", descriptor = "I") public static int anInt436; @OriginalMember(owner = "client!bc", name = "Z", descriptor = "I") @@ -27,16 +20,16 @@ public final class Static13 { public static JagString method471() { @Pc(32) JagString local32; if (Static260.anInt5014 == 1 && Static231.anInt5204 < 2) { - local32 = Static34.concatenate(new JagString[] { LocalizedText.USE, LocalizedText.MINISEPARATOR, Static34.aClass100_203, Static225.aClass100_961 }); + local32 = JagString.concatenate(new JagString[] { LocalizedText.USE, LocalizedText.MINISEPARATOR, Static34.aClass100_203, Static225.aClass100_961 }); } else if (Static241.aBoolean302 && Static231.anInt5204 < 2) { - local32 = Static34.concatenate(new JagString[] { Static102.aClass100_545, LocalizedText.MINISEPARATOR, Static78.aClass100_466, Static225.aClass100_961 }); + local32 = JagString.concatenate(new JagString[] { Static102.aClass100_545, LocalizedText.MINISEPARATOR, Static78.aClass100_466, Static225.aClass100_961 }); } else if (Static172.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && Static231.anInt5204 > 2) { local32 = Static269.method2228(Static231.anInt5204 - 2); } else { local32 = Static269.method2228(Static231.anInt5204 - 1); } if (Static231.anInt5204 > 2) { - local32 = Static34.concatenate(new JagString[] { local32, Static1.aClass100_2, Static123.parseInt(Static231.anInt5204 - 2), LocalizedText.MOREOPTIONS}); + local32 = JagString.concatenate(new JagString[] { local32, Static1.aClass100_2, Static123.parseInt(Static231.anInt5204 - 2), LocalizedText.MOREOPTIONS}); } return local32; } @@ -49,56 +42,4 @@ public final class Static13 { } } - @OriginalMember(owner = "client!bc", name = "a", descriptor = "(Ljava/awt/Color;ZZLclient!na;I)V") - public static void render(@OriginalArg(0) Color arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) JagString arg2, @OriginalArg(4) int arg3) { - try { - @Pc(6) Graphics local6 = GameShell.canvas.getGraphics(); - if (Static222.aFont1 == null) { - Static222.aFont1 = new Font("Helvetica", 1, 13); - Static240.aFontMetrics1 = GameShell.canvas.getFontMetrics(Static222.aFont1); - } - if (arg1) { - local6.setColor(Color.black); - local6.fillRect(0, 0, GameShell.canvasWidth, GameShell.canvasHeight); - } - if (arg0 == null) { - arg0 = new Color(140, 17, 17); - } - try { - if (Static149.anImage3 == null) { - Static149.anImage3 = GameShell.canvas.createImage(304, 34); - } - @Pc(56) Graphics local56 = Static149.anImage3.getGraphics(); - local56.setColor(arg0); - local56.drawRect(0, 0, 303, 33); - local56.fillRect(2, 2, arg3 * 3, 30); - local56.setColor(Color.black); - local56.drawRect(1, 1, 301, 31); - local56.fillRect(arg3 * 3 + 2, 2, 300 - arg3 * 3, 30); - local56.setFont(Static222.aFont1); - local56.setColor(Color.white); - arg2.method3112(22, (304 - arg2.method3155(Static240.aFontMetrics1)) / 2, local56); - local6.drawImage(Static149.anImage3, GameShell.canvasWidth / 2 - 152, GameShell.canvasHeight / 2 + -18, null); - } catch (@Pc(134) Exception local134) { - @Pc(140) int local140 = GameShell.canvasWidth / 2 - 152; - @Pc(146) int local146 = GameShell.canvasHeight / 2 - 18; - local6.setColor(arg0); - local6.drawRect(local140, local146, 303, 33); - local6.fillRect(local140 + 2, local146 + 2, arg3 * 3, 30); - local6.setColor(Color.black); - local6.drawRect(local140 + 1, local146 - -1, 301, 31); - local6.fillRect(arg3 * 3 + local140 + 2, local146 + 2, 300 - arg3 * 3, 30); - local6.setFont(Static222.aFont1); - local6.setColor(Color.white); - arg2.method3112(local146 + 22, local140 + (-arg2.method3155(Static240.aFontMetrics1) + 304) / 2, local6); - } - if (Static278.mainLoadPrimaryText != null) { - local6.setFont(Static222.aFont1); - local6.setColor(Color.white); - Static278.mainLoadPrimaryText.method3112(GameShell.canvasHeight / 2 - 26, GameShell.canvasWidth / 2 - Static278.mainLoadPrimaryText.method3155(Static240.aFontMetrics1) / 2, local6); - } - } catch (@Pc(252) Exception local252) { - GameShell.canvas.repaint(); - } - } } diff --git a/client/src/main/java/Static130.java b/client/src/main/java/Static130.java index f269bce..edc3bff 100644 --- a/client/src/main/java/Static130.java +++ b/client/src/main/java/Static130.java @@ -3,29 +3,20 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static130 { - @OriginalMember(owner = "client!kc", name = "n", descriptor = "Lclient!fd;") - public static WorldMapFont aClass41_1; - @OriginalMember(owner = "client!kc", name = "o", descriptor = "[[[Lclient!bj;") public static Tile[][][] aClass3_Sub5ArrayArrayArray1; @OriginalMember(owner = "client!kc", name = "p", descriptor = "[I") public static int[] anIntArray299; - @OriginalMember(owner = "client!kc", name = "t", descriptor = "I") - public static int anInt3161; - - @OriginalMember(owner = "client!kc", name = "w", descriptor = "Lclient!ve;") + @OriginalMember(owner = "client!kc", name = "w", descriptor = "Lclient!ve;") public static Js5 js5Archive6; - @OriginalMember(owner = "client!kc", name = "C", descriptor = "Lclient!fd;") - public static WorldMapFont aClass41_2; - @OriginalMember(owner = "client!kc", name = "s", descriptor = "[I") public static final int[] anIntArray300 = new int[] { 1, 1, 1, 1, 4, 1, 1, 5, 6, 1, 5, 0, 7, 0, 4, 1, 7, 2, 1, 1, 6, 1, 1, 3, 6, 1, 7, 0, 0, 6, 7, 0, 1, 7, 6, 1, 1, 1, 5, 4, 3, 2, 1, 1, 0, 4, 1, 5 }; @OriginalMember(owner = "client!kc", name = "a", descriptor = "(ILclient!ve;I)Lclient!qf;") public static Sprite loadSpriteAutoDetect(@OriginalArg(1) Js5 arg0, @OriginalArg(2) int arg1) { - return Static254.method4346(arg0, arg1) ? Static82.method1764() : null; + return SpriteLoader.decode(arg0, arg1) ? SpriteLoader.method1764() : null; } } diff --git a/client/src/main/java/Static131.java b/client/src/main/java/Static131.java index 781ec6e..3b68676 100644 --- a/client/src/main/java/Static131.java +++ b/client/src/main/java/Static131.java @@ -8,19 +8,13 @@ public final class Static131 { @OriginalMember(owner = "client!kd", name = "ub", descriptor = "I") public static int anInt3255; - @OriginalMember(owner = "client!kd", name = "Cb", descriptor = "I") - public static int anInt3261; - - @OriginalMember(owner = "client!kd", name = "mb", descriptor = "[Lclient!cl;") + @OriginalMember(owner = "client!kd", name = "mb", descriptor = "[Lclient!cl;") public static final AnimFrameset[] aClass3_Sub2_Sub7Array5 = new AnimFrameset[14]; @OriginalMember(owner = "client!kd", name = "ob", descriptor = "I") public static int anInt3251 = 0; - @OriginalMember(owner = "client!kd", name = "rb", descriptor = "I") - public static final int anInt3254 = (int) (Math.random() * 17.0D) - 8; - - @OriginalMember(owner = "client!kd", name = "sb", descriptor = "[I") + @OriginalMember(owner = "client!kd", name = "sb", descriptor = "[I") public static final int[] anIntArray307 = new int[] { 1, 1, 0, 0, 0, 8, 0, 0, 8 }; @OriginalMember(owner = "client!kd", name = "yb", descriptor = "S") @@ -61,12 +55,6 @@ public final class Static131 { } } - @OriginalMember(owner = "client!kd", name = "a", descriptor = "(Ljava/lang/String;B)V") - public static void method2577(@OriginalArg(0) String arg0) { - System.out.println("Bad " + arg0 + ", Usage: worldid, , , "); - System.exit(1); - } - @OriginalMember(owner = "client!kd", name = "a", descriptor = "([[F[[II[[FI[ILclient!fj;BLclient!gi;[[FI)V") public static void method2578(@OriginalArg(0) float[][] arg0, @OriginalArg(1) int[][] arg1, @OriginalArg(2) int arg2, @OriginalArg(3) float[][] arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int[] arg5, @OriginalArg(6) Class45 arg6, @OriginalArg(8) Light arg7, @OriginalArg(9) float[][] arg8, @OriginalArg(10) int arg9) { @Pc(7) int[] local7 = new int[arg5.length / 2]; @@ -146,8 +134,4 @@ public final class Static131 { } } - @OriginalMember(owner = "client!kd", name = "a", descriptor = "(IIILclient!ve;)[Lclient!qf;") - public static Sprite[] method2580(@OriginalArg(2) int arg0, @OriginalArg(3) Js5 arg1) { - return Static234.method4016(arg1, 0, arg0) ? Static33.method870() : null; - } } diff --git a/client/src/main/java/Static132.java b/client/src/main/java/Static132.java index 4fe15ce..fb97544 100644 --- a/client/src/main/java/Static132.java +++ b/client/src/main/java/Static132.java @@ -41,9 +41,9 @@ public final class Static132 { Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436); } else { Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436); - local43 = Static280.aClass3_Sub2_Sub9_43.getStringWidth(LocalizedText.CHOOSE_OPTION); + local43 = Fonts.b12Full.getStringWidth(LocalizedText.CHOOSE_OPTION); for (@Pc(75) int local75 = 0; local75 < Static231.anInt5204; local75++) { - @Pc(88) int local88 = Static280.aClass3_Sub2_Sub9_43.getStringWidth(Static269.method2228(local75)); + @Pc(88) int local88 = Fonts.b12Full.getStringWidth(Static269.method2228(local75)); if (local43 < local88) { local43 = local88; } @@ -51,8 +51,8 @@ public final class Static132 { Static13.anInt436 = Static231.anInt5204 * 15 + (Static261.aBoolean298 ? 26 : 22); Static24.anInt761 = local43 + 8; } - if (Static154.topLevelInterface != -1) { - Static54.method1304(1, Static154.topLevelInterface); + if (InterfaceList.topLevelInterface != -1) { + Static54.method1304(1, InterfaceList.topLevelInterface); } } @@ -97,10 +97,10 @@ public final class Static132 { @Pc(21) int local21 = local20 = local7 + 128; @Pc(26) int local26; @Pc(27) int local27 = local26 = local15 + 128; - @Pc(37) int local37 = Static83.activeTileHeightMap[arg1][arg6][arg7] - Static162.anInt3947; - @Pc(49) int local49 = Static83.activeTileHeightMap[arg1][arg6 + 1][arg7] - Static162.anInt3947; - @Pc(63) int local63 = Static83.activeTileHeightMap[arg1][arg6 + 1][arg7 + 1] - Static162.anInt3947; - @Pc(75) int local75 = Static83.activeTileHeightMap[arg1][arg6][arg7 + 1] - Static162.anInt3947; + @Pc(37) int local37 = Static83.activeTileHeightMap[arg1][arg6][arg7] - Static123.anInt3947; + @Pc(49) int local49 = Static83.activeTileHeightMap[arg1][arg6 + 1][arg7] - Static123.anInt3947; + @Pc(63) int local63 = Static83.activeTileHeightMap[arg1][arg6 + 1][arg7 + 1] - Static123.anInt3947; + @Pc(75) int local75 = Static83.activeTileHeightMap[arg1][arg6][arg7 + 1] - Static123.anInt3947; @Pc(85) int local85 = local15 * arg4 + local7 * arg5 >> 16; @Pc(95) int local95 = local15 * arg5 - local7 * arg4 >> 16; @Pc(97) int local97 = local85; @@ -160,7 +160,7 @@ public final class Static132 { if (arg0.anInt4865 != 12345678) { Rasteriser.fillGouraudTriangle(local315, local331, local299, local307, local323, local291, arg0.anInt4865, arg0.anInt4864, arg0.anInt4867); } - } else if (!Static159.manyGroundTextures) { + } else if (!Preferences.manyGroundTextures) { local475 = Rasteriser.textureProvider.getAverageColor(arg0.anInt4869); Rasteriser.fillGouraudTriangle(local315, local331, local299, local307, local323, local291, Static216.method1640(local475, arg0.anInt4865), Static216.method1640(local475, arg0.anInt4864), Static216.method1640(local475, arg0.anInt4867)); } else if (arg0.aBoolean241) { @@ -188,7 +188,7 @@ public final class Static132 { if (arg0.anInt4872 != 12345678) { Rasteriser.fillGouraudTriangle(local283, local299, local331, local275, local291, local323, arg0.anInt4872, arg0.anInt4867, arg0.anInt4864); } - } else if (Static159.manyGroundTextures) { + } else if (Preferences.manyGroundTextures) { Rasteriser.fillTexturedTriangle(local283, local299, local331, local275, local291, local323, arg0.anInt4872, arg0.anInt4867, arg0.anInt4864, local97, local21, local241, local119, local49, local85, local117, local165, local261, arg0.anInt4869); } else { local475 = Rasteriser.textureProvider.getAverageColor(arg0.anInt4869); diff --git a/client/src/main/java/Static133.java b/client/src/main/java/Static133.java index 2431a54..62e2033 100644 --- a/client/src/main/java/Static133.java +++ b/client/src/main/java/Static133.java @@ -16,9 +16,6 @@ public final class Static133 { @OriginalMember(owner = "client!kf", name = "h", descriptor = "[I") public static final int[] anIntArray453 = new int[] { 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3 }; - @OriginalMember(owner = "client!kf", name = "j", descriptor = "I") - public static final int anInt5233 = 0; - @OriginalMember(owner = "client!kf", name = "l", descriptor = "I") public static int anInt5235 = 0; @@ -45,8 +42,8 @@ public final class Static133 { @OriginalMember(owner = "client!kf", name = "a", descriptor = "(Lclient!na;I)V") public static void method4011(@OriginalArg(0) JagString arg0) { for (@Pc(15) Map local15 = (Map) Static228.aClass69_120.method2289(); local15 != null; local15 = (Map) Static228.aClass69_120.method2288()) { - if (local15.aClass100_138.strEquals(arg0)) { - Static269.aClass3_Sub2_Sub4_2 = local15; + if (local15.group.strEquals(arg0)) { + WorldMap.currentMap = local15; return; } } @@ -54,7 +51,7 @@ public final class Static133 { @OriginalMember(owner = "client!kf", name = "a", descriptor = "(IIBII)V") public static void method4012(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { - for (@Pc(12) int local12 = 0; local12 < Static24.anInt766; local12++) { + for (@Pc(12) int local12 = 0; local12 < InterfaceList.anInt766; local12++) { if (Static224.anIntArray443[local12] + Static264.anIntArray410[local12] > arg0 && arg1 + arg0 > Static264.anIntArray410[local12] && arg2 < Static67.anIntArray320[local12] + Static50.anIntArray133[local12] && Static50.anIntArray133[local12] < arg2 + arg3) { Static186.aBooleanArray100[local12] = true; } diff --git a/client/src/main/java/Static134.java b/client/src/main/java/Static134.java index 8b0d8ee..b403651 100644 --- a/client/src/main/java/Static134.java +++ b/client/src/main/java/Static134.java @@ -12,8 +12,8 @@ public final class Static134 { @OriginalMember(owner = "client!kh", name = "a", descriptor = "(B)Lclient!ek;") public static SoftwareIndexedSprite method2619() { - @Pc(25) SoftwareIndexedSprite local25 = new SoftwareIndexedSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], Static7.aByteArrayArray5[0], Static259.anIntArray513); - Static75.method1631(); + @Pc(25) SoftwareIndexedSprite local25 = new SoftwareIndexedSprite(SpriteLoader.width, SpriteLoader.height, SpriteLoader.xOffsets[0], SpriteLoader.yOffsets[0], SpriteLoader.innerWidths[0], SpriteLoader.innerHeights[0], SpriteLoader.pixels[0], SpriteLoader.palette); + SpriteLoader.clear(); return local25; } diff --git a/client/src/main/java/Static136.java b/client/src/main/java/Static136.java index 6d458ad..f4a0ad7 100644 --- a/client/src/main/java/Static136.java +++ b/client/src/main/java/Static136.java @@ -23,122 +23,6 @@ public final class Static136 { local4.intArg1 = arg0; } - @OriginalMember(owner = "client!kk", name = "b", descriptor = "(Lclient!wa;I)V") - public static void method2654(@OriginalArg(0) Buffer arg0) { - if (arg0.data.length - arg0.offset < 1) { - return; - } - @Pc(21) int local21 = arg0.g1(); - if (local21 < 0 || local21 > 11) { - return; - } - @Pc(34) byte local34; - if (local21 == 11) { - local34 = 33; - } else if (local21 == 10) { - local34 = 32; - } else if (local21 == 9) { - local34 = 31; - } else if (local21 == 8) { - local34 = 30; - } else if (local21 == 7) { - local34 = 29; - } else if (local21 == 6) { - local34 = 28; - } else if (local21 == 5) { - local34 = 28; - } else if (local21 == 4) { - local34 = 24; - } else if (local21 == 3) { - local34 = 23; - } else if (local21 == 2) { - local34 = 22; - } else if (local21 == 1) { - local34 = 23; - } else { - local34 = 19; - } - if (arg0.data.length - arg0.offset < local34) { - return; - } - Static113.brightness = arg0.g1(); - if (Static113.brightness < 1) { - Static113.brightness = 1; - } else if (Static113.brightness > 4) { - Static113.brightness = 4; - } - Static53.setAllVisibleLevels(arg0.g1() == 1); - Static80.removeRoofsSelectively = arg0.g1() == 1; - Static250.showGroundDecorations = arg0.g1() == 1; - Static53.highDetailTextures = arg0.g1() == 1; - Static15.manyIdleAnimations = arg0.g1() == 1; - Static11.flickeringEffectsOn = arg0.g1() == 1; - Static159.manyGroundTextures = arg0.g1() == 1; - Static209.characterShadowsOn = arg0.g1() == 1; - Static139.sceneryShadowsType = arg0.g1(); - if (Static139.sceneryShadowsType > 2) { - Static139.sceneryShadowsType = 2; - } - if (local21 < 2) { - Static178.highDetailLighting = arg0.g1() == 1; - arg0.g1(); - } else { - Static178.highDetailLighting = arg0.g1() == 1; - } - Static220.highWaterDetail = arg0.g1() == 1; - Static71.fogEnabled = arg0.g1() == 1; - Static102.windowMode = arg0.g1(); - if (Static102.windowMode > 2) { - Static102.windowMode = 2; - } - Static186.antiAliasingMode = Static102.windowMode; - Static99.stereo = arg0.g1() == 1; - Static125.soundEffectVolume = arg0.g1(); - if (Static125.soundEffectVolume > 127) { - Static125.soundEffectVolume = 127; - } - Static12.musicVolume = arg0.g1(); - Static30.ambientSoundsVolume = arg0.g1(); - if (Static30.ambientSoundsVolume > 127) { - Static30.ambientSoundsVolume = 127; - } - if (local21 >= 1) { - Static114.anInt5831 = arg0.g2(); - Static22.anInt729 = arg0.g2(); - } - if (local21 >= 3 && local21 < 6) { - arg0.g1(); - } - if (local21 >= 4) { - @Pc(386) int local386 = arg0.g1(); - if (GameShell.maxMemory < 96) { - local386 = 0; - } - Static76.setParticles(local386); - } - if (local21 >= 5) { - Static164.lastWorldId = arg0.g4(); - } - if (local21 >= 6) { - Static214.windowMode = arg0.g1(); - } - if (local21 >= 7) { - Static164.safeMode = arg0.g1() == 1; - } - if (local21 >= 8) { - Static33.aBoolean63 = arg0.g1() == 1; - } - if (local21 >= 9) { - Static141.buildArea = arg0.g1(); - } - if (local21 >= 10) { - Static127.aBoolean159 = arg0.g1() != 0; - } - if (local21 >= 11) { - Static64.cursorsEnabled = arg0.g1() != 0; - } - } - @OriginalMember(owner = "client!kk", name = "a", descriptor = "(I)Z") public static boolean method2655() { return Static14.anInt441 == 0 ? Static172.aClass3_Sub3_Sub4_2.method4414() : true; diff --git a/client/src/main/java/Static137.java b/client/src/main/java/Static137.java index 86ed6bf..2e9d70e 100644 --- a/client/src/main/java/Static137.java +++ b/client/src/main/java/Static137.java @@ -53,14 +53,14 @@ public final class Static137 { @Pc(169) long local169 = Static20.method602(Static55.level, local37 + 0, local76); if (local169 != 0L) { @Pc(184) LocType local184 = Static271.get((int) (local169 >>> 32) & Integer.MAX_VALUE); - @Pc(187) int local187 = local184.anInt4400; + @Pc(187) int local187 = local184.mapElement; @Pc(194) int local194; if (local184.multiLocs != null) { for (local194 = 0; local194 < local184.multiLocs.length; local194++) { if (local184.multiLocs[local194] != -1) { @Pc(216) LocType local216 = Static271.get(local184.multiLocs[local194]); - if (local216.anInt4400 >= 0) { - local187 = local216.anInt4400; + if (local216.mapElement >= 0) { + local187 = local216.mapElement; break; } } @@ -103,17 +103,17 @@ public final class Static137 { for (local76 = 1; local76 < 103; local76++) { if ((Static12.tileSettings[arg0][local76][local37] & 0x18) == 0 && !Static164.method3109(local76, local455, local37, local35, arg0)) { if (GlRenderer.enabled) { - Static129.pixels = null; + SoftwareRaster.pixels = null; } else { - Static260.frameBuffer.makeTarget(); + client.frameBuffer.makeTarget(); } return false; } if (arg0 < 3 && (Static12.tileSettings[arg0 + 1][local76][local37] & 0x8) != 0 && !Static164.method3109(local76, local455, local37, local35, arg0 + 1)) { if (GlRenderer.enabled) { - Static129.pixels = null; + SoftwareRaster.pixels = null; } else { - Static260.frameBuffer.makeTarget(); + client.frameBuffer.makeTarget(); } return false; } @@ -132,9 +132,9 @@ public final class Static137 { Static89.aClass3_Sub2_Sub1_5 = Static56.aClass3_Sub2_Sub1_Sub1_1; } if (GlRenderer.enabled) { - Static129.pixels = null; + SoftwareRaster.pixels = null; } else { - Static260.frameBuffer.makeTarget(); + client.frameBuffer.makeTarget(); } Static56.aClass3_Sub2_Sub1_Sub1_1 = null; return true; diff --git a/client/src/main/java/Static138.java b/client/src/main/java/Static138.java index c603f58..5ba2680 100644 --- a/client/src/main/java/Static138.java +++ b/client/src/main/java/Static138.java @@ -4,12 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static138 { - @OriginalMember(owner = "client!km", name = "sc", descriptor = "[Lclient!qf;") - public static Sprite[] aClass3_Sub2_Sub1Array5; - - @OriginalMember(owner = "client!km", name = "uc", descriptor = "F") - public static float aFloat14; - @OriginalMember(owner = "client!km", name = "Nc", descriptor = "Lclient!ve;") public static Js5 js5Archive17; @@ -102,43 +96,4 @@ public final class Static138 { } } - @OriginalMember(owner = "client!km", name = "f", descriptor = "(I)Z") - public static boolean allLevelsAreVisible() { - return GlRenderer.enabled ? true : Static162.aBoolean190; - } - - @OriginalMember(owner = "client!km", name = "c", descriptor = "(Z)Z") - public static boolean method2699() { - try { - if (Static14.anInt441 == 2) { - if (Static144.aClass3_Sub29_1 == null) { - Static144.aClass3_Sub29_1 = Static291.method3742(Static172.aClass153_70, Static277.anInt5853, Static226.anInt5085); - if (Static144.aClass3_Sub29_1 == null) { - return false; - } - } - if (Static27.aClass89_1 == null) { - Static27.aClass89_1 = new SoundBank(Static78.aClass153_32, Static252.aClass153_103); - } - if (Static172.aClass3_Sub3_Sub4_2.method4411(Static144.aClass3_Sub29_1, Static210.aClass153_87, Static27.aClass89_1)) { - Static172.aClass3_Sub3_Sub4_2.method4412(); - Static172.aClass3_Sub3_Sub4_2.method4447(Static253.anInt5527); - Static172.aClass3_Sub3_Sub4_2.method4431(Static72.aBoolean116, Static144.aClass3_Sub29_1); - Static14.anInt441 = 0; - Static144.aClass3_Sub29_1 = null; - Static27.aClass89_1 = null; - Static172.aClass153_70 = null; - return true; - } - } - } catch (@Pc(68) Exception local68) { - local68.printStackTrace(); - Static172.aClass3_Sub3_Sub4_2.method4446(); - Static172.aClass153_70 = null; - Static144.aClass3_Sub29_1 = null; - Static14.anInt441 = 0; - Static27.aClass89_1 = null; - } - return false; - } } diff --git a/client/src/main/java/Static139.java b/client/src/main/java/Static139.java index 7ef28c4..1629e1a 100644 --- a/client/src/main/java/Static139.java +++ b/client/src/main/java/Static139.java @@ -8,9 +8,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static139 { - @OriginalMember(owner = "client!l", name = "j", descriptor = "[Lclient!qf;") - public static Sprite[] aClass3_Sub2_Sub1Array6; - @OriginalMember(owner = "client!l", name = "l", descriptor = "[I") public static int[] anIntArray325; @@ -23,10 +20,7 @@ public final class Static139 { @OriginalMember(owner = "client!l", name = "f", descriptor = "Lclient!n;") public static final SoftLruHashTable aClass99_22 = new SoftLruHashTable(4); - @OriginalMember(owner = "client!l", name = "k", descriptor = "I") - public static int sceneryShadowsType = 2; - - @OriginalMember(owner = "client!l", name = "a", descriptor = "(III)J") + @OriginalMember(owner = "client!l", name = "a", descriptor = "(III)J") public static long method2703(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { @Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2]; return local7 == null || local7.aClass24_1 == null ? 0L : local7.aClass24_1.key; diff --git a/client/src/main/java/Static14.java b/client/src/main/java/Static14.java index 5e79d36..a37d146 100644 --- a/client/src/main/java/Static14.java +++ b/client/src/main/java/Static14.java @@ -13,23 +13,7 @@ public final class Static14 { @OriginalMember(owner = "client!bd", name = "i", descriptor = "I") public static int anInt441 = 0; - @OriginalMember(owner = "client!bd", name = "a", descriptor = "(Z)[Lclient!mm;") - public static SoftwareSprite[] method474() { - @Pc(4) SoftwareSprite[] local4 = new SoftwareSprite[Static165.anInt4038]; - for (@Pc(12) int local12 = 0; local12 < Static165.anInt4038; local12++) { - @Pc(27) int local27 = Static26.anIntArray66[local12] * Static254.anIntArray488[local12]; - @Pc(31) byte[] local31 = Static7.aByteArrayArray5[local12]; - @Pc(34) int[] local34 = new int[local27]; - for (@Pc(36) int local36 = 0; local36 < local27; local36++) { - local34[local36] = Static259.anIntArray513[local31[local36] & 0xFF]; - } - local4[local12] = new SoftwareSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local12], Static269.anIntArray252[local12], Static254.anIntArray488[local12], Static26.anIntArray66[local12], local34); - } - Static75.method1631(); - return local4; - } - - @OriginalMember(owner = "client!bd", name = "a", descriptor = "(BI)V") + @OriginalMember(owner = "client!bd", name = "a", descriptor = "(BI)V") public static void method475(@OriginalArg(1) int arg0) { @Pc(8) Inv local8 = (Inv) Static20.objectContainerCache.get((long) arg0); if (local8 != null) { diff --git a/client/src/main/java/Static140.java b/client/src/main/java/Static140.java index 7516933..a2aa087 100644 --- a/client/src/main/java/Static140.java +++ b/client/src/main/java/Static140.java @@ -8,16 +8,13 @@ public final class Static140 { @OriginalMember(owner = "client!la", name = "i", descriptor = "[[[I") public static int[][][] anIntArrayArrayArray12; - @OriginalMember(owner = "client!la", name = "f", descriptor = "Lclient!ce;") - public static final SecondaryLinkedList clientQueue = new SecondaryLinkedList(); - - @OriginalMember(owner = "client!la", name = "a", descriptor = "(Lclient!wa;Z)V") + @OriginalMember(owner = "client!la", name = "a", descriptor = "(Lclient!wa;Z)V") public static void method2705(@OriginalArg(0) Buffer arg0) { @Pc(15) byte[] local15 = new byte[24]; - if (Static121.uid != null) { + if (client.uid != null) { try { - Static121.uid.seek(0L); - Static121.uid.read(local15); + client.uid.seek(0L); + client.uid.read(local15); @Pc(28) int local28; for (local28 = 0; local28 < 24 && local15[local28] == 0; local28++) { } @@ -53,25 +50,25 @@ public final class Static140 { return; } if (Static35.anInt1093 >= 100) { - Static103.method2231(Static186.EMPTY, 0, LocalizedText.IGNORELISTFULL); + Static103.method2231(JagString.EMPTY, 0, LocalizedText.IGNORELISTFULL); return; } @Pc(34) JagString local34 = Static79.decode37(arg0).method3125(); @Pc(36) int local36; for (local36 = 0; local36 < Static35.anInt1093; local36++) { if (Static190.aLongArray6[local36] == arg0) { - Static103.method2231(Static186.EMPTY, 0, Static34.concatenate(new JagString[] { local34, LocalizedText.IGNORELISTDUPE})); + Static103.method2231(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { local34, LocalizedText.IGNORELISTDUPE})); return; } } for (local36 = 0; local36 < Static9.anInt178; local36++) { if (Static92.aLongArray3[local36] == arg0) { - Static103.method2231(Static186.EMPTY, 0, Static34.concatenate(new JagString[] { LocalizedText.REMOVESOCIAL2, local34, LocalizedText.REMOVEFRIEND})); + Static103.method2231(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { LocalizedText.REMOVESOCIAL2, local34, LocalizedText.REMOVEFRIEND})); return; } } - if (local34.strEquals(Static173.self.aClass100_364)) { - Static103.method2231(Static186.EMPTY, 0, LocalizedText.IGNORECANTADDSELF); + if (local34.strEquals(PlayerList.self.aClass100_364)) { + Static103.method2231(JagString.EMPTY, 0, LocalizedText.IGNORECANTADDSELF); return; } Static190.aLongArray6[Static35.anInt1093] = arg0; @@ -96,22 +93,4 @@ public final class Static140 { return local10; } - @OriginalMember(owner = "client!la", name = "a", descriptor = "(ILclient!na;Lclient!ve;)Lclient!se;") - public static MapFunctionGroup createMapFunctionGroup(@OriginalArg(1) JagString arg0, @OriginalArg(2) Js5 arg1) { - @Pc(10) int local10 = arg1.getGroupId(arg0); - if (local10 == -1) { - return new MapFunctionGroup(0); - } - @Pc(29) int[] local29 = arg1.method4503(local10); - @Pc(35) MapFunctionGroup local35 = new MapFunctionGroup(local29.length); - for (@Pc(37) int local37 = 0; local37 < local35.anInt5074; local37++) { - @Pc(56) Buffer local56 = new Buffer(arg1.getFile(local10, local29[local37])); - local35.aClass100Array153[local37] = local56.gjstr(); - local35.aByteArray69[local37] = local56.g1s(); - local35.aShortArray73[local37] = (short) local56.g2(); - local35.aShortArray72[local37] = (short) local56.g2(); - local35.anIntArray444[local37] = local56.g4(); - } - return local35; - } } diff --git a/client/src/main/java/Static141.java b/client/src/main/java/Static141.java index 4c0626a..e08b38d 100644 --- a/client/src/main/java/Static141.java +++ b/client/src/main/java/Static141.java @@ -16,13 +16,7 @@ public final class Static141 { @OriginalMember(owner = "client!lb", name = "u", descriptor = "I") public static int anInt3469 = 0; - @OriginalMember(owner = "client!lb", name = "v", descriptor = "I") - public static int language = 0; - - @OriginalMember(owner = "client!lb", name = "A", descriptor = "I") - public static int buildArea = 0; - - @OriginalMember(owner = "client!lb", name = "d", descriptor = "(B)V") + @OriginalMember(owner = "client!lb", name = "d", descriptor = "(B)V") public static void method2720() { if (Static153.aClass100_724 != null) { Static90.method1853(Static153.aClass100_724); @@ -57,19 +51,19 @@ public final class Static141 { Static76.method1642(); } Static102.load(Static261.js5Archive13, Static209.js5Archive8); - Static30.load(Static209.js5Archive8); + Sprites.load(Static209.js5Archive8); Static204.aClass3_Sub2_Sub1_10 = null; Static39.aClass3_Sub2_Sub1_1 = null; Static92.aClass3_Sub2_Sub1_6 = null; Static165.aClass3_Sub2_Sub1_8 = null; Static181.aClass3_Sub2_Sub1_9 = null; - if (Static244.gameState == 5) { + if (client.gameState == 5) { Static181.load(Static209.js5Archive8); } - if (Static244.gameState == 10) { + if (client.gameState == 10) { Static73.method1596(false); } - if (Static244.gameState == 30) { + if (client.gameState == 30) { Static196.setGameState(25); } } diff --git a/client/src/main/java/Static142.java b/client/src/main/java/Static142.java index 602ac63..9951d77 100644 --- a/client/src/main/java/Static142.java +++ b/client/src/main/java/Static142.java @@ -10,10 +10,7 @@ public final class Static142 { @OriginalMember(owner = "client!lc", name = "e", descriptor = "Lclient!n;") public static final SoftLruHashTable aClass99_23 = new SoftLruHashTable(64); - @OriginalMember(owner = "client!lc", name = "l", descriptor = "I") - public static int anInt3482 = -1; - - @OriginalMember(owner = "client!lc", name = "m", descriptor = "Lclient!na;") + @OriginalMember(owner = "client!lc", name = "m", descriptor = "Lclient!na;") public static final JagString aClass100_667 = Static28.parse("settings="); @OriginalMember(owner = "client!lc", name = "a", descriptor = "(IIIIIII)V") @@ -29,7 +26,7 @@ public final class Static142 { for (local5 = -1; local5 < Static267.anInt5774 + Static272.anInt5214; local5++) { @Pc(17) PathingEntity local17; if (local5 == -1) { - local17 = Static173.self; + local17 = PlayerList.self; } else if (Static267.anInt5774 > local5) { local17 = Static159.players[Static105.anIntArray256[local5]]; } else { @@ -52,7 +49,7 @@ public final class Static142 { if (local58.multiNpcs != null) { local58 = local58.getMultiNpc(); } - if (local58.prayerIcon >= 0 && Static138.aClass3_Sub2_Sub1Array5.length > local58.prayerIcon) { + if (local58.prayerIcon >= 0 && Sprites.headiconPrayers.length > local58.prayerIcon) { if (local58.anInt3730 == -1) { local265 = local17.method2691() + 15; } else { @@ -60,7 +57,7 @@ public final class Static142 { } Static180.method3326(arg4 >> 1, arg3, local17, arg5, local265, arg1 >> 1); if (Static65.anInt1951 > -1) { - Static138.aClass3_Sub2_Sub1Array5[local58.prayerIcon].method1423(arg2 + Static65.anInt1951 - 12, arg0 + -30 - -Static16.anInt548); + Sprites.headiconPrayers[local58.prayerIcon].method1423(arg2 + Static65.anInt1951 - 12, arg0 + -30 - -Static16.anInt548); } } @Pc(308) Class102[] local308 = Static143.aClass102Array1; @@ -74,7 +71,7 @@ public final class Static142 { } Static180.method3326(arg4 >> 1, arg3, local17, arg5, local359, arg1 >> 1); if (Static65.anInt1951 > -1) { - Static276.aClass3_Sub2_Sub1Array11[local322.anInt4048].method1423(arg2 + Static65.anInt1951 - 12, Static16.anInt548 + -28 + arg0); + Sprites.headhints[local322.anInt4048].method1423(arg2 + Static65.anInt1951 - 12, Static16.anInt548 + -28 + arg0); } } } @@ -85,11 +82,11 @@ public final class Static142 { Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691() + 15, arg1 >> 1); if (Static65.anInt1951 > -1) { if (local77.anInt1669 != -1) { - Static219.aClass3_Sub2_Sub1Array9[local77.anInt1669].method1423(Static65.anInt1951 + arg2 - 12, arg0 + -30 + Static16.anInt548); + Sprites.headiconPks[local77.anInt1669].method1423(Static65.anInt1951 + arg2 - 12, arg0 + -30 + Static16.anInt548); local74 += 25; } if (local77.anInt1649 != -1) { - Static138.aClass3_Sub2_Sub1Array5[local77.anInt1649].method1423(arg2 + Static65.anInt1951 - 12, arg0 - (-Static16.anInt548 + local74)); + Sprites.headiconPrayers[local77.anInt1649].method1423(arg2 + Static65.anInt1951 - 12, arg0 - (-Static16.anInt548 + local74)); local74 += 25; } } @@ -101,7 +98,7 @@ public final class Static142 { if (local173 != null && local173.anInt4058 == 10 && Static105.anIntArray256[local5] == local173.anInt4057) { Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691() + 15, arg1 >> 1); if (Static65.anInt1951 > -1) { - Static276.aClass3_Sub2_Sub1Array11[local173.anInt4048].method1423(arg2 + Static65.anInt1951 - 12, arg0 + (Static16.anInt548 - local74)); + Sprites.headhints[local173.anInt4048].method1423(arg2 + Static65.anInt1951 - 12, arg0 + (Static16.anInt548 - local74)); } } } @@ -110,8 +107,8 @@ public final class Static142 { if (local17.aClass100_640 != null && (local5 >= Static267.anInt5774 || Static59.anInt1812 == 0 || Static59.anInt1812 == 3 || Static59.anInt1812 == 1 && Static98.method1965(((Player) local17).aClass100_364))) { Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691(), arg1 >> 1); if (Static65.anInt1951 > -1 && Static277.anInt5854 < Static191.anInt4506) { - Static191.anIntArray389[Static277.anInt5854] = Static280.aClass3_Sub2_Sub9_43.getStringWidth(local17.aClass100_640) / 2; - Static191.anIntArray387[Static277.anInt5854] = Static280.aClass3_Sub2_Sub9_43.lineHeight; + Static191.anIntArray389[Static277.anInt5854] = Fonts.b12Full.getStringWidth(local17.aClass100_640) / 2; + Static191.anIntArray387[Static277.anInt5854] = Fonts.b12Full.lineHeight; Static191.anIntArray385[Static277.anInt5854] = Static65.anInt1951; Static191.anIntArray392[Static277.anInt5854] = Static16.anInt548; Static191.anIntArray390[Static277.anInt5854] = local17.anInt3429; @@ -122,13 +119,13 @@ public final class Static142 { } } if (local17.anInt3378 > Static83.loop) { - @Pc(508) Sprite local508 = Static116.aClass3_Sub2_Sub1Array3[0]; - @Pc(512) Sprite local512 = Static116.aClass3_Sub2_Sub1Array3[1]; + @Pc(508) Sprite local508 = Sprites.hitbars[0]; + @Pc(512) Sprite local512 = Sprites.hitbars[1]; if (local17 instanceof Npc) { @Pc(518) Npc local518 = (Npc) local17; @Pc(528) Sprite[] local528 = (Sprite[]) Static73.aClass99_10.get((long) local518.type.hitBarId); if (local528 == null) { - local528 = Static209.method3708(local518.type.hitBarId, Static209.js5Archive8); + local528 = SpriteLoader.loadAlphaSprites(local518.type.hitBarId, Static209.js5Archive8); if (local528 != null) { Static73.aClass99_10.put(local528, (long) local518.type.hitBarId); } @@ -156,13 +153,13 @@ public final class Static142 { if (GlRenderer.enabled) { Static46.method1183(local161, local359, local161 + local639, local359 + local642); } else { - Static129.method2498(local161, local359, local161 + local639, local642 + local359); + SoftwareRaster.method2498(local161, local359, local161 + local639, local642 + local359); } local512.method1423(local161, local359); if (GlRenderer.enabled) { Static46.method1187(arg2, arg0, arg1 + arg2, arg0 - -arg4); } else { - Static129.method2496(arg2, arg0, arg1 + arg2, arg4 + arg0); + SoftwareRaster.method2496(arg2, arg0, arg1 + arg2, arg4 + arg0); } } } @@ -192,8 +189,8 @@ public final class Static142 { Static16.anInt548 -= 10; Static65.anInt1951 += 15; } - Static213.aClass3_Sub2_Sub1Array8[local17.anIntArray321[local74]].method1423(arg2 + Static65.anInt1951 - 12, arg0 + Static16.anInt548 - 12); - Static114.aClass3_Sub2_Sub9_42.renderCenter(Static123.parseInt(local17.anIntArray322[local74]), Static65.anInt1951 + arg2 - 1, Static16.anInt548 + 3 + arg0, 16777215, 0); + Sprites.hitmarks[local17.anIntArray321[local74]].method1423(arg2 + Static65.anInt1951 - 12, arg0 + Static16.anInt548 - 12); + Fonts.p11Full.renderCenter(Static123.parseInt(local17.anIntArray322[local74]), Static65.anInt1951 + arg2 - 1, Static16.anInt548 + 3 + arg0, 16777215, 0); } } } @@ -262,53 +259,53 @@ public final class Static142 { } } if (Static191.anIntArray391[local5] == 0) { - Static280.aClass3_Sub2_Sub9_43.renderCenter(local962, Static65.anInt1951 + arg2, arg0 + Static16.anInt548, local639, 0); + Fonts.b12Full.renderCenter(local962, Static65.anInt1951 + arg2, arg0 + Static16.anInt548, local639, 0); } if (Static191.anIntArray391[local5] == 1) { - Static280.aClass3_Sub2_Sub9_43.renderWave(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, Static136.anInt3325); + Fonts.b12Full.renderWave(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, Static136.anInt3325); } if (Static191.anIntArray391[local5] == 2) { - Static280.aClass3_Sub2_Sub9_43.renderWave2(local962, arg2 + Static65.anInt1951, arg0 - -Static16.anInt548, local639, Static136.anInt3325); + Fonts.b12Full.renderWave2(local962, arg2 + Static65.anInt1951, arg0 - -Static16.anInt548, local639, Static136.anInt3325); } if (Static191.anIntArray391[local5] == 3) { - Static280.aClass3_Sub2_Sub9_43.renderShake(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, Static136.anInt3325, 150 - Static191.anIntArray384[local5]); + Fonts.b12Full.renderShake(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, Static136.anInt3325, 150 - Static191.anIntArray384[local5]); } if (Static191.anIntArray391[local5] == 4) { - local642 = (150 - Static191.anIntArray384[local5]) * (Static280.aClass3_Sub2_Sub9_43.getStringWidth(local962) + 100) / 150; + local642 = (150 - Static191.anIntArray384[local5]) * (Fonts.b12Full.getStringWidth(local962) + 100) / 150; if (GlRenderer.enabled) { Static46.method1183(Static65.anInt1951 + arg2 - 50, arg0, Static65.anInt1951 + arg2 + 50, arg4 + arg0); } else { - Static129.method2498(arg2 + Static65.anInt1951 - 50, arg0, Static65.anInt1951 + arg2 + 50, arg4 + arg0); + SoftwareRaster.method2498(arg2 + Static65.anInt1951 - 50, arg0, Static65.anInt1951 + arg2 + 50, arg4 + arg0); } - Static280.aClass3_Sub2_Sub9_43.method2857(local962, arg2 + Static65.anInt1951 + 50 - local642, arg0 + Static16.anInt548, local639, 0); + Fonts.b12Full.method2857(local962, arg2 + Static65.anInt1951 + 50 - local642, arg0 + Static16.anInt548, local639, 0); if (GlRenderer.enabled) { Static46.method1187(arg2, arg0, arg1 + arg2, arg4 + arg0); } else { - Static129.method2496(arg2, arg0, arg2 + arg1, arg0 + arg4); + SoftwareRaster.method2496(arg2, arg0, arg2 + arg1, arg0 + arg4); } } if (Static191.anIntArray391[local5] == 5) { @Pc(1372) int local1372 = 0; local642 = 150 - Static191.anIntArray384[local5]; if (GlRenderer.enabled) { - Static46.method1183(arg2, Static16.anInt548 + arg0 - Static280.aClass3_Sub2_Sub9_43.lineHeight - 1, arg1 + arg2, arg0 + Static16.anInt548 + 5); + Static46.method1183(arg2, Static16.anInt548 + arg0 - Fonts.b12Full.lineHeight - 1, arg1 + arg2, arg0 + Static16.anInt548 + 5); } else { - Static129.method2498(arg2, Static16.anInt548 + arg0 - Static280.aClass3_Sub2_Sub9_43.lineHeight - 1, arg2 + arg1, Static16.anInt548 + arg0 + 5); + SoftwareRaster.method2498(arg2, Static16.anInt548 + arg0 - Fonts.b12Full.lineHeight - 1, arg2 + arg1, Static16.anInt548 + arg0 + 5); } if (local642 < 25) { local1372 = local642 - 25; } else if (local642 > 125) { local1372 = local642 - 125; } - Static280.aClass3_Sub2_Sub9_43.renderCenter(local962, Static65.anInt1951 + arg2, local1372 + arg0 + Static16.anInt548, local639, 0); + Fonts.b12Full.renderCenter(local962, Static65.anInt1951 + arg2, local1372 + arg0 + Static16.anInt548, local639, 0); if (GlRenderer.enabled) { Static46.method1187(arg2, arg0, arg2 + arg1, arg0 + arg4); } else { - Static129.method2496(arg2, arg0, arg2 + arg1, arg0 + arg4); + SoftwareRaster.method2496(arg2, arg0, arg2 + arg1, arg0 + arg4); } } } else { - Static280.aClass3_Sub2_Sub9_43.renderCenter(local962, arg2 + Static65.anInt1951, arg0 + Static16.anInt548, 16776960, 0); + Fonts.b12Full.renderCenter(local962, arg2 + Static65.anInt1951, arg0 + Static16.anInt548, 16776960, 0); } } } diff --git a/client/src/main/java/Static144.java b/client/src/main/java/Static144.java index a6c8939..c98f8ea 100644 --- a/client/src/main/java/Static144.java +++ b/client/src/main/java/Static144.java @@ -1,6 +1,4 @@ -import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; public final class Static144 { @@ -10,256 +8,6 @@ public final class Static144 { @OriginalMember(owner = "client!le", name = "e", descriptor = "I") public static int anInt3490 = 0; - @OriginalMember(owner = "client!le", name = "k", descriptor = "Z") - public static boolean aBoolean173 = false; - - @OriginalMember(owner = "client!le", name = "a", descriptor = "(IIIIIIIIIII)V") - public static void method2735(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) { - @Pc(9) int local9 = arg3 - arg5; - @Pc(14) int local14 = arg1 - arg2; - if (Static48.anInt1449 > arg3) { - local9++; - } - if (Static181.anInt4296 > arg1) { - local14++; - } - @Pc(32) int local32; - @Pc(47) int local47; - @Pc(57) int local57; - @Pc(62) int local62; - @Pc(71) int local71; - @Pc(104) int local104; - @Pc(145) int local145; - @Pc(157) int local157; - @Pc(162) int local162; - @Pc(211) int local211; - @Pc(222) int local222; - @Pc(233) int local233; - @Pc(254) int local254; - @Pc(270) int local270; - @Pc(276) int local276; - @Pc(312) int local312; - @Pc(372) int local372; - @Pc(185) int[][] local185; - for (local32 = 0; local32 < local9; local32++) { - local47 = local32 * arg7 >> 16; - local57 = (local32 + 1) * arg7 >> 16; - local62 = local57 - local47; - if (local62 > 0) { - local71 = local32 + arg5 >> 6; - if (local71 >= 0 && Static248.anIntArrayArrayArray17.length - 1 >= local71) { - local47 += arg4; - local185 = Static248.anIntArrayArrayArray17[local71]; - @Pc(189) byte[][] local189 = Static34.aByteArrayArrayArray3[local71]; - @Pc(193) byte[][] local193 = Static90.aByteArrayArrayArray8[local71]; - @Pc(197) byte[][] local197 = Static70.aByteArrayArrayArray7[local71]; - @Pc(201) byte[][] local201 = Static125.aByteArrayArrayArray10[local71]; - local57 += arg4; - @Pc(209) byte[][] local209 = Static229.aByteArrayArrayArray12[local71]; - for (local211 = 0; local211 < local14; local211++) { - local222 = arg6 * local211 >> 16; - local233 = (local211 + 1) * arg6 >> 16; - @Pc(238) int local238 = local233 - local222; - if (local238 > 0) { - local233 += arg0; - local254 = arg2 + local211 >> 6; - @Pc(260) int local260 = arg2 + local211 & 0x3F; - local222 += arg0; - local270 = local32 + arg5 & 0x3F; - local276 = (local260 << 6) + local270; - if (local254 < 0 || local185.length - 1 < local254 || local185[local254] == null) { - if (Static269.aClass3_Sub2_Sub4_2.anInt759 != -1) { - local312 = Static269.aClass3_Sub2_Sub4_2.anInt759; - } else if ((local211 + arg2 & 0x4) == (arg5 + local32 & 0x4)) { - local312 = Static145.anIntArray330[Static26.anInt865 + 1]; - } else { - local312 = 4936552; - } - if (local254 < 0 || local254 > local185.length - 1) { - if (local312 == 0) { - local312 = 1; - } - Static129.method2495(local47, local222, local62, local238, local312); - continue; - } - } else { - local312 = local185[local254][local276]; - } - local372 = local189[local254] == null ? 0 : Static145.anIntArray330[local189[local254][local276] & 0xFF]; - if (local312 == 0) { - local312 = 1; - } - @Pc(395) int local395 = local209[local254] == null ? 0 : Static145.anIntArray330[local209[local254][local276] & 0xFF]; - @Pc(437) int local437; - if (local372 == 0 && local395 == 0) { - Static129.method2495(local47, local222, local62, local238, local312); - } else { - @Pc(433) byte local433; - if (local372 != 0) { - if (local372 == -1) { - local372 = 1; - } - local433 = local193[local254] == null ? 0 : local193[local254][local276]; - local437 = local433 & 0xFC; - if (local437 == 0 || local62 <= 1 || local238 <= 1) { - Static129.method2495(local47, local222, local62, local238, local372); - } else { - Static280.method4667(Static129.pixels, local372, local47, local433 & 0x3, local312, local437 >> 2, local238, local62, local222, true); - } - } - if (local395 != 0) { - if (local395 == -1) { - local395 = local312; - } - local433 = local201[local254][local276]; - local437 = local433 & 0xFC; - if (local437 == 0 || local62 <= 1 || local238 <= 1) { - Static129.method2495(local47, local222, local62, local238, local395); - } - Static280.method4667(Static129.pixels, local395, local47, local433 & 0x3, 0, local437 >> 2, local238, local62, local222, local372 == 0); - } - } - if (local197[local254] != null) { - @Pc(546) int local546 = local197[local254][local276] & 0xFF; - if (local546 != 0) { - if (local62 == 1) { - local437 = local47; - } else { - local437 = local57 - 1; - } - @Pc(569) int local569; - if (local238 == 1) { - local569 = local222; - } else { - local569 = local233 - 1; - } - @Pc(575) int local575 = 13421772; - if (local546 >= 5 && local546 <= 8 || local546 >= 13 && local546 <= 16 || local546 >= 21 && local546 <= 24 || local546 == 27 || local546 == 28) { - local575 = 13369344; - local546 -= 4; - } - if (local546 == 1) { - Static129.method2490(local47, local222, local238, local575); - } else if (local546 == 2) { - Static129.method2489(local47, local222, local62, local575); - } else if (local546 == 3) { - Static129.method2490(local437, local222, local238, local575); - } else if (local546 == 4) { - Static129.method2489(local47, local569, local62, local575); - } else if (local546 == 9) { - Static129.method2490(local47, local222, local238, 16777215); - Static129.method2489(local47, local222, local62, local575); - } else if (local546 == 10) { - Static129.method2490(local437, local222, local238, 16777215); - Static129.method2489(local47, local222, local62, local575); - } else if (local546 == 11) { - Static129.method2490(local437, local222, local238, 16777215); - Static129.method2489(local47, local569, local62, local575); - } else if (local546 == 12) { - Static129.method2490(local47, local222, local238, 16777215); - Static129.method2489(local47, local569, local62, local575); - } else if (local546 == 17) { - Static129.method2489(local47, local222, 1, local575); - } else if (local546 == 18) { - Static129.method2489(local437, local222, 1, local575); - } else if (local546 == 19) { - Static129.method2489(local437, local569, 1, local575); - } else if (local546 == 20) { - Static129.method2489(local47, local569, 1, local575); - } else { - @Pc(705) int local705; - if (local546 == 25) { - for (local705 = 0; local705 < local238; local705++) { - Static129.method2489(local705 + local47, -local705 + local569, 1, local575); - } - } else if (local546 == 26) { - for (local705 = 0; local705 < local238; local705++) { - Static129.method2489(local705 + local47, local222 + local705, 1, local575); - } - } - } - } - } - } - } - } else { - local47 += arg4; - for (@Pc(90) int local90 = 0; local90 < local14; local90++) { - if (Static269.aClass3_Sub2_Sub4_2.anInt759 != -1) { - local104 = Static269.aClass3_Sub2_Sub4_2.anInt759; - } else if ((local32 + arg5 & 0x4) == (local90 + arg2 & 0x4)) { - local104 = Static145.anIntArray330[Static26.anInt865 + 1]; - } else { - local104 = 4936552; - } - if (local104 == 0) { - local104 = 1; - } - local145 = (arg6 * local90 >> 16) + arg0; - local157 = arg0 + ((local90 + 1) * arg6 >> 16); - local162 = local157 - local145; - Static129.method2495(local47, local145, local62, local162, local104); - } - } - } - } - for (local32 = -2; local32 < local9 + 2; local32++) { - local47 = local32 * arg7 >> 16; - local57 = arg7 * (local32 + 1) >> 16; - local62 = local57 - local47; - if (local62 > 0) { - local47 += arg4; - local71 = arg5 + local32 >> 6; - if (local71 >= 0 && Static58.anIntArrayArrayArray5.length - 1 >= local71) { - local185 = Static58.anIntArrayArrayArray5[local71]; - for (local104 = -2; local104 < local14 + 2; local104++) { - local145 = local104 * arg6 >> 16; - local157 = (local104 + 1) * arg6 >> 16; - local162 = local157 - local145; - if (local162 > 0) { - local145 += arg0; - @Pc(931) int local931 = local104 + arg2 >> 6; - if (local931 >= 0 && local931 <= local185.length - 1) { - local211 = ((arg2 + local104 & 0x3F) << 6) + (local32 + arg5 & 0x3F); - if (local185[local931] != null) { - local222 = local185[local931][local211]; - local233 = local222 & 0x3FFF; - if (local233 != 0) { - local254 = local222 >> 14 & 0x3; - @Pc(998) MsiType local998 = Static40.method1013(local233 - 1); - @Pc(1003) SoftwareIndexedSprite local1003 = local998.getSprite(local254); - if (local1003 != null) { - local276 = local162 * local1003.height / 4; - local270 = local62 * local1003.width / 4; - if (local998.aBoolean2) { - local312 = local222 >> 16 & 0xF; - local372 = local222 >> 20 & 0xF; - if ((local254 & 0x1) == 1) { - local254 = local312; - local312 = local372; - local372 = local254; - } - local270 = local62 * local312; - local276 = local162 * local372; - } - if (local270 != 0 && local276 != 0) { - if (local998.anInt11 == 0) { - local1003.method1398(local47, local145 + local162 - local276, local270, local276); - } else { - local1003.method1390(local47, local145 + local162 - local276, local270, local276, local998.anInt11); - } - } - } - } - } - } - } - } - } - } - } - } - @OriginalMember(owner = "client!le", name = "a", descriptor = "(I)I") public static int getWindowMode() { if (GameShell.fullScreenFrame != null) { diff --git a/client/src/main/java/Static145.java b/client/src/main/java/Static145.java index d585fa2..0410aa7 100644 --- a/client/src/main/java/Static145.java +++ b/client/src/main/java/Static145.java @@ -4,15 +4,9 @@ import org.openrs2.deob.annotation.Pc; public final class Static145 { - @OriginalMember(owner = "client!lf", name = "b", descriptor = "[I") - public static int[] anIntArray330; - @OriginalMember(owner = "client!lf", name = "a", descriptor = "[[I") public static final int[][] anIntArrayArray25 = new int[104][104]; - @OriginalMember(owner = "client!lf", name = "c", descriptor = "Lclient!ih;") - public static final LinkedList aClass69_84 = new LinkedList(); - @OriginalMember(owner = "client!lf", name = "d", descriptor = "[I") public static final int[] anIntArray331 = new int[1000]; @@ -21,17 +15,17 @@ public final class Static145 { @OriginalMember(owner = "client!lf", name = "a", descriptor = "(I)V") public static void method2742() { - if (Static244.gameState == 10 && GlRenderer.enabled) { + if (client.gameState == 10 && GlRenderer.enabled) { Static196.setGameState(28); } - if (Static244.gameState == 30) { + if (client.gameState == 30) { Static196.setGameState(25); } } @OriginalMember(owner = "client!lf", name = "a", descriptor = "(ILclient!ve;)V") public static void method2743(@OriginalArg(1) Js5 arg0) { - Static233.aClass36_Sub1Array1 = Static162.method3088(Static138.anInt3443, arg0); + Static233.aClass36_Sub1Array1 = SpriteLoader.method3088(Static138.anInt3443, arg0); Static96.anIntArray235 = new int[256]; @Pc(15) int local15; for (local15 = 0; local15 < 3; local15++) { @@ -73,11 +67,11 @@ public final class Static145 { Static46.method1186(local11 + 1, local3 + 1, local9 - 2, 16, 0); Static46.method1179(local11 + 1, local3 + 18, local9 - 2, local15 + -19, 0); } else { - Static129.method2495(local11, local3, local9, local15, 6116423); - Static129.method2495(local11 + 1, local3 + 1, local9 - 2, 16, 0); - Static129.method2483(local11 + 1, local3 + 18, local9 - 2, local15 + -19, 0); + SoftwareRaster.fillRect(local11, local3, local9, local15, 6116423); + SoftwareRaster.fillRect(local11 + 1, local3 + 1, local9 - 2, 16, 0); + SoftwareRaster.drawRect(local11 + 1, local3 + 18, local9 - 2, local15 + -19, 0); } - Static280.aClass3_Sub2_Sub9_43.method2857(LocalizedText.CHOOSE_OPTION, local11 + 3, local3 + 14, 6116423, -1); + Fonts.b12Full.method2857(LocalizedText.CHOOSE_OPTION, local11 + 3, local3 + 14, 6116423, -1); @Pc(96) int local96 = Static223.anInt5032; @Pc(98) int local98 = Static215.anInt4873; for (@Pc(107) int local107 = 0; local107 < Static231.anInt5204; local107++) { @@ -86,7 +80,7 @@ public final class Static145 { if (local11 < local98 && local98 < local11 + local9 && local127 - 13 < local96 && local96 < local127 + 3) { local129 = 16776960; } - Static280.aClass3_Sub2_Sub9_43.method2857(Static269.method2228(local107), local11 + 3, local127, local129, 0); + Fonts.b12Full.method2857(Static269.method2228(local107), local11 + 3, local127, local129, 0); } Static121.method2407(Static183.anInt4271, Static229.anInt5138, Static13.anInt436, Static24.anInt761); } @@ -102,6 +96,6 @@ public final class Static145 { @OriginalMember(owner = "client!lf", name = "c", descriptor = "(I)I") public static int method2746() { - return ((Static99.stereo ? 1 : 0) << 19) + (((Static71.fogEnabled ? 1 : 0) << 16) + ((Static220.highWaterDetail ? 1 : 0) << 15) + ((Static178.highDetailLighting ? 1 : 0) << 13) + ((Static209.characterShadowsOn ? 1 : 0) << 10) + ((Static159.manyGroundTextures ? 1 : 0) << 9) + ((Static15.manyIdleAnimations ? 1 : 0) << 7) + ((Static53.highDetailTextures ? 1 : 0) << 6) + ((Static250.showGroundDecorations ? 1 : 0) << 5) + (((Static162.aBoolean190 ? 1 : 0) << 3) + (Static113.brightness & 0x7) - (-((Static80.removeRoofsSelectively ? 1 : 0) << 4) + -((Static11.flickeringEffectsOn ? 1 : 0) << 8)) - (-((Static139.sceneryShadowsType & 0x3) << 11) + -((Static125.soundEffectVolume == 0 ? 0 : 1) << 20) - (((Static12.musicVolume == 0 ? 0 : 1) << 21) + ((Static30.ambientSoundsVolume == 0 ? 0 : 1) << 22)))) + (Static76.getParticleSetting() << 23)); + return ((Preferences.stereo ? 1 : 0) << 19) + (((Preferences.fogEnabled ? 1 : 0) << 16) + ((Preferences.highWaterDetail ? 1 : 0) << 15) + ((Preferences.highDetailLighting ? 1 : 0) << 13) + ((Preferences.characterShadowsOn ? 1 : 0) << 10) + ((Preferences.manyGroundTextures ? 1 : 0) << 9) + ((Preferences.manyIdleAnimations ? 1 : 0) << 7) + ((Preferences.highDetailTextures ? 1 : 0) << 6) + ((Preferences.showGroundDecorations ? 1 : 0) << 5) + (((Preferences.allLevelsVisible ? 1 : 0) << 3) + (Preferences.brightness & 0x7) - (-((Preferences.removeRoofsSelectively ? 1 : 0) << 4) + -((Preferences.flickeringEffectsOn ? 1 : 0) << 8)) - (-((Preferences.sceneryShadowsType & 0x3) << 11) + -((Preferences.soundEffectVolume == 0 ? 0 : 1) << 20) - (((Preferences.musicVolume == 0 ? 0 : 1) << 21) + ((Preferences.ambientSoundsVolume == 0 ? 0 : 1) << 22)))) + (Preferences.getParticleSetting() << 23)); } } diff --git a/client/src/main/java/Static146.java b/client/src/main/java/Static146.java index c897578..a149a15 100644 --- a/client/src/main/java/Static146.java +++ b/client/src/main/java/Static146.java @@ -28,11 +28,6 @@ public final class Static146 { return arg0.offset - local6; } - @OriginalMember(owner = "client!lg", name = "a", descriptor = "(Lclient!ve;BII)[Lclient!ok;") - public static IndexedSprite[] method2749(@OriginalArg(0) Js5 arg0, @OriginalArg(3) int arg1) { - return Static234.method4016(arg0, 0, arg1) ? Static253.method4331() : null; - } - @OriginalMember(owner = "client!lg", name = "a", descriptor = "(I)V") public static void method2750(@OriginalArg(0) int arg0) { Static235.anInt5276 = arg0; diff --git a/client/src/main/java/Static147.java b/client/src/main/java/Static147.java index 3eb42e7..1526936 100644 --- a/client/src/main/java/Static147.java +++ b/client/src/main/java/Static147.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static147 { - @OriginalMember(owner = "client!lh", name = "s", descriptor = "Lclient!vh;") - public static AudioChannel soundChannel; - - @OriginalMember(owner = "client!lh", name = "u", descriptor = "I") + @OriginalMember(owner = "client!lh", name = "u", descriptor = "I") public static volatile int anInt3521 = -1; @OriginalMember(owner = "client!lh", name = "z", descriptor = "Lclient!na;") @@ -30,7 +27,7 @@ public final class Static147 { @Pc(39) int local39; for (local5 = 0; local5 < local3; local5++) { local15 = arg0.anIntArray168[local5] - Static149.anInt3555; - local22 = arg0.anIntArray160[local5] - Static162.anInt3947; + local22 = arg0.anIntArray160[local5] - Static123.anInt3947; local29 = arg0.anIntArray163[local5] - Static217.anInt4903; local39 = local29 * arg3 + local15 * arg4 >> 16; @Pc(49) int local49 = local29 * arg4 - local15 * arg3 >> 16; @@ -73,7 +70,7 @@ public final class Static147 { if (arg0.anIntArray167[local5] != 12345678) { Rasteriser.fillGouraudTriangle(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5]); } - } else if (!Static159.manyGroundTextures) { + } else if (!Preferences.manyGroundTextures) { @Pc(373) int local373 = Rasteriser.textureProvider.getAverageColor(arg0.anIntArray161[local5]); Rasteriser.fillGouraudTriangle(local156, local160, local164, local39, local148, local152, Static216.method1640(local373, arg0.anIntArray167[local5]), Static216.method1640(local373, arg0.anIntArray172[local5]), Static216.method1640(local373, arg0.anIntArray171[local5])); } else if (arg0.aBoolean113) { diff --git a/client/src/main/java/Static148.java b/client/src/main/java/Static148.java index e32bd0a..1fe21bd 100644 --- a/client/src/main/java/Static148.java +++ b/client/src/main/java/Static148.java @@ -27,10 +27,10 @@ public final class Static148 { @OriginalMember(owner = "client!li", name = "a", descriptor = "(ZI)V") public static void method2765(@OriginalArg(1) int arg0) { - if (arg0 == -1 && !Static144.aBoolean173) { + if (arg0 == -1 && !MidiPlayer.jingle) { Static241.method4548(); - } else if (arg0 != -1 && (Static221.anInt4363 != arg0 || !Static136.method2655()) && Static12.musicVolume != 0 && !Static144.aBoolean173) { - Static257.method526(arg0, Static130.js5Archive6, Static12.musicVolume); + } else if (arg0 != -1 && (Static221.anInt4363 != arg0 || !Static136.method2655()) && Preferences.musicVolume != 0 && !MidiPlayer.jingle) { + Static257.method526(arg0, Static130.js5Archive6, Preferences.musicVolume); } Static221.anInt4363 = arg0; } @@ -43,7 +43,7 @@ public final class Static148 { local21 = new LongNode(MonotonicClock.currentTimeMillis() + 500L); Static199.aClass133_20.put(local21, (long) arg0); } else { - local21.aLong55 = MonotonicClock.currentTimeMillis() + 500L; + local21.value = MonotonicClock.currentTimeMillis() + 500L; } } @@ -55,7 +55,7 @@ public final class Static148 { } @Pc(26) byte[] local26 = Static261.js5Archive13.getFile(arg0, 0); local16 = new SoftwareFont(local26); - local16.setNameIcons(Static159.aClass36Array12, null); + local16.setNameIcons(Sprites.nameIcons, null); Static139.aClass99_22.put(local16, (long) arg0); return local16; } diff --git a/client/src/main/java/Static149.java b/client/src/main/java/Static149.java index 1aa4f6c..a032365 100644 --- a/client/src/main/java/Static149.java +++ b/client/src/main/java/Static149.java @@ -3,12 +3,6 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static149 { - @OriginalMember(owner = "client!lj", name = "s", descriptor = "I") - public static int anInt3551; - - @OriginalMember(owner = "client!lj", name = "t", descriptor = "[Lclient!qf;") - public static Sprite[] aClass3_Sub2_Sub1Array7; - @OriginalMember(owner = "client!lj", name = "y", descriptor = "Ljava/awt/Image;") public static Image anImage3; diff --git a/client/src/main/java/Static15.java b/client/src/main/java/Static15.java index 714b299..380375c 100644 --- a/client/src/main/java/Static15.java +++ b/client/src/main/java/Static15.java @@ -10,9 +10,6 @@ public final class Static15 { @OriginalMember(owner = "client!be", name = "ib", descriptor = "Lclient!na;") public static final JagString EVENT_OPBASE = Static28.parse("event_opbase"); - @OriginalMember(owner = "client!be", name = "Kb", descriptor = "Z") - public static boolean manyIdleAnimations = true; - @OriginalMember(owner = "client!be", name = "ac", descriptor = "Lclient!na;") public static JagString aClass100_87 = null; @@ -25,14 +22,14 @@ public final class Static15 { @OriginalMember(owner = "client!be", name = "a", descriptor = "(Z)Lclient!na;") public static JagString method479() { @Pc(8) JagString local8 = Static93.aClass100_518; - @Pc(10) JagString local10 = Static186.EMPTY; - if (Static83.modeWhere != 0) { + @Pc(10) JagString local10 = JagString.EMPTY; + if (client.modeWhere != 0) { local8 = Static50.aClass100_365; } - if (Static47.settings != null) { - local10 = Static34.concatenate(new JagString[] { Static150.aClass100_687, Static47.settings}); + if (client.settings != null) { + local10 = JagString.concatenate(new JagString[] { Static150.aClass100_687, client.settings}); } - return Static34.concatenate(new JagString[] { Static61.aClass100_424, local8, Static80.aClass100_886, Static123.parseInt(Static141.language), Static257.aClass100_98, Static123.parseInt(Static204.affiliate), local10, Static41.aClass100_268 }); + return JagString.concatenate(new JagString[] { Static61.aClass100_424, local8, Static80.aClass100_886, Static123.parseInt(client.language), Static257.aClass100_98, Static123.parseInt(client.affiliate), local10, Static41.aClass100_268 }); } @OriginalMember(owner = "client!be", name = "a", descriptor = "(III)I") diff --git a/client/src/main/java/Static150.java b/client/src/main/java/Static150.java index c513bff..a2a5926 100644 --- a/client/src/main/java/Static150.java +++ b/client/src/main/java/Static150.java @@ -7,10 +7,7 @@ public final class Static150 { @OriginalMember(owner = "client!lk", name = "J", descriptor = "Lclient!na;") public static final JagString aClass100_687 = Static28.parse(")4p="); - @OriginalMember(owner = "client!lk", name = "U", descriptor = "Z") - public static boolean objectTag = false; - - @OriginalMember(owner = "client!lk", name = "V", descriptor = "I") + @OriginalMember(owner = "client!lk", name = "V", descriptor = "I") public static int anInt3582 = 0; @OriginalMember(owner = "client!lk", name = "Z", descriptor = "I") @@ -28,11 +25,6 @@ public final class Static150 { return ready; } - @OriginalMember(owner = "client!lk", name = "a", descriptor = "(IIBLclient!ve;)Lclient!qf;") - public static Sprite method2800(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1) { - return Static234.method4016(arg1, 0, arg0) ? Static82.method1764() : null; - } - @OriginalMember(owner = "client!lk", name = "a", descriptor = "(IIILclient!be;Z)V") public static void method2801(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component arg2, @OriginalArg(4) boolean arg3) { @Pc(4) int local4 = arg2.anInt445; @@ -89,7 +81,7 @@ public final class Static150 { @Pc(305) HookRequest local305 = new HookRequest(); local305.arguments = arg2.anObjectArray17; local305.source = arg2; - Static185.lowPriorityRequests.method2282(local305); + InterfaceList.lowPriorityRequests.addTail(local305); } } @@ -109,7 +101,7 @@ public final class Static150 { } else if (arg4 < arg1.anInt2029) { local20 += arg1.anInt2029 - arg4; } - if (arg1.radius == 0 || arg1.radius < local20 - 64 || Static30.ambientSoundsVolume == 0 || arg2 != arg1.anInt2033) { + if (arg1.radius == 0 || arg1.radius < local20 - 64 || Preferences.ambientSoundsVolume == 0 || arg2 != arg1.anInt2033) { if (arg1.primaryStream != null) { Static204.soundStream.removeSubStream(arg1.primaryStream); arg1.primaryStream = null; @@ -124,11 +116,11 @@ public final class Static150 { if (local20 < 0) { local20 = 0; } - @Pc(134) int local134 = (arg1.radius - local20) * Static30.ambientSoundsVolume / arg1.radius; + @Pc(134) int local134 = (arg1.radius - local20) * Preferences.ambientSoundsVolume / arg1.radius; if (arg1.primaryStream != null) { arg1.primaryStream.method386(local134); } else if (arg1.sound >= 0) { - @Pc(150) SynthSound local150 = Static292.method3988(Static248.js5Archive4, arg1.sound, 0); + @Pc(150) SynthSound local150 = SynthSound.create(Static248.js5Archive4, arg1.sound, 0); if (local150 != null) { @Pc(158) PcmSound local158 = local150.method3989().method2648(Static56.resampler); @Pc(163) SoundPcmStream local163 = Static284.method404(local158, local134); @@ -144,7 +136,7 @@ public final class Static150 { } } else if (arg1.sounds != null && (arg1.anInt2034 -= arg3) <= 0) { @Pc(219) int local219 = (int) ((double) arg1.sounds.length * Math.random()); - @Pc(227) SynthSound local227 = Static292.method3988(Static248.js5Archive4, arg1.sounds[local219], 0); + @Pc(227) SynthSound local227 = SynthSound.create(Static248.js5Archive4, arg1.sounds[local219], 0); if (local227 != null) { @Pc(236) PcmSound local236 = local227.method3989().method2648(Static56.resampler); @Pc(241) SoundPcmStream local241 = Static284.method404(local236, local134); diff --git a/client/src/main/java/Static152.java b/client/src/main/java/Static152.java index f59671c..0e0c772 100644 --- a/client/src/main/java/Static152.java +++ b/client/src/main/java/Static152.java @@ -7,9 +7,6 @@ public final class Static152 { @OriginalMember(owner = "client!ma", name = "i", descriptor = "I") public static int mapSizeX; - @OriginalMember(owner = "client!ma", name = "q", descriptor = "Lclient!fd;") - public static WorldMapFont aClass41_3; - @OriginalMember(owner = "client!ma", name = "x", descriptor = "Lclient!ih;") public static final LinkedList aClass69_87 = new LinkedList(); @@ -85,35 +82,4 @@ public final class Static152 { } } - @OriginalMember(owner = "client!ma", name = "a", descriptor = "(ILclient!tk;IIZI)V") - public static void method2836(@OriginalArg(0) int arg0, @OriginalArg(1) SeqType arg1, @OriginalArg(3) int arg2, @OriginalArg(4) boolean arg3, @OriginalArg(5) int arg4) { - if (Static189.anInt4451 >= 50 || (arg1.anIntArrayArray38 == null || arg4 >= arg1.anIntArrayArray38.length || arg1.anIntArrayArray38[arg4] == null)) { - return; - } - @Pc(36) int local36 = arg1.anIntArrayArray38[arg4][0]; - @Pc(40) int local40 = local36 >> 8; - @Pc(57) int local57; - if (arg1.anIntArrayArray38[arg4].length > 1) { - local57 = (int) ((double) arg1.anIntArrayArray38[arg4].length * Math.random()); - if (local57 > 0) { - local40 = arg1.anIntArrayArray38[arg4][local57]; - } - } - @Pc(73) int local73 = local36 >> 5 & 0x7; - @Pc(77) int local77 = local36 & 0x1F; - if (local77 == 0) { - if (arg3) { - Static26.method744(local73, local40, 0); - } - } else if (Static30.ambientSoundsVolume != 0) { - Static200.anIntArray421[Static189.anInt4451] = local40; - Static276.anIntArray563[Static189.anInt4451] = local73; - @Pc(111) int local111 = (arg0 - 64) / 128; - local57 = (arg2 - 64) / 128; - Static164.anIntArray362[Static189.anInt4451] = 0; - Static173.aClass138Array1[Static189.anInt4451] = null; - Static26.anIntArray68[Static189.anInt4451] = local77 + (local57 << 16) + (local111 << 8); - Static189.anInt4451++; - } - } } diff --git a/client/src/main/java/Static154.java b/client/src/main/java/Static154.java index 14b3ef0..7e4e01c 100644 --- a/client/src/main/java/Static154.java +++ b/client/src/main/java/Static154.java @@ -16,10 +16,7 @@ public final class Static154 { @OriginalMember(owner = "client!md", name = "V", descriptor = "[[S") public static final short[][] aShortArrayArray6 = new short[][] { { 6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010 }, { 8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010 }, { 25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010 }, { 4626, 11146, 6439, 12, 4758, 10270 }, { 4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574 } }; - @OriginalMember(owner = "client!md", name = "W", descriptor = "I") - public static int topLevelInterface = -1; - - @OriginalMember(owner = "client!md", name = "a", descriptor = "(Lclient!be;I)Z") + @OriginalMember(owner = "client!md", name = "a", descriptor = "(Lclient!be;I)Z") public static boolean method2926(@OriginalArg(0) Component arg0) { if (arg0.anIntArray43 == null) { return false; diff --git a/client/src/main/java/Static155.java b/client/src/main/java/Static155.java index 195b6f6..c771a11 100644 --- a/client/src/main/java/Static155.java +++ b/client/src/main/java/Static155.java @@ -15,19 +15,19 @@ public final class Static155 { @OriginalMember(owner = "client!me", name = "a", descriptor = "(IB)V") public static void method2940(@OriginalArg(0) int arg0) { - Static217.anInt4901 = -1; + WorldMap.anInt4901 = -1; if (arg0 == 37) { - Static138.aFloat14 = 3.0F; + WorldMap.targetZoom = 3.0F; } else if (arg0 == 50) { - Static138.aFloat14 = 4.0F; + WorldMap.targetZoom = 4.0F; } else if (arg0 == 75) { - Static138.aFloat14 = 6.0F; + WorldMap.targetZoom = 6.0F; } else if (arg0 == 100) { - Static138.aFloat14 = 8.0F; + WorldMap.targetZoom = 8.0F; } else if (arg0 == 200) { - Static138.aFloat14 = 16.0F; + WorldMap.targetZoom = 16.0F; } - Static217.anInt4901 = -1; + WorldMap.anInt4901 = -1; } @OriginalMember(owner = "client!me", name = "a", descriptor = "(ZLclient!na;I)V") diff --git a/client/src/main/java/Static156.java b/client/src/main/java/Static156.java index efd4848..4f4908d 100644 --- a/client/src/main/java/Static156.java +++ b/client/src/main/java/Static156.java @@ -14,9 +14,6 @@ public final class Static156 { @OriginalMember(owner = "client!mf", name = "X", descriptor = "I") public static int loginScreenId; - @OriginalMember(owner = "client!mf", name = "x", descriptor = "Lclient!ha;") - public static final GzipDecompressor aClass56_1 = new GzipDecompressor(); - @OriginalMember(owner = "client!mf", name = "a", descriptor = "(IIIII[[[B[I[I[I[I[IIBII)V") public static void method2954(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) byte[][][] arg5, @OriginalArg(6) int[] arg6, @OriginalArg(7) int[] arg7, @OriginalArg(8) int[] arg8, @OriginalArg(9) int[] arg9, @OriginalArg(10) int[] arg10, @OriginalArg(11) int arg11, @OriginalArg(12) byte arg12, @OriginalArg(13) int arg13, @OriginalArg(14) int arg14) { if (arg0 < 0) { @@ -34,7 +31,7 @@ public final class Static156 { Static231.anInt5205 = MathUtils.sin[arg4]; Static81.anInt2222 = MathUtils.cos[arg4]; Static149.anInt3555 = arg0; - Static162.anInt3947 = arg1; + Static123.anInt3947 = arg1; Static217.anInt4903 = arg2; Static167.anInt4069 = arg0 / 128; Static193.anInt4539 = arg2 / 128; @@ -71,11 +68,11 @@ public final class Static156 { if (local146 >= 0 && local152 >= 0 && local146 < Static152.mapSizeX && local152 < Static99.mapSizeZ) { @Pc(176) int local176; if (Static80.underWaterTileHeightMap == null) { - local176 = Static107.surfaceTileHeightMap[0][local146][local152] + 128 - Static162.anInt3947; + local176 = Static107.surfaceTileHeightMap[0][local146][local152] + 128 - Static123.anInt3947; } else { - local176 = Static80.underWaterTileHeightMap[0][local146][local152] + 128 - Static162.anInt3947; + local176 = Static80.underWaterTileHeightMap[0][local146][local152] + 128 - Static123.anInt3947; } - @Pc(201) int local201 = Static107.surfaceTileHeightMap[3][local146][local152] - Static162.anInt3947 - 1000; + @Pc(201) int local201 = Static107.surfaceTileHeightMap[3][local146][local152] - Static123.anInt3947 - 1000; Static89.aBooleanArrayArray3[local104][local113] = Static160.method3049(local130, local201, local176, local140, local99); } else { Static89.aBooleanArrayArray3[local104][local113] = false; diff --git a/client/src/main/java/Static158.java b/client/src/main/java/Static158.java index f2c94bc..6ade8b5 100644 --- a/client/src/main/java/Static158.java +++ b/client/src/main/java/Static158.java @@ -5,9 +5,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static158 { - @OriginalMember(owner = "client!mh", name = "S", descriptor = "I") - public static int anInt3846; - @OriginalMember(owner = "client!mh", name = "hb", descriptor = "Lclient!bn;") public static Map aClass3_Sub2_Sub4_3; @@ -27,9 +24,9 @@ public final class Static158 { } try { if (++Static226.anInt5079 > 2000) { - if (Static124.socket != null) { - Static124.socket.close(); - Static124.socket = null; + if (Protocol.socket != null) { + Protocol.socket.close(); + Protocol.socket = null; } if (Static57.anInt1758 >= 1) { Static223.anInt5034 = -5; @@ -57,57 +54,57 @@ public final class Static158 { if (Static72.aClass212_3.status != 1) { return; } - Static124.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, GameShell.signLink); + Protocol.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, GameShell.signLink); Static72.aClass212_3 = null; - Static124.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); - if (Static11.musicChannel != null) { - Static11.musicChannel.method3571(); + Protocol.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); + if (client.musicChannel != null) { + client.musicChannel.method3571(); } - if (Static147.soundChannel != null) { - Static147.soundChannel.method3571(); + if (client.soundChannel != null) { + client.soundChannel.method3571(); } - local120 = Static124.socket.read(); - if (Static11.musicChannel != null) { - Static11.musicChannel.method3571(); + local120 = Protocol.socket.read(); + if (client.musicChannel != null) { + client.musicChannel.method3571(); } - if (Static147.soundChannel != null) { - Static147.soundChannel.method3571(); + if (client.soundChannel != null) { + client.soundChannel.method3571(); } if (local120 != 21) { Static223.anInt5034 = local120; Static179.accountCreationStep = 0; - Static124.socket.close(); - Static124.socket = null; + Protocol.socket.close(); + Protocol.socket = null; return; } Static179.accountCreationStep = 3; } if (Static179.accountCreationStep == 3) { - if (Static124.socket.available() < 1) { + if (Protocol.socket.available() < 1) { return; } - Static229.aClass100Array156 = new JagString[Static124.socket.read()]; + Static229.aClass100Array156 = new JagString[Protocol.socket.read()]; Static179.accountCreationStep = 4; } if (Static179.accountCreationStep == 4) { - if (Static124.socket.available() < Static229.aClass100Array156.length * 8) { + if (Protocol.socket.available() < Static229.aClass100Array156.length * 8) { return; } Static57.aClass3_Sub15_Sub1_3.offset = 0; - Static124.socket.read(0, Static229.aClass100Array156.length * 8, Static57.aClass3_Sub15_Sub1_3.data); + Protocol.socket.read(0, Static229.aClass100Array156.length * 8, Static57.aClass3_Sub15_Sub1_3.data); for (local120 = 0; local120 < Static229.aClass100Array156.length; local120++) { Static229.aClass100Array156[local120] = Static79.decode37(Static57.aClass3_Sub15_Sub1_3.g8()); } Static223.anInt5034 = 21; Static179.accountCreationStep = 0; - Static124.socket.close(); - Static124.socket = null; + Protocol.socket.close(); + Protocol.socket = null; return; } } catch (@Pc(238) IOException local238) { - if (Static124.socket != null) { - Static124.socket.close(); - Static124.socket = null; + if (Protocol.socket != null) { + Protocol.socket.close(); + Protocol.socket = null; } if (Static57.anInt1758 < 1) { Static57.anInt1758++; diff --git a/client/src/main/java/Static159.java b/client/src/main/java/Static159.java index 6c95328..5571707 100644 --- a/client/src/main/java/Static159.java +++ b/client/src/main/java/Static159.java @@ -4,12 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static159 { - @OriginalMember(owner = "client!mi", name = "T", descriptor = "[Lclient!ok;") - public static IndexedSprite[] aClass36Array12; - - @OriginalMember(owner = "client!mi", name = "W", descriptor = "[Z") - public static boolean[] aBooleanArray87; - @OriginalMember(owner = "client!mi", name = "Z", descriptor = "I") public static int anInt3893; @@ -25,10 +19,7 @@ public final class Static159 { @OriginalMember(owner = "client!mi", name = "Y", descriptor = "[[[Lclient!ih;") public static final LinkedList[][][] aClass69ArrayArrayArray1 = new LinkedList[4][104][104]; - @OriginalMember(owner = "client!mi", name = "ab", descriptor = "Z") - public static boolean manyGroundTextures = true; - - @OriginalMember(owner = "client!mi", name = "a", descriptor = "([IBLclient!km;[I[I)V") + @OriginalMember(owner = "client!mi", name = "a", descriptor = "([IBLclient!km;[I[I)V") public static void method3037(@OriginalArg(0) int[] arg0, @OriginalArg(2) Npc arg1, @OriginalArg(3) int[] arg2, @OriginalArg(4) int[] arg3) { for (@Pc(3) int local3 = 0; local3 < arg3.length; local3++) { @Pc(15) int local15 = arg3[local3]; @@ -52,7 +43,7 @@ public final class Static159 { local65.anInt5398 = 1; local65.anInt5404 = 0; local65.anInt5408 = local23; - Static152.method2836(arg1.zFine, local60, arg1.xFine, false, 0); + SoundPlayer.playSeqSound(arg1.zFine, local60, arg1.xFine, false, 0); } else if (local68 == 2) { local65.anInt5400 = 0; } @@ -68,7 +59,7 @@ public final class Static159 { local65.anInt5396 = local15; local65.anInt5400 = 0; local65.anInt5399 = 0; - Static152.method2836(arg1.zFine, local60, arg1.xFine, false, 0); + SoundPlayer.playSeqSound(arg1.zFine, local60, arg1.xFine, false, 0); } } } diff --git a/client/src/main/java/Static160.java b/client/src/main/java/Static160.java index acfd1c0..c325595 100644 --- a/client/src/main/java/Static160.java +++ b/client/src/main/java/Static160.java @@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static160 { - @OriginalMember(owner = "client!mj", name = "n", descriptor = "Lclient!fd;") - public static WorldMapFont aClass41_4; - @OriginalMember(owner = "client!mj", name = "u", descriptor = "B") public static byte aByte14; @@ -37,14 +34,14 @@ public final class Static160 { local44.method1423(arg0, arg1); } } else { - Static129.method2504(arg0, arg1, arg2.anIntArray37, arg2.anIntArray45); + SoftwareRaster.method2504(arg0, arg1, arg2.anIntArray37, arg2.anIntArray45); } } else if (GlRenderer.enabled) { - ((GlSprite) Static106.aClass3_Sub2_Sub1_7).method1427(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.aClass3_Sub2_Sub1_7.anInt1867 / 2, Static106.aClass3_Sub2_Sub1_7.anInt1859 / 2, (int)Camera.yawTarget, 256, (GlSprite) arg2.method489(false)); + ((GlSprite) Static106.compass).method1427(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.compass.anInt1867 / 2, Static106.compass.anInt1859 / 2, (int)Camera.yawTarget, 256, (GlSprite) arg2.method489(false)); } else { - ((SoftwareSprite) Static106.aClass3_Sub2_Sub1_7).method313(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.aClass3_Sub2_Sub1_7.anInt1867 / 2, Static106.aClass3_Sub2_Sub1_7.anInt1859 / 2, (int)Camera.yawTarget, arg2.anIntArray37, arg2.anIntArray45); + ((SoftwareSprite) Static106.compass).method313(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.compass.anInt1867 / 2, Static106.compass.anInt1859 / 2, (int)Camera.yawTarget, arg2.anIntArray37, arg2.anIntArray45); } - Static31.rectangleRedraw[arg3] = true; + InterfaceList.rectangleRedraw[arg3] = true; } @OriginalMember(owner = "client!mj", name = "a", descriptor = "(IIIII)Z") diff --git a/client/src/main/java/Static162.java b/client/src/main/java/Static162.java deleted file mode 100644 index 1427c2d..0000000 --- a/client/src/main/java/Static162.java +++ /dev/null @@ -1,46 +0,0 @@ -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static162 { - - @OriginalMember(owner = "client!ml", name = "K", descriptor = "I") - public static int anInt3947; - - @OriginalMember(owner = "client!ml", name = "Q", descriptor = "I") - public static int anInt3953 = 0; - - @OriginalMember(owner = "client!ml", name = "ab", descriptor = "Z") - public static boolean aBoolean190 = true; - - @OriginalMember(owner = "client!ml", name = "a", descriptor = "(BILclient!ve;)[Lclient!ek;") - public static SoftwareIndexedSprite[] method3088(@OriginalArg(1) int arg0, @OriginalArg(2) Js5 arg1) { - return Static254.method4346(arg1, arg0) ? Static121.method2406() : null; - } - - @OriginalMember(owner = "client!ml", name = "a", descriptor = "(B[B)[B") - public static byte[] method3092(@OriginalArg(1) byte[] arg0) { - @Pc(17) Buffer local17 = new Buffer(arg0); - @Pc(21) int local21 = local17.g1(); - @Pc(25) int local25 = local17.g4(); - if (local25 < 0 || Static133.anInt5233 != 0 && Static133.anInt5233 < local25) { - throw new RuntimeException(); - } else if (local21 == 0) { - @Pc(53) byte[] local53 = new byte[local25]; - local17.gBytes(local25, local53); - return local53; - } else { - @Pc(65) int local65 = local17.g4(); - if (local65 < 0 || Static133.anInt5233 != 0 && Static133.anInt5233 < local65) { - throw new RuntimeException(); - } - @Pc(85) byte[] local85 = new byte[local65]; - if (local21 == 1) { - Bzip2Decompressor.bunzip2(local85, local65, arg0, local25); - } else { - Static156.aClass56_1.method1842(local85, local17); - } - return local85; - } - } -} diff --git a/client/src/main/java/Static163.java b/client/src/main/java/Static163.java index d430f26..842e4ea 100644 --- a/client/src/main/java/Static163.java +++ b/client/src/main/java/Static163.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static163 { - @OriginalMember(owner = "client!n", name = "b", descriptor = "I") - public static int anInt3962; - - @OriginalMember(owner = "client!n", name = "h", descriptor = "[[[B") + @OriginalMember(owner = "client!n", name = "h", descriptor = "[[[B") public static byte[][][] aByteArrayArrayArray11; @OriginalMember(owner = "client!n", name = "e", descriptor = "Lclient!na;") diff --git a/client/src/main/java/Static164.java b/client/src/main/java/Static164.java index 8da6ed0..2f9c84e 100644 --- a/client/src/main/java/Static164.java +++ b/client/src/main/java/Static164.java @@ -7,15 +7,9 @@ public final class Static164 { @OriginalMember(owner = "client!na", name = "W", descriptor = "Z") public static boolean newTab; - @OriginalMember(owner = "client!na", name = "h", descriptor = "Z") - public static boolean safeMode = false; - - @OriginalMember(owner = "client!na", name = "l", descriptor = "I") + @OriginalMember(owner = "client!na", name = "l", descriptor = "I") public static int anInt3985 = 0; - @OriginalMember(owner = "client!na", name = "o", descriptor = "I") - public static int lastWorldId = 0; - @OriginalMember(owner = "client!na", name = "cb", descriptor = "Lclient!na;") public static final JagString aClass100_770 = Static28.parse(":allyreq:"); @@ -42,7 +36,7 @@ public final class Static164 { if (local14 > 0L) { local65 = arg3; } - local75 = Static129.pixels; + local75 = SoftwareRaster.pixels; local90 = (52736 - arg2 * 512) * 4 + arg0 * 4 + 24624; if (local35 == 0 || local35 == 2) { if (local28 == 0) { @@ -118,7 +112,7 @@ public final class Static164 { local65 = 15597568; } local90 = arg0 * 4 + (103 - arg2) * 2048 + 24624; - local75 = Static129.pixels; + local75 = SoftwareRaster.pixels; if (local28 == 0 || local28 == 2) { local75[local90 + 1536] = local65; local75[local90 + 1025] = local65; @@ -162,12 +156,12 @@ public final class Static164 { @OriginalMember(owner = "client!na", name = "a", descriptor = "(Lclient!ve;IZ)Lclient!mm;") public static SoftwareSprite method3117(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1) { - return Static254.method4346(arg0, arg1) ? Static196.method3537() : null; + return SpriteLoader.decode(arg0, arg1) ? SpriteLoader.method3537() : null; } @OriginalMember(owner = "client!na", name = "a", descriptor = "(IZILclient!ve;)Lclient!ek;") public static SoftwareIndexedSprite loadSoftwareIndexedSprite(@OriginalArg(2) int arg0, @OriginalArg(3) Js5 arg1) { - return Static234.method4016(arg1, 0, arg0) ? Static134.method2619() : null; + return SpriteLoader.decode(arg1, 0, arg0) ? Static134.method2619() : null; } @OriginalMember(owner = "client!na", name = "a", descriptor = "(IBZIZIIZ)Lclient!qf;") @@ -200,13 +194,13 @@ public final class Static164 { return null; } } - @Pc(118) int[] local118 = Static129.pixels; - @Pc(120) int local120 = Static129.width; - @Pc(122) int local122 = Static129.anInt3146; + @Pc(118) int[] local118 = SoftwareRaster.pixels; + @Pc(120) int local120 = SoftwareRaster.width; + @Pc(122) int local122 = SoftwareRaster.height; @Pc(125) int[] local125 = new int[4]; - Static129.method2497(local125); + SoftwareRaster.method2497(local125); @Pc(133) SoftwareSprite local133 = new SoftwareSprite(36, 32); - Static129.method2491(local133.anIntArray20, 36, 32); + SoftwareRaster.method2491(local133.anIntArray20, 36, 32); Rasteriser.prepare(); Rasteriser.setBounds(16, 16); @Pc(145) int local145 = local5.zoom2d; @@ -224,7 +218,7 @@ public final class Static164 { if (arg4 >= 2) { local133.method303(16777215); } - Static129.method2491(local133.anIntArray20, 36, 32); + SoftwareRaster.method2491(local133.anIntArray20, 36, 32); } if (arg0 != 0) { local133.method314(arg0); @@ -232,15 +226,15 @@ public final class Static164 { if (local5.certificateTemplate != -1) { local71.method1423(0, 0); } else if (local5.lentTemplate != -1) { - Static129.method2491(local71.anIntArray20, 36, 32); + SoftwareRaster.method2491(local71.anIntArray20, 36, 32); local133.method1423(0, 0); local133 = local71; } if (arg3 && (local5.stackable == 1 || arg5 != 1) && arg5 != -1) { Static256.aClass3_Sub2_Sub9_Sub1_1.method2857(Static52.method1288(arg5), 0, 9, 16776960, 1); } - Static129.method2491(local118, local120, local122); - Static129.method2488(local125); + SoftwareRaster.method2491(local118, local120, local122); + SoftwareRaster.method2488(local125); Rasteriser.prepare(); Rasteriser.jagged = true; return GlRenderer.enabled && !arg1 ? new GlSprite(local133) : local133; diff --git a/client/src/main/java/Static165.java b/client/src/main/java/Static165.java index 1a1d6ab..50678a8 100644 --- a/client/src/main/java/Static165.java +++ b/client/src/main/java/Static165.java @@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static165 { - @OriginalMember(owner = "client!nb", name = "h", descriptor = "I") - public static int anInt4038; - @OriginalMember(owner = "client!nb", name = "i", descriptor = "Lclient!qf;") public static Sprite aClass3_Sub2_Sub1_8; diff --git a/client/src/main/java/Static166.java b/client/src/main/java/Static166.java index 3e6fc3b..8a2b788 100644 --- a/client/src/main/java/Static166.java +++ b/client/src/main/java/Static166.java @@ -1,19 +1,11 @@ -import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; public final class Static166 { @OriginalMember(owner = "client!nc", name = "a", descriptor = "I") public static int anInt4044; - @OriginalMember(owner = "client!nc", name = "h", descriptor = "I") - public static int anInt4049; - - @OriginalMember(owner = "client!nc", name = "e", descriptor = "Lclient!na;") - public static final JagString aClass100_779 = Static28.parse("underlay"); - - @OriginalMember(owner = "client!nc", name = "j", descriptor = "I") + @OriginalMember(owner = "client!nc", name = "j", descriptor = "I") public static int mainLoadState = 0; @OriginalMember(owner = "client!nc", name = "m", descriptor = "I") @@ -22,98 +14,4 @@ public final class Static166 { @OriginalMember(owner = "client!nc", name = "n", descriptor = "I") public static int anInt4055 = 0; - @OriginalMember(owner = "client!nc", name = "a", descriptor = "(BLclient!wa;)V") - public static void method3166(@OriginalArg(1) Buffer arg0) { - label123: while (true) { - if (arg0.data.length > arg0.offset) { - @Pc(17) boolean local17 = false; - @Pc(19) int local19 = 0; - @Pc(21) int local21 = 0; - if (arg0.g1() == 1) { - local19 = arg0.g1(); - local17 = true; - local21 = arg0.g1(); - } - @Pc(42) int local42 = arg0.g1(); - @Pc(46) int local46 = arg0.g1(); - @Pc(53) int local53 = local42 * 64 - Static158.anInt3846; - @Pc(65) int local65 = Static2.anInt13 + Static181.anInt4296 - local46 * 64 - 1; - @Pc(84) int local84; - @Pc(95) int local95; - if (local53 >= 0 && local65 - 63 >= 0 && Static48.anInt1449 > local53 + 63 && local65 < Static181.anInt4296) { - local84 = local53 >> 6; - local95 = local65 >> 6; - @Pc(150) int local150 = 0; - while (true) { - if (local150 >= 64) { - continue label123; - } - for (@Pc(155) int local155 = 0; local155 < 64; local155++) { - if (!local17 || local19 * 8 <= local150 && local150 < local19 * 8 + 8 && local155 >= local21 * 8 && local155 < local21 * 8 + 8) { - @Pc(202) int local202 = arg0.g1(); - if (local202 != 0) { - @Pc(214) int local214; - if ((local202 & 0x1) == 1) { - local214 = arg0.g1(); - if (Static70.aByteArrayArrayArray7[local84][local95] == null) { - Static70.aByteArrayArrayArray7[local84][local95] = new byte[4096]; - } - Static70.aByteArrayArrayArray7[local84][local95][local150 + (63 - local155 << 6)] = (byte) local214; - } - if ((local202 & 0x2) == 2) { - local214 = arg0.g3(); - if (Static58.anIntArrayArrayArray5[local84][local95] == null) { - Static58.anIntArrayArrayArray5[local84][local95] = new int[4096]; - } - Static58.anIntArrayArrayArray5[local84][local95][(63 - local155 << 6) + local150] = local214; - } - if ((local202 & 0x4) == 4) { - local214 = arg0.g3(); - if (Static83.anIntArrayArrayArray3[local84][local95] == null) { - Static83.anIntArrayArrayArray3[local84][local95] = new int[4096]; - } - local214--; - @Pc(312) LocType local312 = Static271.get(local214); - if (local312.multiLocs != null) { - local312 = local312.getMultiLoc(); - if (local312 == null || local312.anInt4400 == -1) { - continue; - } - } - Static83.anIntArrayArrayArray3[local84][local95][(63 - local155 << 6) + local150] = local312.anInt4426 + 1; - @Pc(353) Class3_Sub26 local353 = new Class3_Sub26(); - local353.anInt4308 = local312.anInt4400; - local353.anInt4307 = local53; - local353.anInt4314 = local65; - Static145.aClass69_84.method2282(local353); - } - } - } - } - local150++; - } - } - local84 = 0; - while (true) { - if (local84 >= (local17 ? 64 : 4096)) { - continue label123; - } - local95 = arg0.g1(); - if (local95 != 0) { - if ((local95 & 0x1) == 1) { - arg0.offset++; - } - if ((local95 & 0x2) == 2) { - arg0.offset += 2; - } - if ((local95 & 0x4) == 4) { - arg0.offset += 3; - } - } - local84++; - } - } - return; - } - } } diff --git a/client/src/main/java/Static169.java b/client/src/main/java/Static169.java index c35cdd7..1a85d3e 100644 --- a/client/src/main/java/Static169.java +++ b/client/src/main/java/Static169.java @@ -8,9 +8,6 @@ public final class Static169 { @OriginalMember(owner = "client!nf", name = "c", descriptor = "[S") public static short[] aShortArray52; - @OriginalMember(owner = "client!nf", name = "d", descriptor = "Lclient!fd;") - public static WorldMapFont aClass41_5; - @OriginalMember(owner = "client!nf", name = "e", descriptor = "I") public static int anInt4073; @@ -66,13 +63,13 @@ public final class Static169 { } @Pc(90) PrivilegedRequest local90 = arg3.enterFullScreen(arg0, arg1, arg2); while (local90.status == 0) { - Static231.sleep(10L); + ThreadUtils.sleep(10L); } @Pc(103) Frame local103 = (Frame) local90.result; if (local103 == null) { return null; } else if (local90.status == 2) { - Static25.exitFullScreen(local103, arg3); + DisplayMode.exitFullScreen(local103, arg3); return null; } else { return local103; diff --git a/client/src/main/java/Static17.java b/client/src/main/java/Static17.java index 7870270..6ca80df 100644 --- a/client/src/main/java/Static17.java +++ b/client/src/main/java/Static17.java @@ -13,10 +13,7 @@ public final class Static17 { @OriginalMember(owner = "client!bg", name = "M", descriptor = "I") public static int milliseconds = 0; - @OriginalMember(owner = "client!bg", name = "N", descriptor = "Lclient!na;") - public static final JagString aClass100_102 = Static28.parse("mapfunction"); - - @OriginalMember(owner = "client!bg", name = "a", descriptor = "(B)V") + @OriginalMember(owner = "client!bg", name = "a", descriptor = "(B)V") public static void method527() { Static57.aClass3_Sub15_Sub1_3.method2233(); @Pc(11) int local11 = Static57.aClass3_Sub15_Sub1_3.method2238(1); @@ -32,7 +29,7 @@ public final class Static17 { @Pc(64) int local64; if (local23 == 1) { local54 = Static57.aClass3_Sub15_Sub1_3.method2238(3); - Static173.self.method2684(1, local54); + PlayerList.self.method2684(1, local54); local64 = Static57.aClass3_Sub15_Sub1_3.method2238(1); if (local64 == 1) { Static44.anIntArray106[Static116.anInt2951++] = 2047; @@ -40,12 +37,12 @@ public final class Static17 { } else if (local23 == 2) { if (Static57.aClass3_Sub15_Sub1_3.method2238(1) == 1) { local54 = Static57.aClass3_Sub15_Sub1_3.method2238(3); - Static173.self.method2684(2, local54); + PlayerList.self.method2684(2, local54); local64 = Static57.aClass3_Sub15_Sub1_3.method2238(3); - Static173.self.method2684(2, local64); + PlayerList.self.method2684(2, local64); } else { local54 = Static57.aClass3_Sub15_Sub1_3.method2238(3); - Static173.self.method2684(0, local54); + PlayerList.self.method2684(0, local54); } local54 = Static57.aClass3_Sub15_Sub1_3.method2238(1); if (local54 == 1) { @@ -60,7 +57,7 @@ public final class Static17 { Static44.anIntArray106[Static116.anInt2951++] = 2047; } @Pc(181) int local181 = Static57.aClass3_Sub15_Sub1_3.method2238(7); - Static173.self.method1265(local181, local64 == 1, local54); + PlayerList.self.method1265(local181, local64 == 1, local54); } } diff --git a/client/src/main/java/Static170.java b/client/src/main/java/Static170.java index bf8474a..d319050 100644 --- a/client/src/main/java/Static170.java +++ b/client/src/main/java/Static170.java @@ -70,7 +70,7 @@ public final class Static170 { local7.anInt1188 = arg7; local7.anInt1191 = arg0; local7.anInt1198 = arg9; - Static128.aClass69_77.method2282(local7); + Static128.aClass69_77.addTail(local7); } @OriginalMember(owner = "client!nh", name = "a", descriptor = "(BII)V") @@ -80,8 +80,8 @@ public final class Static170 { if (local20 == null) { local20 = new LongNode(4611686018427387905L); Static199.aClass133_20.put(local20, (long) arg1); - } else if (local20.aLong55 != 4611686018427387905L) { - local20.aLong55 = MonotonicClock.currentTimeMillis() + 500L | 0x4000000000000000L; + } else if (local20.value != 4611686018427387905L) { + local20.value = MonotonicClock.currentTimeMillis() + 500L | 0x4000000000000000L; } } } diff --git a/client/src/main/java/Static171.java b/client/src/main/java/Static171.java index 5e087cb..6469567 100644 --- a/client/src/main/java/Static171.java +++ b/client/src/main/java/Static171.java @@ -19,11 +19,11 @@ public final class Static171 { @OriginalMember(owner = "client!ni", name = "a", descriptor = "(ILclient!na;)I") public static int method3218(@OriginalArg(1) JagString arg0) { - if (Static203.aClass134_1 == null || arg0.length() == 0) { + if (WorldMap.labels == null || arg0.length() == 0) { return -1; } - for (@Pc(20) int local20 = 0; local20 < Static203.aClass134_1.anInt5074; local20++) { - if (Static203.aClass134_1.aClass100Array153[local20].method3140(Static101.aClass100_538, Static197.aClass100_872).method3142(arg0)) { + for (@Pc(20) int local20 = 0; local20 < WorldMap.labels.anInt5074; local20++) { + if (WorldMap.labels.aClass100Array153[local20].method3140(Static101.aClass100_538, Static197.aClass100_872).method3142(arg0)) { return local20; } } diff --git a/client/src/main/java/Static172.java b/client/src/main/java/Static172.java index 8c361c9..b55f894 100644 --- a/client/src/main/java/Static172.java +++ b/client/src/main/java/Static172.java @@ -10,10 +10,7 @@ public final class Static172 { @OriginalMember(owner = "client!nj", name = "e", descriptor = "Lclient!va;") public static MidiPcmStream aClass3_Sub3_Sub4_2; - @OriginalMember(owner = "client!nj", name = "f", descriptor = "Lclient!en;") - public static BufferedFile cacheData; - - @OriginalMember(owner = "client!nj", name = "g", descriptor = "Lclient!ve;") + @OriginalMember(owner = "client!nj", name = "g", descriptor = "Lclient!ve;") public static Js5 aClass153_70; @OriginalMember(owner = "client!nj", name = "j", descriptor = "[I") diff --git a/client/src/main/java/Static173.java b/client/src/main/java/Static173.java index fa7701e..356b465 100644 --- a/client/src/main/java/Static173.java +++ b/client/src/main/java/Static173.java @@ -10,12 +10,6 @@ public final class Static173 { @OriginalMember(owner = "client!nk", name = "E", descriptor = "I") public static int redDelta; - @OriginalMember(owner = "client!nk", name = "L", descriptor = "[Lclient!mm;") - public static SoftwareSprite[] aClass3_Sub2_Sub1_Sub1Array9; - - @OriginalMember(owner = "client!nk", name = "O", descriptor = "Lclient!e;") - public static Player self; - @OriginalMember(owner = "client!nk", name = "n", descriptor = "[Lclient!sl;") public static final SynthSound[] aClass138Array1 = new SynthSound[50]; diff --git a/client/src/main/java/Static175.java b/client/src/main/java/Static175.java index ff195f5..ad75fbe 100644 --- a/client/src/main/java/Static175.java +++ b/client/src/main/java/Static175.java @@ -25,8 +25,8 @@ public final class Static175 { if (Static267.anInt5775 > 0) { Static278.processLogout(); } else { - Static233.aClass95_4 = Static124.socket; - Static124.socket = null; + Static233.aClass95_4 = Protocol.socket; + Protocol.socket = null; Static196.setGameState(40); } } diff --git a/client/src/main/java/Static176.java b/client/src/main/java/Static176.java index 8c1f7d4..5c1163b 100644 --- a/client/src/main/java/Static176.java +++ b/client/src/main/java/Static176.java @@ -31,11 +31,11 @@ public final class Static176 { @Pc(3) World local3 = Static54.getWorld(arg0); if (local3 == null) { return false; - } else if (SignLink.anInt5928 == 1 || SignLink.anInt5928 == 2 || Static83.modeWhere == 2) { + } else if (SignLink.anInt5928 == 1 || SignLink.anInt5928 == 2 || client.modeWhere == 2) { @Pc(31) byte[] local31 = local3.aClass100_71.method3148(); Static60.hostname = new String(local31, 0, local31.length); Static125.worldId = local3.anInt382; - if (Static83.modeWhere != 0) { + if (client.modeWhere != 0) { Static271.defaultPort = Static125.worldId + 43594; // 40000; Static209.port = Static271.defaultPort; Static55.alternatePort = Static125.worldId + 43594; // 50000; @@ -43,16 +43,16 @@ public final class Static176 { return true; } else { @Pc(62) JagString local62 = Static211.aClass100_230; - if (Static83.modeWhere != 0) { - local62 = Static34.concatenate(new JagString[] { Static31.aClass100_193, Static123.parseInt(local3.anInt382 + 7000) }); + if (client.modeWhere != 0) { + local62 = JagString.concatenate(new JagString[] { Static31.aClass100_193, Static123.parseInt(local3.anInt382 + 7000) }); } @Pc(89) JagString local89 = Static211.aClass100_230; - if (Static47.settings != null) { - local89 = Static34.concatenate(new JagString[] { Static167.aClass100_783, Static47.settings}); + if (client.settings != null) { + local89 = JagString.concatenate(new JagString[] { Static167.aClass100_783, client.settings}); } - @Pc(182) JagString local182 = Static34.concatenate(new JagString[] { Static115.aClass100_582, local3.aClass100_71, local62, Static279.aClass100_1107, Static123.parseInt(Static141.language), aClass100_801, Static123.parseInt(Static204.affiliate), local89, Static139.aClass100_659, Static150.objectTag ? Static30.aClass100_184 : Static260.aClass100_945, Static60.aClass100_420, Static233.javaScript ? Static30.aClass100_184 : Static260.aClass100_945, Static198.aClass100_260, Static249.advertSuppressed ? Static30.aClass100_184 : Static260.aClass100_945 }); + @Pc(182) JagString local182 = JagString.concatenate(new JagString[] { Static115.aClass100_582, local3.aClass100_71, local62, Static279.aClass100_1107, Static123.parseInt(client.language), aClass100_801, Static123.parseInt(client.affiliate), local89, Static139.aClass100_659, client.objectTag ? Static30.aClass100_184 : Static260.aClass100_945, Static60.aClass100_420, client.javaScript ? Static30.aClass100_184 : Static260.aClass100_945, Static198.aClass100_260, client.advertSuppressed ? Static30.aClass100_184 : Static260.aClass100_945 }); try { - Static215.instance.getAppletContext().showDocument(local182.method3107(), "_self"); + client.instance.getAppletContext().showDocument(local182.method3107(), "_self"); return true; } catch (@Pc(191) Exception local191) { return false; @@ -79,10 +79,10 @@ public final class Static176 { Static98.method1966(Static246.anInt5393, 0L, Static225.aClass100_961, local33, (short) 11, Static102.aClass100_545, local47); } } else { - if (Static266.game == 1) { - Static98.method1966(-1, 0L, Static186.EMPTY, local33, (short) 36, LocalizedText.FACEHERE, local47); + if (client.game == 1) { + Static98.method1966(-1, 0L, JagString.EMPTY, local33, (short) 36, LocalizedText.FACEHERE, local47); } - Static98.method1966(-1, 0L, Static186.EMPTY, local33, (short) 60, Static195.aClass100_859, local47); + Static98.method1966(-1, 0L, JagString.EMPTY, local33, (short) 60, Static195.aClass100_859, local47); } } @Pc(112) long local112 = -1L; @@ -104,11 +104,11 @@ public final class Static176 { continue; } if (Static260.anInt5014 == 1) { - Static98.method1966(Static169.anInt4075, local121, Static34.concatenate(new JagString[] { Static34.aClass100_203, Static27.aClass100_164, local172.name}), local47, (short) 14, LocalizedText.USE, local147); + Static98.method1966(Static169.anInt4075, local121, JagString.concatenate(new JagString[] { Static34.aClass100_203, Static27.aClass100_164, local172.name}), local47, (short) 14, LocalizedText.USE, local147); } else if (Static241.aBoolean302) { @Pc(363) ParamType local363 = Static121.anInt3039 == -1 ? null : Static110.method2277(Static121.anInt3039); if ((Static274.anInt4999 & 0x4) != 0 && (local363 == null || local172.getParam(local363.defaultInt, Static121.anInt3039) != local363.defaultInt)) { - Static98.method1966(Static246.anInt5393, local121, Static34.concatenate(new JagString[] { Static78.aClass100_466, Static27.aClass100_164, local172.name}), local47, (short) 38, Static102.aClass100_545, local147); + Static98.method1966(Static246.anInt5393, local121, JagString.concatenate(new JagString[] { Static78.aClass100_466, Static27.aClass100_164, local172.name}), local47, (short) 38, Static102.aClass100_545, local147); } } else { @Pc(228) JagString[] local228 = local172.ops; @@ -141,11 +141,11 @@ public final class Static176 { if (local240 == 4) { local254 = 1001; } - Static98.method1966(local268, local121, Static34.concatenate(new JagString[] { Static240.aClass100_1008, local172.name}), local47, local254, local228[local240], local147); + Static98.method1966(local268, local121, JagString.concatenate(new JagString[] { Static240.aClass100_1008, local172.name}), local47, local254, local228[local240], local147); } } } - Static98.method1966(Static225.anInt5073, (long) local172.anInt4426, Static34.concatenate(new JagString[] { Static240.aClass100_1008, local172.name}), local47, (short) 1004, LocalizedText.EXAMINE, local147); + Static98.method1966(Static225.anInt5073, (long) local172.anInt4426, JagString.concatenate(new JagString[] { Static240.aClass100_1008, local172.name}), local47, (short) 1004, LocalizedText.EXAMINE, local147); } } @Pc(514) int local514; @@ -209,11 +209,11 @@ public final class Static176 { local240 = local940.aClass8_Sub7_1.anInt5555; @Pc(951) ObjType local951 = Static71.get(local240); if (Static260.anInt5014 == 1) { - Static98.method1966(Static169.anInt4075, (long) local240, Static34.concatenate(new JagString[] { Static34.aClass100_203, Static223.aClass100_947, local951.name}), local47, (short) 33, LocalizedText.USE, local147); + Static98.method1966(Static169.anInt4075, (long) local240, JagString.concatenate(new JagString[] { Static34.aClass100_203, Static223.aClass100_947, local951.name}), local47, (short) 33, LocalizedText.USE, local147); } else if (Static241.aBoolean302) { @Pc(1142) ParamType local1142 = Static121.anInt3039 == -1 ? null : Static110.method2277(Static121.anInt3039); if ((Static274.anInt4999 & 0x1) != 0 && (local1142 == null || local951.getParam(local1142.defaultInt, Static121.anInt3039) != local1142.defaultInt)) { - Static98.method1966(Static246.anInt5393, (long) local240, Static34.concatenate(new JagString[] { Static78.aClass100_466, Static223.aClass100_947, local951.name}), local47, (short) 39, Static102.aClass100_545, local147); + Static98.method1966(Static246.anInt5393, (long) local240, JagString.concatenate(new JagString[] { Static78.aClass100_466, Static223.aClass100_947, local951.name}), local47, (short) 39, Static102.aClass100_545, local147); } } else { @Pc(997) JagString[] local997 = local951.ops; @@ -245,10 +245,10 @@ public final class Static176 { if (local514 == 4) { local1025 = 24; } - Static98.method1966(local1041, (long) local240, Static34.concatenate(new JagString[] { Static8.aClass100_32, local951.name}), local47, local1025, local997[local514], local147); + Static98.method1966(local1041, (long) local240, JagString.concatenate(new JagString[] { Static8.aClass100_32, local951.name}), local47, local1025, local997[local514], local147); } } - Static98.method1966(Static225.anInt5073, (long) local240, Static34.concatenate(new JagString[] { Static8.aClass100_32, local951.name}), local47, (short) 1002, LocalizedText.EXAMINE, local147); + Static98.method1966(Static225.anInt5073, (long) local240, JagString.concatenate(new JagString[] { Static8.aClass100_32, local951.name}), local47, (short) 1002, LocalizedText.EXAMINE, local147); } } } diff --git a/client/src/main/java/Static178.java b/client/src/main/java/Static178.java index cea7306..f5c5bb9 100644 --- a/client/src/main/java/Static178.java +++ b/client/src/main/java/Static178.java @@ -4,22 +4,13 @@ import org.openrs2.deob.annotation.Pc; public final class Static178 { - @OriginalMember(owner = "client!od", name = "f", descriptor = "Lclient!jd;") - public static MouseRecorder instance; - - @OriginalMember(owner = "client!od", name = "c", descriptor = "Z") - public static boolean highDetailLighting = true; - @OriginalMember(owner = "client!od", name = "g", descriptor = "S") public static short aShort25 = 256; @OriginalMember(owner = "client!od", name = "i", descriptor = "I") public static int anInt4247 = 0; - @OriginalMember(owner = "client!od", name = "n", descriptor = "Z") - public static boolean haveIe6 = false; - - @OriginalMember(owner = "client!od", name = "a", descriptor = "(ILclient!na;)V") + @OriginalMember(owner = "client!od", name = "a", descriptor = "(ILclient!na;)V") public static void method3318(@OriginalArg(1) JagString arg0) { if (Static199.aClass3_Sub22Array1 == null) { return; diff --git a/client/src/main/java/Static18.java b/client/src/main/java/Static18.java index 4eb7f5b..ee57a5a 100644 --- a/client/src/main/java/Static18.java +++ b/client/src/main/java/Static18.java @@ -7,15 +7,9 @@ public final class Static18 { @OriginalMember(owner = "client!bh", name = "M", descriptor = "Z") public static boolean loaded; - @OriginalMember(owner = "client!bh", name = "s", descriptor = "Lclient!na;") - public static final JagString aClass100_106 = Static28.parse("p11_full"); - @OriginalMember(owner = "client!bh", name = "t", descriptor = "I") public static int anInt588 = 0; - @OriginalMember(owner = "client!bh", name = "v", descriptor = "Lclient!na;") - public static final JagString aClass100_107 = Static28.parse("floorshadows"); - @OriginalMember(owner = "client!bh", name = "z", descriptor = "Z") public static boolean serverUpdatedPreferences = true; diff --git a/client/src/main/java/Static181.java b/client/src/main/java/Static181.java index 9257f19..0a50391 100644 --- a/client/src/main/java/Static181.java +++ b/client/src/main/java/Static181.java @@ -7,10 +7,7 @@ public final class Static181 { @OriginalMember(owner = "client!oi", name = "h", descriptor = "Lclient!qf;") public static Sprite aClass3_Sub2_Sub1_9; - @OriginalMember(owner = "client!oi", name = "m", descriptor = "I") - public static int anInt4296; - - @OriginalMember(owner = "client!oi", name = "b", descriptor = "Lclient!na;") + @OriginalMember(owner = "client!oi", name = "b", descriptor = "Lclient!na;") public static final JagString aClass100_810 = Static28.parse("::qa_op_test"); @OriginalMember(owner = "client!oi", name = "j", descriptor = "Lclient!na;") @@ -27,7 +24,7 @@ public final class Static181 { @OriginalMember(owner = "client!oi", name = "a", descriptor = "(II)Lclient!na;") public static JagString method3341(@OriginalArg(0) int arg0) { - return Static34.concatenate(new JagString[] { Static123.parseInt(arg0 >> 24 & 0xFF), Static233.aClass100_994, Static123.parseInt(arg0 >> 16 & 0xFF), Static233.aClass100_994, Static123.parseInt(arg0 >> 8 & 0xFF), Static233.aClass100_994, Static123.parseInt(arg0 & 0xFF) }); + return JagString.concatenate(new JagString[] { Static123.parseInt(arg0 >> 24 & 0xFF), Static233.aClass100_994, Static123.parseInt(arg0 >> 16 & 0xFF), Static233.aClass100_994, Static123.parseInt(arg0 >> 8 & 0xFF), Static233.aClass100_994, Static123.parseInt(arg0 & 0xFF) }); } @OriginalMember(owner = "client!oi", name = "a", descriptor = "(I)V") @@ -44,7 +41,7 @@ public final class Static181 { if (GlRenderer.enabled) { Static46.clear(); } else { - Static129.clear(); + SoftwareRaster.clear(); } @Pc(20) int height = GameShell.canvasHeight; diff --git a/client/src/main/java/Static182.java b/client/src/main/java/Static182.java index 95cbe3d..7274053 100644 --- a/client/src/main/java/Static182.java +++ b/client/src/main/java/Static182.java @@ -25,32 +25,7 @@ public final class Static182 { @OriginalMember(owner = "client!oj", name = "z", descriptor = "[Z") public static final boolean[] aBooleanArray97 = new boolean[] { true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false }; - @OriginalMember(owner = "client!oj", name = "a", descriptor = "(BZLclient!rk;)V") - public static void render(@OriginalArg(1) boolean arg0, @OriginalArg(2) Font arg1) { - @Pc(9) int local9; - if (GlRenderer.enabled || arg0) { - local9 = GameShell.canvasHeight; - @Pc(15) int local15 = local9 * 956 / 503; - Static78.titleBg.renderResizedTransparent((GameShell.canvasWidth - local15) / 2, 0, local15, local9); - Static243.logo.renderTransparent(GameShell.canvasWidth / 2 - Static243.logo.width / 2, 18); - } - arg1.renderCenter(LocalizedText.GAME0_LOADING, GameShell.canvasWidth / 2, GameShell.canvasHeight / 2 - 26, 16777215, -1); - local9 = GameShell.canvasHeight / 2 - 18; - if (GlRenderer.enabled) { - Static46.method1179(GameShell.canvasWidth / 2 - 152, local9, 304, 34, 9179409); - Static46.method1179(GameShell.canvasWidth / 2 - 151, local9 - -1, 302, 32, 0); - Static46.method1186(GameShell.canvasWidth / 2 - 150, local9 + 2, Static199.mainLoadPercentage * 3, 30, 9179409); - Static46.method1186(GameShell.canvasWidth / 2 + Static199.mainLoadPercentage * 3 - 150, local9 + 2, 300 - Static199.mainLoadPercentage * 3, 30, 0); - } else { - Static129.method2483(GameShell.canvasWidth / 2 - 152, local9, 304, 34, 9179409); - Static129.method2483(GameShell.canvasWidth / 2 - 151, local9 + 1, 302, 32, 0); - Static129.method2495(GameShell.canvasWidth / 2 - 150, local9 + 2, Static199.mainLoadPercentage * 3, 30, 9179409); - Static129.method2495(Static199.mainLoadPercentage * 3 + GameShell.canvasWidth / 2 - 150, local9 + 2, 300 - Static199.mainLoadPercentage * 3, 30, 0); - } - arg1.renderCenter(Static126.mainLoadSecondaryText, GameShell.canvasWidth / 2, GameShell.canvasHeight / 2 + 4, 16777215, -1); - } - - @OriginalMember(owner = "client!oj", name = "a", descriptor = "(IZIJI)Lclient!na;") + @OriginalMember(owner = "client!oj", name = "a", descriptor = "(IZIJI)Lclient!na;") public static JagString valueToBase10String(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) long arg3) { @Pc(9) JagString local9 = Static87.allocate(0); if (arg3 < 0L) { @@ -96,7 +71,7 @@ public final class Static182 { if (local59.length() > 0) { local59.method3113(local28); } - return Static34.concatenate(new JagString[] { local9, local137.method3124(), local59.method3124() }); + return JagString.concatenate(new JagString[] { local9, local137.method3124(), local59.method3124() }); } @OriginalMember(owner = "client!oj", name = "a", descriptor = "(IBI[[III)I") diff --git a/client/src/main/java/Static185.java b/client/src/main/java/Static185.java index 4248486..3cc1ab7 100644 --- a/client/src/main/java/Static185.java +++ b/client/src/main/java/Static185.java @@ -10,15 +10,9 @@ public final class Static185 { @OriginalMember(owner = "client!p", name = "g", descriptor = "F") public static float aFloat23; - @OriginalMember(owner = "client!p", name = "c", descriptor = "Lclient!ih;") - public static final LinkedList lowPriorityRequests = new LinkedList(); - @OriginalMember(owner = "client!p", name = "d", descriptor = "I") public static int anInt4369 = 0; - @OriginalMember(owner = "client!p", name = "f", descriptor = "Lclient!na;") - public static final JagString aClass100_823 = Static28.parse("::serverjs5drop"); - @OriginalMember(owner = "client!p", name = "a", descriptor = "(I)V") public static void method3395() { if (Static184.loginStep == 5) { @@ -28,7 +22,7 @@ public final class Static185 { @OriginalMember(owner = "client!p", name = "a", descriptor = "(IZIZLclient!mj;IIIBII)V") public static void method3397(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) CollisionMap arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9) { - if (arg1 && !Static138.allLevelsAreVisible() && (Static12.tileSettings[0][arg7][arg8] & 0x2) == 0) { + if (arg1 && !SceneGraph.allLevelsAreVisible() && (Static12.tileSettings[0][arg7][arg8] & 0x2) == 0) { if ((Static12.tileSettings[arg2][arg7][arg8] & 0x10) != 0) { return; } @@ -104,7 +98,7 @@ public final class Static185 { @Pc(387) Entity local387; @Pc(403) Class139 local403; if (arg6 == 22) { - if (Static250.showGroundDecorations || local62.anInt4429 != 0 || local62.anInt4435 == 1 || local62.aBoolean206) { + if (Preferences.showGroundDecorations || local62.anInt4429 != 0 || local62.anInt4435 == 1 || local62.aBoolean206) { if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { local403 = local62.method3428(arg9, local165, local153, 22, local199, local213, arg1, null, local330, local173); if (GlRenderer.enabled && local330) { diff --git a/client/src/main/java/Static186.java b/client/src/main/java/Static186.java index b2eb2c6..55cf89b 100644 --- a/client/src/main/java/Static186.java +++ b/client/src/main/java/Static186.java @@ -1,6 +1,4 @@ -import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; public final class Static186 { @@ -10,185 +8,7 @@ public final class Static186 { @OriginalMember(owner = "client!pa", name = "K", descriptor = "Z") public static boolean aBoolean205 = false; - @OriginalMember(owner = "client!pa", name = "N", descriptor = "I") - public static int antiAliasingMode = 0; - - @OriginalMember(owner = "client!pa", name = "O", descriptor = "Lclient!na;") - public static final JagString EMPTY = Static28.parse(""); - - @OriginalMember(owner = "client!pa", name = "P", descriptor = "Lclient!na;") - public static JagString password = EMPTY; - @OriginalMember(owner = "client!pa", name = "R", descriptor = "[Z") public static final boolean[] aBooleanArray100 = new boolean[100]; - @OriginalMember(owner = "client!pa", name = "S", descriptor = "Lclient!na;") - public static JagString username = EMPTY; - - @OriginalMember(owner = "client!pa", name = "d", descriptor = "(I)V") - public static void method3413() { - if (Static269.aClass3_Sub2_Sub4_2 == null) { - return; - } - if (Static41.anInt1309 < 10) { - if (!Static119.aClass153_44.allFilesComplete(Static269.aClass3_Sub2_Sub4_2.aClass100_138)) { - Static41.anInt1309 = Static227.js5Archive23.method4478(Static269.aClass3_Sub2_Sub4_2.aClass100_138) / 10; - return; - } - Static6.method84(); - Static41.anInt1309 = 10; - } - if (Static41.anInt1309 == 10) { - Static158.anInt3846 = Static269.aClass3_Sub2_Sub4_2.anInt763 >> 6 << 6; - Static2.anInt13 = Static269.aClass3_Sub2_Sub4_2.anInt771 >> 6 << 6; - Static181.anInt4296 = (Static269.aClass3_Sub2_Sub4_2.anInt758 >> 6 << 6) + 64 - Static2.anInt13; - Static48.anInt1449 = (Static269.aClass3_Sub2_Sub4_2.anInt770 >> 6 << 6) + 64 - Static158.anInt3846; - if (Static269.aClass3_Sub2_Sub4_2.anInt772 == 37) { - Static83.aFloat3 = 3.0F; - Static138.aFloat14 = 3.0F; - } else if (Static269.aClass3_Sub2_Sub4_2.anInt772 == 50) { - Static83.aFloat3 = 4.0F; - Static138.aFloat14 = 4.0F; - } else if (Static269.aClass3_Sub2_Sub4_2.anInt772 == 75) { - Static83.aFloat3 = 6.0F; - Static138.aFloat14 = 6.0F; - } else if (Static269.aClass3_Sub2_Sub4_2.anInt772 == 100) { - Static83.aFloat3 = 8.0F; - Static138.aFloat14 = 8.0F; - } else if (Static269.aClass3_Sub2_Sub4_2.anInt772 == 200) { - Static83.aFloat3 = 16.0F; - Static138.aFloat14 = 16.0F; - } else { - Static83.aFloat3 = 8.0F; - Static138.aFloat14 = 8.0F; - } - @Pc(144) int local144 = (Static173.self.xFine >> 7) + Static225.originX - Static158.anInt3846; - @Pc(153) int local153 = local144 + (int) (Math.random() * 10.0D) - 5; - @Pc(168) int local168 = Static2.anInt13 + Static181.anInt4296 - Static142.originZ - (Static173.self.zFine >> 7) - 1; - @Pc(177) int local177 = local168 + (int) (Math.random() * 10.0D) - 5; - if (local153 >= 0 && Static48.anInt1449 > local153 && local177 >= 0 && local177 < Static181.anInt4296) { - Static13.anInt435 = local153; - Static28.anInt919 = local177; - } else { - Static28.anInt919 = Static2.anInt13 + Static181.anInt4296 - Static269.aClass3_Sub2_Sub4_2.anInt764 * 64 - 1; - Static13.anInt435 = Static269.aClass3_Sub2_Sub4_2.anInt769 * 64 - Static158.anInt3846; - } - Static38.method965(); - Static145.anIntArray330 = new int[Static98.anInt2510 + 1]; - @Pc(235) int local235 = Static181.anInt4296 >> 6; - @Pc(239) int local239 = Static48.anInt1449 >> 6; - Static90.aByteArrayArrayArray8 = new byte[local239][local235][]; - @Pc(249) int local249 = Static86.anInt2293 >> 2 << 10; - Static70.aByteArrayArrayArray7 = new byte[local239][local235][]; - Static83.anIntArrayArrayArray3 = new int[local239][local235][]; - Static34.aByteArrayArrayArray3 = new byte[local239][local235][]; - Static248.anIntArrayArrayArray17 = new int[local239][local235][]; - Static229.aByteArrayArrayArray12 = new byte[local239][local235][]; - @Pc(273) int local273 = Static183.anInt4272 >> 1; - Static125.aByteArrayArrayArray10 = new byte[local239][local235][]; - Static58.anIntArrayArrayArray5 = new int[local239][local235][]; - Static70.method1549(local273, local249); - Static41.anInt1309 = 20; - } else if (Static41.anInt1309 == 20) { - Static33.method868(new Buffer(Static119.aClass153_44.fetchFile(Static166.aClass100_779, Static269.aClass3_Sub2_Sub4_2.aClass100_138))); - Static41.anInt1309 = 30; - Static7.ping(true); - Static234.resetTimer(); - } else if (Static41.anInt1309 == 30) { - Static47.method3998(new Buffer(Static119.aClass153_44.fetchFile(Static4.aClass100_7, Static269.aClass3_Sub2_Sub4_2.aClass100_138))); - Static41.anInt1309 = 40; - Static234.resetTimer(); - } else if (Static41.anInt1309 == 40) { - Static231.method3980(new Buffer(Static119.aClass153_44.fetchFile(Static73.aClass100_455, Static269.aClass3_Sub2_Sub4_2.aClass100_138))); - Static41.anInt1309 = 50; - Static234.resetTimer(); - } else if (Static41.anInt1309 == 50) { - Static166.method3166(new Buffer(Static119.aClass153_44.fetchFile(Static42.aClass100_331, Static269.aClass3_Sub2_Sub4_2.aClass100_138))); - Static41.anInt1309 = 60; - Static7.ping(true); - Static234.resetTimer(); - } else if (Static41.anInt1309 == 60) { - if (Static119.aClass153_44.method4497(Static34.concatenate(new JagString[] { Static269.aClass3_Sub2_Sub4_2.aClass100_138, Static265.aClass100_1086 }))) { - if (!Static119.aClass153_44.allFilesComplete(Static34.concatenate(new JagString[] { Static269.aClass3_Sub2_Sub4_2.aClass100_138, Static265.aClass100_1086 }))) { - return; - } - Static203.aClass134_1 = Static140.createMapFunctionGroup(Static34.concatenate(new JagString[] { Static269.aClass3_Sub2_Sub4_2.aClass100_138, Static265.aClass100_1086 }), Static119.aClass153_44); - } else { - Static203.aClass134_1 = new MapFunctionGroup(0); - } - Static41.anInt1309 = 70; - Static234.resetTimer(); - } else if (Static41.anInt1309 == 70) { - Static273.aClass41_7 = new WorldMapFont(11, true, GameShell.canvas); - Static41.anInt1309 = 73; - Static7.ping(true); - Static234.resetTimer(); - } else if (Static41.anInt1309 == 73) { - Static152.aClass41_3 = new WorldMapFont(12, true, GameShell.canvas); - Static41.anInt1309 = 76; - Static7.ping(true); - Static234.resetTimer(); - } else if (Static41.anInt1309 == 76) { - Static169.aClass41_5 = new WorldMapFont(14, true, GameShell.canvas); - Static41.anInt1309 = 79; - Static7.ping(true); - Static234.resetTimer(); - } else if (Static41.anInt1309 == 79) { - Static130.aClass41_1 = new WorldMapFont(17, true, GameShell.canvas); - Static41.anInt1309 = 82; - Static7.ping(true); - Static234.resetTimer(); - } else if (Static41.anInt1309 == 82) { - Static203.aClass41_8 = new WorldMapFont(19, true, GameShell.canvas); - Static41.anInt1309 = 85; - Static7.ping(true); - Static234.resetTimer(); - } else if (Static41.anInt1309 == 85) { - Static130.aClass41_2 = new WorldMapFont(22, true, GameShell.canvas); - Static41.anInt1309 = 88; - Static7.ping(true); - Static234.resetTimer(); - } else if (Static41.anInt1309 == 88) { - Static270.aClass41_9 = new WorldMapFont(26, true, GameShell.canvas); - Static41.anInt1309 = 91; - Static7.ping(true); - Static234.resetTimer(); - } else { - Static160.aClass41_4 = new WorldMapFont(30, true, GameShell.canvas); - Static41.anInt1309 = 100; - Static7.ping(true); - Static234.resetTimer(); - System.gc(); - } - } - - @OriginalMember(owner = "client!pa", name = "a", descriptor = "(IIILclient!e;)V") - public static void method3415(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Player arg2) { - if (arg1 == arg2.anInt3369 && arg1 != -1) { - @Pc(89) SeqType local89 = Static36.get(arg1); - @Pc(92) int local92 = local89.anInt5347; - if (local92 == 1) { - arg2.anInt3420 = arg0; - arg2.anInt3360 = 0; - arg2.anInt3373 = 1; - arg2.anInt3425 = 0; - arg2.anInt3371 = 0; - Static152.method2836(arg2.zFine, local89, arg2.xFine, Static173.self == arg2, arg2.anInt3425); - } - if (local92 == 2) { - arg2.anInt3371 = 0; - } - } else if (arg1 == -1 || arg2.anInt3369 == -1 || Static36.get(arg1).anInt5355 >= Static36.get(arg2.anInt3369).anInt5355) { - arg2.anInt3373 = 1; - arg2.anInt3425 = 0; - arg2.anInt3420 = arg0; - arg2.anInt3405 = arg2.movementQueueSize; - arg2.anInt3371 = 0; - arg2.anInt3360 = 0; - arg2.anInt3369 = arg1; - if (arg2.anInt3369 != -1) { - Static152.method2836(arg2.zFine, Static36.get(arg2.anInt3369), arg2.xFine, arg2 == Static173.self, arg2.anInt3425); - } - } - } } diff --git a/client/src/main/java/Static187.java b/client/src/main/java/Static187.java index e1e7cc6..c0f6e6b 100644 --- a/client/src/main/java/Static187.java +++ b/client/src/main/java/Static187.java @@ -7,10 +7,7 @@ public final class Static187 { @OriginalMember(owner = "client!pb", name = "x", descriptor = "[[[I") public static final int[][][] anIntArrayArrayArray18 = new int[4][13][13]; - @OriginalMember(owner = "client!pb", name = "Q", descriptor = "I") - public static int worldListId = 1; - - @OriginalMember(owner = "client!pb", name = "ab", descriptor = "I") + @OriginalMember(owner = "client!pb", name = "ab", descriptor = "I") public static int anInt4422 = 0; @OriginalMember(owner = "client!pb", name = "rb", descriptor = "S") diff --git a/client/src/main/java/Static189.java b/client/src/main/java/Static189.java index dfea8fe..b9716bd 100644 --- a/client/src/main/java/Static189.java +++ b/client/src/main/java/Static189.java @@ -12,12 +12,6 @@ public final class Static189 { @OriginalMember(owner = "client!pe", name = "j", descriptor = "I") public static int anInt4451 = 0; - @OriginalMember(owner = "client!pe", name = "n", descriptor = "Lclient!na;") - public static final JagString aClass100_835 = Static28.parse("hint_mapmarkers"); - - @OriginalMember(owner = "client!pe", name = "z", descriptor = "Lclient!na;") - public static final JagString aClass100_837 = Static28.parse("mapdots"); - @OriginalMember(owner = "client!pe", name = "a", descriptor = "(BZ)V") public static void method3438(@OriginalArg(1) boolean arg0) { if (arg0 != Static30.aBoolean61) { diff --git a/client/src/main/java/Static19.java b/client/src/main/java/Static19.java index 917bd5d..9521841 100644 --- a/client/src/main/java/Static19.java +++ b/client/src/main/java/Static19.java @@ -10,10 +10,7 @@ public final class Static19 { @OriginalMember(owner = "client!bi", name = "Y", descriptor = "[[B") public static byte[][] underWaterLocationsMapFilesBuffer; - @OriginalMember(owner = "client!bi", name = "fb", descriptor = "I") - public static int anInt647; - - @OriginalMember(owner = "client!bi", name = "W", descriptor = "Lclient!na;") + @OriginalMember(owner = "client!bi", name = "W", descriptor = "Lclient!na;") public static final JagString aClass100_112 = Static28.parse("k"); @OriginalMember(owner = "client!bi", name = "jb", descriptor = "Z") diff --git a/client/src/main/java/Static190.java b/client/src/main/java/Static190.java index 40b062d..136a318 100644 --- a/client/src/main/java/Static190.java +++ b/client/src/main/java/Static190.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static190 { - @OriginalMember(owner = "client!pf", name = "f", descriptor = "Lclient!en;") - public static BufferedFile cacheMasterIndex; - - @OriginalMember(owner = "client!pf", name = "b", descriptor = "Lclient!n;") + @OriginalMember(owner = "client!pf", name = "b", descriptor = "Lclient!n;") public static final SoftLruHashTable aClass99_26 = new SoftLruHashTable(200); @OriginalMember(owner = "client!pf", name = "h", descriptor = "[J") diff --git a/client/src/main/java/Static192.java b/client/src/main/java/Static192.java index ddf2c10..5d3fc44 100644 --- a/client/src/main/java/Static192.java +++ b/client/src/main/java/Static192.java @@ -18,7 +18,7 @@ public final class Static192 { if (local17.anInt1192 < 0) { local29 = -local17.anInt1192 - 1; if (local29 == Static16.anInt549) { - local40 = Static173.self; + local40 = PlayerList.self; } else { local40 = Static159.players[local29]; } diff --git a/client/src/main/java/Static195.java b/client/src/main/java/Static195.java index 621e03a..e47f114 100644 --- a/client/src/main/java/Static195.java +++ b/client/src/main/java/Static195.java @@ -40,7 +40,7 @@ public final class Static195 { @Pc(102) int local102 = -local21.anInt4819 - 1; @Pc(107) Player local107; if (Static16.anInt549 == local102) { - local107 = Static173.self; + local107 = PlayerList.self; } else { local107 = Static159.players[local102]; } diff --git a/client/src/main/java/Static196.java b/client/src/main/java/Static196.java index ce9eb2d..7e0a407 100644 --- a/client/src/main/java/Static196.java +++ b/client/src/main/java/Static196.java @@ -18,10 +18,10 @@ public final class Static196 { @OriginalMember(owner = "client!pl", name = "a", descriptor = "(II)V") public static void setGameState(@OriginalArg(0) int arg0) { - if (Static244.gameState == arg0) { + if (client.gameState == arg0) { return; } - if (Static244.gameState == 0) { + if (client.gameState == 0) { Static163.method3097(); } if (arg0 == 40) { @@ -48,25 +48,25 @@ public final class Static196 { } else { Static119.method2381(); } - @Pc(106) boolean local106 = Static244.gameState == 5 || Static244.gameState == 10 || Static244.gameState == 28; + @Pc(106) boolean local106 = client.gameState == 5 || client.gameState == 10 || client.gameState == 28; if (local106 != local37) { if (local37) { Static221.anInt4363 = Static250.titleSong; - if (Static12.musicVolume == 0) { + if (Preferences.musicVolume == 0) { Static29.method801(); } else { Static257.method526(Static250.titleSong, Static130.js5Archive6, 255); } - Static107.js5NetQueue.method2322(false); + client.js5NetQueue.method2322(false); } else { Static29.method801(); - Static107.js5NetQueue.method2322(true); + client.js5NetQueue.method2322(true); } } if (GlRenderer.enabled && (arg0 == 25 || arg0 == 28 || arg0 == 40)) { GlRenderer.method4160(); } - Static244.gameState = arg0; + client.gameState = arg0; } @OriginalMember(owner = "client!pl", name = "a", descriptor = "(ZI)V") @@ -91,16 +91,4 @@ public final class Static196 { Static253.aByteArrayArrayArray16 = new byte[local14][104][104]; } - @OriginalMember(owner = "client!pl", name = "a", descriptor = "(I)Lclient!mm;") - public static SoftwareSprite method3537() { - @Pc(13) int local13 = Static254.anIntArray488[0] * Static26.anIntArray66[0]; - @Pc(17) byte[] local17 = Static7.aByteArrayArray5[0]; - @Pc(20) int[] local20 = new int[local13]; - for (@Pc(22) int local22 = 0; local22 < local13; local22++) { - local20[local22] = Static259.anIntArray513[local17[local22] & 0xFF]; - } - @Pc(57) SoftwareSprite local57 = new SoftwareSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], local20); - Static75.method1631(); - return local57; - } } diff --git a/client/src/main/java/Static197.java b/client/src/main/java/Static197.java index 869af84..2f58506 100644 --- a/client/src/main/java/Static197.java +++ b/client/src/main/java/Static197.java @@ -26,7 +26,7 @@ public final class Static197 { } @Pc(17) PrivilegedRequest local17 = arg0.getDisplayModes(); while (local17.status == 0) { - Static231.sleep(10L); + ThreadUtils.sleep(10L); } if (local17.status == 2) { return new Class114[0]; @@ -49,20 +49,20 @@ public final class Static197 { if (arg2) { GlRenderer.quit(); } - if (GameShell.fullScreenFrame != null && (arg1 != 3 || arg4 != Static114.anInt5831 || arg5 != Static22.anInt729)) { - Static25.exitFullScreen(GameShell.fullScreenFrame, GameShell.signLink); + if (GameShell.fullScreenFrame != null && (arg1 != 3 || arg4 != Preferences.fullScreenWidth || arg5 != Preferences.fullScreenHeight)) { + DisplayMode.exitFullScreen(GameShell.fullScreenFrame, GameShell.signLink); GameShell.fullScreenFrame = null; } if (arg1 == 3 && GameShell.fullScreenFrame == null) { GameShell.fullScreenFrame = Static169.method3176(0, arg5, arg4, GameShell.signLink); if (GameShell.fullScreenFrame != null) { - Static22.anInt729 = arg5; - Static114.anInt5831 = arg4; - Static203.savePreferences(GameShell.signLink); + Preferences.fullScreenHeight = arg5; + Preferences.fullScreenWidth = arg4; + Preferences.write(GameShell.signLink); } } if (arg1 == 3 && GameShell.fullScreenFrame == null) { - method3560(true, Static214.windowMode, true, arg3, -1, -1); + method3560(true, Preferences.favoriteWorlds, true, arg3, -1, -1); return; } @Pc(85) Container local85; @@ -94,15 +94,15 @@ public final class Static197 { } if (arg0) { Keyboard.stop(GameShell.canvas); - Static223.stop(GameShell.canvas); - if (Static71.mouseWheel != null) { - Static71.mouseWheel.stop(GameShell.canvas); + Mouse.stop(GameShell.canvas); + if (client.mouseWheel != null) { + client.mouseWheel.stop(GameShell.canvas); } - Static215.instance.addCanvas(); + client.instance.addCanvas(); Keyboard.start(GameShell.canvas); Static88.start(GameShell.canvas); - if (Static71.mouseWheel != null) { - Static71.mouseWheel.start(GameShell.canvas); + if (client.mouseWheel != null) { + client.mouseWheel.start(GameShell.canvas); } } else { if (GlRenderer.enabled) { @@ -123,35 +123,35 @@ public final class Static197 { GameShell.canvas.setIgnoreRepaint(true); if (!Static211.aBoolean73) { Static65.method1500(); - Static260.frameBuffer = null; - Static260.frameBuffer = Static131.create(GameShell.canvasHeight, GameShell.canvasWidth, GameShell.canvas); - Static129.clear(); - if (Static244.gameState == 5) { - Static182.render(true, Static280.aClass3_Sub2_Sub9_43); + client.frameBuffer = null; + client.frameBuffer = Static131.create(GameShell.canvasHeight, GameShell.canvasWidth, GameShell.canvas); + SoftwareRaster.clear(); + if (client.gameState == 5) { + LoadingBar.render(true, Fonts.b12Full); } else { Static114.drawTextOnScreen(false, LocalizedText.LOADING); } try { @Pc(269) Graphics local269 = GameShell.canvas.getGraphics(); - Static260.frameBuffer.draw(local269); + client.frameBuffer.draw(local269); } catch (@Pc(277) Exception local277) { } Static139.method2704(); if (arg3 == 0) { - Static260.frameBuffer = Static131.create(503, 765, GameShell.canvas); + client.frameBuffer = Static131.create(503, 765, GameShell.canvas); } else { - Static260.frameBuffer = null; + client.frameBuffer = null; } - @Pc(300) PrivilegedRequest local300 = GameShell.signLink.loadGlNatives(Static215.instance.getClass()); + @Pc(300) PrivilegedRequest local300 = GameShell.signLink.loadGlNatives(client.instance.getClass()); while (local300.status == 0) { - Static231.sleep(100L); + ThreadUtils.sleep(100L); } if (local300.status == 1) { Static211.aBoolean73 = true; } } if (Static211.aBoolean73) { - GlRenderer.init(GameShell.canvas, Static186.antiAliasingMode * 2); + GlRenderer.init(GameShell.canvas, Preferences.antiAliasingMode * 2); } } if (!GlRenderer.enabled && arg1 > 0) { @@ -160,37 +160,37 @@ public final class Static197 { } if (arg1 > 0 && arg3 == 0) { GameShell.thread.setPriority(5); - Static260.frameBuffer = null; + client.frameBuffer = null; Static268.method4580(); ((Js5GlTextureProvider) Rasteriser.textureProvider).method3248(200); - if (Static178.highDetailLighting) { + if (Preferences.highDetailLighting) { Rasteriser.setBrightness(0.7F); } Static114.method4637(); } else if (arg1 == 0 && arg3 > 0) { GameShell.thread.setPriority(1); - Static260.frameBuffer = Static131.create(503, 765, GameShell.canvas); + client.frameBuffer = Static131.create(503, 765, GameShell.canvas); Static268.method4583(); Static76.method1643(); ((Js5GlTextureProvider) Rasteriser.textureProvider).method3248(20); - if (Static178.highDetailLighting) { - if (Static113.brightness == 1) { + if (Preferences.highDetailLighting) { + if (Preferences.brightness == 1) { Rasteriser.setBrightness(0.9F); } - if (Static113.brightness == 2) { + if (Preferences.brightness == 2) { Rasteriser.setBrightness(0.8F); } - if (Static113.brightness == 3) { + if (Preferences.brightness == 3) { Rasteriser.setBrightness(0.7F); } - if (Static113.brightness == 4) { + if (Preferences.brightness == 4) { Rasteriser.setBrightness(0.6F); } } Static95.method1939(); Static114.method4637(); } - Static87.aBoolean130 = !Static138.allLevelsAreVisible(); + Static87.aBoolean130 = !SceneGraph.allLevelsAreVisible(); if (arg2) { Static141.method2721(); } @@ -199,10 +199,10 @@ public final class Static197 { } else { Static124.aBoolean156 = false; } - if (Static154.topLevelInterface != -1) { + if (InterfaceList.topLevelInterface != -1) { Static210.method3712(true); } - if (Static124.socket != null && (Static244.gameState == 30 || Static244.gameState == 25)) { + if (Protocol.socket != null && (client.gameState == 30 || client.gameState == 25)) { Static59.method1373(); } for (@Pc(466) int local466 = 0; local466 < 100; local466++) { diff --git a/client/src/main/java/Static199.java b/client/src/main/java/Static199.java index 38cf244..85e326f 100644 --- a/client/src/main/java/Static199.java +++ b/client/src/main/java/Static199.java @@ -45,6 +45,6 @@ public final class Static199 { @OriginalMember(owner = "client!qc", name = "a", descriptor = "(ZLclient!ve;)V") public static void init(@OriginalArg(1) Js5 arg0) { Static35.aClass153_22 = arg0; - Static98.anInt2510 = Static35.aClass153_22.method4504(4); + FloTypeList.capacity = Static35.aClass153_22.method4504(4); } } diff --git a/client/src/main/java/Static2.java b/client/src/main/java/Static2.java index 231fd2b..e94e14b 100644 --- a/client/src/main/java/Static2.java +++ b/client/src/main/java/Static2.java @@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static2 { - @OriginalMember(owner = "client!aa", name = "j", descriptor = "I") - public static int anInt13; - @OriginalMember(owner = "client!aa", name = "m", descriptor = "I") public static int anInt15; @@ -284,17 +281,17 @@ public final class Static2 { arg0.modelType = 5; arg0.modelId = -1; } else if (local16 == 328) { - if (Static173.self.aClass100_364 == null) { + if (PlayerList.self.aClass100_364 == null) { arg0.modelId = 0; } else { arg0.modelXAngle = 150; arg0.modelYAngle = (int) (Math.sin((double) Static83.loop / 40.0D) * 256.0D) & 0x7FF; arg0.modelType = 5; - arg0.modelId = ((int) Static173.self.aClass100_364.encode37() << 11) + 2047; - arg0.anInt496 = Static173.self.anInt3388; + arg0.modelId = ((int) PlayerList.self.aClass100_364.encode37() << 11) + 2047; + arg0.anInt496 = PlayerList.self.anInt3388; arg0.anInt500 = 0; - arg0.anInt522 = Static173.self.anInt3366; - arg0.anInt510 = Static173.self.anInt3407; + arg0.anInt522 = PlayerList.self.anInt3366; + arg0.anInt510 = PlayerList.self.anInt3407; } } } diff --git a/client/src/main/java/Static20.java b/client/src/main/java/Static20.java index 5329fc7..e9d874c 100644 --- a/client/src/main/java/Static20.java +++ b/client/src/main/java/Static20.java @@ -10,9 +10,6 @@ public final class Static20 { @OriginalMember(owner = "client!bj", name = "s", descriptor = "I") public static int anInt660 = -1; - @OriginalMember(owner = "client!bj", name = "t", descriptor = "[S") - public static final short[] aShortArray5 = new short[] { -4160, -4163, -8256, -8259, 22461 }; - @OriginalMember(owner = "client!bj", name = "v", descriptor = "Lclient!sc;") public static HashTable objectContainerCache = new HashTable(32); @@ -22,13 +19,6 @@ public final class Static20 { @OriginalMember(owner = "client!bj", name = "Y", descriptor = "I") public static int anInt673 = 0; - @OriginalMember(owner = "client!bj", name = "d", descriptor = "(B)V") - public static void method601() { - Static36.aClass133_3.method3856(); - Static140.clientQueue.method802(); - Static215.serverQueue.method802(); - } - @OriginalMember(owner = "client!bj", name = "a", descriptor = "(III)J") public static long method602(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { @Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2]; diff --git a/client/src/main/java/Static202.java b/client/src/main/java/Static202.java index 981e1dc..b4bf384 100644 --- a/client/src/main/java/Static202.java +++ b/client/src/main/java/Static202.java @@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static202 { - @OriginalMember(owner = "client!qg", name = "R", descriptor = "I") - public static int anInt4741; - @OriginalMember(owner = "client!qg", name = "ab", descriptor = "Lclient!ve;") public static Js5 aClass153_84; @@ -92,7 +89,7 @@ public final class Static202 { local17.anIntArray138[local59] = -5; } } - Static204.aClass69_113.method2282(local17); + Static204.aClass69_113.addTail(local17); } @OriginalMember(owner = "client!qg", name = "a", descriptor = "(IZI)V") diff --git a/client/src/main/java/Static203.java b/client/src/main/java/Static203.java index 583b209..bca6ab9 100644 --- a/client/src/main/java/Static203.java +++ b/client/src/main/java/Static203.java @@ -1,17 +1,11 @@ import java.awt.Container; import java.awt.Insets; -import org.openrs2.deob.annotation.OriginalArg; + import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; public final class Static203 { - @OriginalMember(owner = "client!qh", name = "a", descriptor = "Lclient!se;") - public static MapFunctionGroup aClass134_1; - - @OriginalMember(owner = "client!qh", name = "d", descriptor = "Lclient!fd;") - public static WorldMapFont aClass41_8; - @OriginalMember(owner = "client!qh", name = "e", descriptor = "[Lclient!ee;") public static Class32[] aClass32Array1; @@ -63,32 +57,10 @@ public final class Static203 { } else { GameShell.canvas.setLocation(GameShell.leftMargin, GameShell.topMargin); } - if (Static154.topLevelInterface != -1) { + if (InterfaceList.topLevelInterface != -1) { Static210.method3712(true); } Static139.method2704(); } - @OriginalMember(owner = "client!qh", name = "a", descriptor = "(Lsignlink!ll;B)V") - public static void savePreferences(@OriginalArg(0) SignLink arg0) { - @Pc(11) FileOnDisk local11 = null; - try { - @Pc(16) PrivilegedRequest local16 = arg0.openPreferences("runescape"); - while (local16.status == 0) { - Static231.sleep(1L); - } - if (local16.status == 1) { - local11 = (FileOnDisk) local16.result; - @Pc(39) Buffer local39 = Static48.method1196(); - local11.write(local39.data, local39.offset, 0); - } - } catch (@Pc(49) Exception local49) { - } - try { - if (local11 != null) { - local11.close(); - } - } catch (@Pc(56) Exception local56) { - } - } } diff --git a/client/src/main/java/Static204.java b/client/src/main/java/Static204.java index d7f1e4a..4323c83 100644 --- a/client/src/main/java/Static204.java +++ b/client/src/main/java/Static204.java @@ -10,10 +10,7 @@ public final class Static204 { @OriginalMember(owner = "client!qi", name = "C", descriptor = "Lclient!ei;") public static MixerPcmStream soundStream; - @OriginalMember(owner = "client!qi", name = "r", descriptor = "I") - public static int affiliate = 0; - - @OriginalMember(owner = "client!qi", name = "t", descriptor = "I") + @OriginalMember(owner = "client!qi", name = "t", descriptor = "I") public static int anInt4762 = 0; @OriginalMember(owner = "client!qi", name = "u", descriptor = "Lclient!ih;") diff --git a/client/src/main/java/Static205.java b/client/src/main/java/Static205.java index 3c6327c..0ae1c69 100644 --- a/client/src/main/java/Static205.java +++ b/client/src/main/java/Static205.java @@ -11,7 +11,7 @@ public final class Static205 { if (!Static36.method940(arg0).method503(arg1) && arg0.anObjectArray29 == null) { return null; } else if (arg0.aClass100Array18 == null || arg0.aClass100Array18.length <= arg1 || arg0.aClass100Array18[arg1] == null || arg0.aClass100Array18[arg1].method3144().length() == 0) { - return Static121.aBoolean154 ? Static34.concatenate(new JagString[] { Static207.aClass100_903, Static123.parseInt(arg1) }) : null; + return Static121.aBoolean154 ? JagString.concatenate(new JagString[] { Static207.aClass100_903, Static123.parseInt(arg1) }) : null; } else { return arg0.aClass100Array18[arg1]; } diff --git a/client/src/main/java/Static207.java b/client/src/main/java/Static207.java index 5d14542..55e5e42 100644 --- a/client/src/main/java/Static207.java +++ b/client/src/main/java/Static207.java @@ -109,7 +109,7 @@ public final class Static207 { if (Static72.aClass212_3.status != 1) { return -1; } - Static124.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, GameShell.signLink); + Protocol.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, GameShell.signLink); Static6.outboundBuffer.offset = 0; Static72.aClass212_3 = null; local82 = 0; @@ -118,19 +118,19 @@ public final class Static207 { } Static6.outboundBuffer.p1(255); Static6.outboundBuffer.p4(local82); - Static124.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); - if (Static11.musicChannel != null) { - Static11.musicChannel.method3571(); + Protocol.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); + if (client.musicChannel != null) { + client.musicChannel.method3571(); } - if (Static147.soundChannel != null) { - Static147.soundChannel.method3571(); + if (client.soundChannel != null) { + client.soundChannel.method3571(); } - local124 = Static124.socket.read(); - if (Static11.musicChannel != null) { - Static11.musicChannel.method3571(); + local124 = Protocol.socket.read(); + if (client.musicChannel != null) { + client.musicChannel.method3571(); } - if (Static147.soundChannel != null) { - Static147.soundChannel.method3571(); + if (client.soundChannel != null) { + client.soundChannel.method3571(); } if (local124 != 0) { return Static10.method347(local124); @@ -138,12 +138,12 @@ public final class Static207 { Static82.anInt2231 = 2; } if (Static82.anInt2231 == 2) { - if (Static124.socket.available() < 2) { + if (Protocol.socket.available() < 2) { return -1; } - Static116.anInt2961 = Static124.socket.read(); + Static116.anInt2961 = Protocol.socket.read(); Static116.anInt2961 <<= 0x8; - Static116.anInt2961 += Static124.socket.read(); + Static116.anInt2961 += Protocol.socket.read(); Static82.anInt2231 = 3; Static141.anInt3469 = 0; Static229.aByteArray70 = new byte[Static116.anInt2961]; @@ -151,14 +151,14 @@ public final class Static207 { if (Static82.anInt2231 != 3) { return -1; } - local82 = Static124.socket.available(); + local82 = Protocol.socket.available(); if (local82 < 1) { return -1; } if (local82 > Static116.anInt2961 - Static141.anInt3469) { local82 = Static116.anInt2961 - Static141.anInt3469; } - Static124.socket.read(Static141.anInt3469, local82, Static229.aByteArray70); + Protocol.socket.read(Static141.anInt3469, local82, Static229.aByteArray70); Static141.anInt3469 += local82; if (Static141.anInt3469 < Static116.anInt2961) { return -1; @@ -171,8 +171,8 @@ public final class Static207 { Static101.worlds[local124++] = local247; } } - Static124.socket.close(); - Static124.socket = null; + Protocol.socket.close(); + Protocol.socket = null; Static127.anInt3132 = 0; Static82.anInt2231 = 0; Static229.aByteArray70 = null; diff --git a/client/src/main/java/Static209.java b/client/src/main/java/Static209.java index 0bb73d3..6c6f307 100644 --- a/client/src/main/java/Static209.java +++ b/client/src/main/java/Static209.java @@ -13,10 +13,7 @@ public final class Static209 { @OriginalMember(owner = "client!ra", name = "J", descriptor = "I") public static int miscTransmitAt = 0; - @OriginalMember(owner = "client!ra", name = "R", descriptor = "Z") - public static boolean characterShadowsOn = true; - - @OriginalMember(owner = "client!ra", name = "jb", descriptor = "J") + @OriginalMember(owner = "client!ra", name = "jb", descriptor = "J") public static volatile long aLong161 = 0L; @OriginalMember(owner = "client!ra", name = "a", descriptor = "(ILclient!pb;BII)V") @@ -57,25 +54,4 @@ public final class Static209 { local12.intArg3 = arg1; } - @OriginalMember(owner = "client!ra", name = "a", descriptor = "(IBILclient!ve;)[Lclient!qf;") - public static Sprite[] method3708(@OriginalArg(2) int arg0, @OriginalArg(3) Js5 arg1) { - return Static234.method4016(arg1, 0, arg0) ? Static213.method3730() : null; - } - - @OriginalMember(owner = "client!ra", name = "b", descriptor = "(III)I") - public static int method3709(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { - @Pc(15) int local15 = 1; - while (arg0 > 1) { - if ((arg0 & 0x1) != 0) { - local15 *= arg1; - } - arg1 *= arg1; - arg0 >>= 0x1; - } - if (arg0 == 1) { - return local15 * arg1; - } else { - return local15; - } - } } diff --git a/client/src/main/java/Static21.java b/client/src/main/java/Static21.java index 6b718a4..dc28373 100644 --- a/client/src/main/java/Static21.java +++ b/client/src/main/java/Static21.java @@ -4,16 +4,12 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static21 { @OriginalMember(owner = "client!bk", name = "a", descriptor = "(BI)V") - public static void method619(@OriginalArg(1) int arg0) { - Static257.aFloatArray2[0] = (float) (arg0 >> 16 & 0xFF) / 255.0F; - Static257.aFloatArray2[1] = (float) (arg0 >> 8 & 0xFF) / 255.0F; - Static257.aFloatArray2[2] = (float) (arg0 & 0xFF) / 255.0F; + public static void method619(@OriginalArg(1) int color) { + WaterMaterialRenderer.aFloatArray2[0] = (float) (color >> 16 & 0xFF) / 255.0F; + WaterMaterialRenderer.aFloatArray2[1] = (float) (color >> 8 & 0xFF) / 255.0F; + WaterMaterialRenderer.aFloatArray2[2] = (float) (color & 0xFF) / 255.0F; Static128.method2481(3); Static128.method2481(4); } - @OriginalMember(owner = "client!bk", name = "a", descriptor = "(BLclient!wa;)Lclient!re;") - public static TextureOp29SubOp3 method620(@OriginalArg(1) Buffer arg0) { - return new TextureOp29SubOp3(arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g3(), arg0.g1()); - } } diff --git a/client/src/main/java/Static210.java b/client/src/main/java/Static210.java index 2d5c87d..6ff5177 100644 --- a/client/src/main/java/Static210.java +++ b/client/src/main/java/Static210.java @@ -21,7 +21,7 @@ public final class Static210 { @OriginalMember(owner = "client!rb", name = "a", descriptor = "(ZB)V") public static void method3712(@OriginalArg(0) boolean arg0) { - Static234.method4017(GameShell.canvasHeight, arg0, Static154.topLevelInterface, GameShell.canvasWidth); + Static234.method4017(GameShell.canvasHeight, arg0, InterfaceList.topLevelInterface, GameShell.canvasWidth); } @OriginalMember(owner = "client!rb", name = "a", descriptor = "(Lclient!wa;Z)Lclient!bn;") @@ -29,7 +29,7 @@ public final class Static210 { @Pc(35) Map local35 = new Map(arg0.gjstr(), arg0.gjstr(), arg0.g2(), arg0.g2(), arg0.g4(), arg0.g1() == 1, arg0.g1()); @Pc(39) int local39 = arg0.g1(); for (@Pc(41) int local41 = 0; local41 < local39; local41++) { - local35.aClass69_23.method2282(new Class3_Sub24(arg0.g2(), arg0.g2(), arg0.g2(), arg0.g2())); + local35.aClass69_23.addTail(new Class3_Sub24(arg0.g2(), arg0.g2(), arg0.g2(), arg0.g2())); } local35.method665(); return local35; diff --git a/client/src/main/java/Static211.java b/client/src/main/java/Static211.java index fc78502..4a52cde 100644 --- a/client/src/main/java/Static211.java +++ b/client/src/main/java/Static211.java @@ -28,7 +28,7 @@ public final class Static211 { @OriginalMember(owner = "client!rc", name = "a", descriptor = "(Lclient!na;Z)Lclient!na;") public static JagString method923(@OriginalArg(0) JagString arg0) { @Pc(12) int local12 = Static171.method3218(arg0); - return local12 == -1 ? Static93.aClass100_517 : Static203.aClass134_1.aClass100Array153[local12].method3140(Static101.aClass100_538, Static197.aClass100_872); + return local12 == -1 ? Static93.aClass100_517 : WorldMap.labels.aClass100Array153[local12].method3140(Static101.aClass100_538, Static197.aClass100_872); } @OriginalMember(owner = "client!rc", name = "a", descriptor = "(Z)V") @@ -38,16 +38,16 @@ public final class Static211 { @OriginalMember(owner = "client!rc", name = "d", descriptor = "(I)V") public static void method930() { - if (Static11.musicChannel != null) { - Static11.musicChannel.quit(); + if (client.musicChannel != null) { + client.musicChannel.quit(); } - if (Static147.soundChannel != null) { - Static147.soundChannel.quit(); + if (client.soundChannel != null) { + client.soundChannel.quit(); } - AudioChannel.init(Static99.stereo); - Static11.musicChannel = AudioChannel.create(22050, GameShell.signLink, GameShell.canvas, 0); - Static11.musicChannel.setStream(Static148.musicStream); - Static147.soundChannel = AudioChannel.create(2048, GameShell.signLink, GameShell.canvas, 1); - Static147.soundChannel.setStream(Static204.soundStream); + AudioChannel.init(Preferences.stereo); + client.musicChannel = AudioChannel.create(22050, GameShell.signLink, GameShell.canvas, 0); + client.musicChannel.setStream(Static148.musicStream); + client.soundChannel = AudioChannel.create(2048, GameShell.signLink, GameShell.canvas, 1); + client.soundChannel.setStream(Static204.soundStream); } } diff --git a/client/src/main/java/Static213.java b/client/src/main/java/Static213.java index aad16fe..117edfd 100644 --- a/client/src/main/java/Static213.java +++ b/client/src/main/java/Static213.java @@ -1,11 +1,7 @@ import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; public final class Static213 { - @OriginalMember(owner = "client!re", name = "w", descriptor = "[Lclient!qf;") - public static Sprite[] aClass3_Sub2_Sub1Array8; - @OriginalMember(owner = "client!re", name = "y", descriptor = "I") public static int anInt4851; @@ -36,36 +32,4 @@ public final class Static213 { Static139.aClass99_22.method3102(5); } - @OriginalMember(owner = "client!re", name = "b", descriptor = "(I)[Lclient!qf;") - public static Sprite[] method3730() { - @Pc(14) Sprite[] local14 = new Sprite[Static165.anInt4038]; - for (@Pc(16) int local16 = 0; local16 < Static165.anInt4038; local16++) { - @Pc(23) byte[] local23 = Static7.aByteArrayArray5[local16]; - @Pc(31) int local31 = Static26.anIntArray66[local16] * Static254.anIntArray488[local16]; - if (Static159.aBooleanArray87[local16]) { - @Pc(38) int[] local38 = new int[local31]; - @Pc(42) byte[] local42 = Static64.aByteArrayArray9[local16]; - for (@Pc(44) int local44 = 0; local44 < local31; local44++) { - local38[local44] = Static259.anIntArray513[local23[local44] & 0xFF] | (local42[local44] & 0xFF) << 24; - } - if (GlRenderer.enabled) { - local14[local16] = new GlAlphaSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local16], Static269.anIntArray252[local16], Static254.anIntArray488[local16], Static26.anIntArray66[local16], local38); - } else { - local14[local16] = new SoftwareAlphaSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local16], Static269.anIntArray252[local16], Static254.anIntArray488[local16], Static26.anIntArray66[local16], local38); - } - } else { - @Pc(119) int[] local119 = new int[local31]; - for (@Pc(121) int local121 = 0; local121 < local31; local121++) { - local119[local121] = Static259.anIntArray513[local23[local121] & 0xFF]; - } - if (GlRenderer.enabled) { - local14[local16] = new GlSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local16], Static269.anIntArray252[local16], Static254.anIntArray488[local16], Static26.anIntArray66[local16], local119); - } else { - local14[local16] = new SoftwareSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local16], Static269.anIntArray252[local16], Static254.anIntArray488[local16], Static26.anIntArray66[local16], local119); - } - } - } - Static75.method1631(); - return local14; - } } diff --git a/client/src/main/java/Static214.java b/client/src/main/java/Static214.java index 9aa69f7..40d3e54 100644 --- a/client/src/main/java/Static214.java +++ b/client/src/main/java/Static214.java @@ -10,9 +10,6 @@ public final class Static214 { @OriginalMember(owner = "client!rg", name = "z", descriptor = "Lclient!ve;") public static Js5 js5Archive11; - @OriginalMember(owner = "client!rg", name = "C", descriptor = "I") - public static int anInt5579; - @OriginalMember(owner = "client!rg", name = "r", descriptor = "[Lclient!na;") public static final JagString[] aClass100Array170 = new JagString[200]; @@ -22,9 +19,6 @@ public final class Static214 { @OriginalMember(owner = "client!rg", name = "A", descriptor = "[I") public static final int[] anIntArray492 = new int[14]; - @OriginalMember(owner = "client!rg", name = "F", descriptor = "I") - public static int windowMode = 0; - @OriginalMember(owner = "client!rg", name = "a", descriptor = "(Lclient!e;I)V") public static void method4359(@OriginalArg(0) Player arg0) { @Pc(12) AreaSound local12 = (AreaSound) Static93.aClass133_7.get(arg0.aClass100_364.encode37()); @@ -51,7 +45,7 @@ public final class Static214 { @OriginalMember(owner = "client!rg", name = "d", descriptor = "(B)Lclient!bn;") public static Map method4361() { - return Static269.aClass3_Sub2_Sub4_2; + return WorldMap.currentMap; } @OriginalMember(owner = "client!rg", name = "b", descriptor = "(II)Lclient!me;") @@ -77,6 +71,6 @@ public final class Static214 { @Pc(16) int local16 = (arg0 - arg4 << 16) / local7; @Pc(21) int local21 = arg5 - arg3; @Pc(30) int local30 = (arg6 - arg1 << 16) / local21; - Static144.method2735(arg1, arg5, arg3, arg2, arg4, arg7, local30, local16); + WorldMap.method2735(arg1, arg5, arg3, arg2, arg4, arg7, local30, local16); } } diff --git a/client/src/main/java/Static215.java b/client/src/main/java/Static215.java index 5f1dcb8..2301786 100644 --- a/client/src/main/java/Static215.java +++ b/client/src/main/java/Static215.java @@ -8,15 +8,6 @@ public final class Static215 { @OriginalMember(owner = "client!rh", name = "d", descriptor = "I") public static int anInt4866; - @OriginalMember(owner = "client!rh", name = "h", descriptor = "Lclient!rk;") - public static Font aClass3_Sub2_Sub9_32; - - @OriginalMember(owner = "client!rh", name = "j", descriptor = "Lclient!client;") - public static client instance; - - @OriginalMember(owner = "client!rh", name = "e", descriptor = "Lclient!ce;") - public static final SecondaryLinkedList serverQueue = new SecondaryLinkedList(); - @OriginalMember(owner = "client!rh", name = "g", descriptor = "I") public static final int anInt4868 = -1; diff --git a/client/src/main/java/Static216.java b/client/src/main/java/Static216.java index 0af76e8..1f2f89c 100644 --- a/client/src/main/java/Static216.java +++ b/client/src/main/java/Static216.java @@ -22,9 +22,9 @@ public final class Static216 { } try { if (++Static92.anInt2430 > 2000) { - if (Static124.socket != null) { - Static124.socket.close(); - Static124.socket = null; + if (Protocol.socket != null) { + Protocol.socket.close(); + Protocol.socket = null; } if (Static276.anInt5816 >= 1) { Static266.reply = -5; @@ -51,41 +51,41 @@ public final class Static216 { if (Static72.aClass212_3.status != 1) { return; } - Static124.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, GameShell.signLink); + Protocol.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, GameShell.signLink); Static72.aClass212_3 = null; - @Pc(106) long local106 = Static101.aLong98 = Static186.username.encode37(); + @Pc(106) long local106 = Static101.aLong98 = Player.username.encode37(); Static6.outboundBuffer.offset = 0; Static6.outboundBuffer.p1(14); @Pc(120) int local120 = (int) (local106 >> 16 & 0x1FL); Static6.outboundBuffer.p1(local120); - Static124.socket.write(Static6.outboundBuffer.data, 2); - if (Static11.musicChannel != null) { - Static11.musicChannel.method3571(); + Protocol.socket.write(Static6.outboundBuffer.data, 2); + if (client.musicChannel != null) { + client.musicChannel.method3571(); } - if (Static147.soundChannel != null) { - Static147.soundChannel.method3571(); + if (client.soundChannel != null) { + client.soundChannel.method3571(); } - @Pc(150) int local150 = Static124.socket.read(); - if (Static11.musicChannel != null) { - Static11.musicChannel.method3571(); + @Pc(150) int local150 = Protocol.socket.read(); + if (client.musicChannel != null) { + client.musicChannel.method3571(); } - if (Static147.soundChannel != null) { - Static147.soundChannel.method3571(); + if (client.soundChannel != null) { + client.soundChannel.method3571(); } if (local150 != 0) { Static266.reply = local150; Static184.loginStep = 0; - Static124.socket.close(); - Static124.socket = null; + Protocol.socket.close(); + Protocol.socket = null; return; } Static184.loginStep = 3; } if (Static184.loginStep == 3) { - if (Static124.socket.available() < 8) { + if (Protocol.socket.available() < 8) { return; } - Static124.socket.read(0, 8, Static57.aClass3_Sub15_Sub1_3.data); + Protocol.socket.read(0, 8, Static57.aClass3_Sub15_Sub1_3.data); Static57.aClass3_Sub15_Sub1_3.offset = 0; Static193.aLong147 = Static57.aClass3_Sub15_Sub1_3.g8(); @Pc(210) int[] local210 = new int[4]; @@ -99,8 +99,8 @@ public final class Static216 { Static6.outboundBuffer.p4(local210[1]); Static6.outboundBuffer.p4(local210[2]); Static6.outboundBuffer.p4(local210[3]); - Static6.outboundBuffer.p8(Static186.username.encode37()); - Static6.outboundBuffer.pjstr(Static186.password); + Static6.outboundBuffer.p8(Player.username.encode37()); + Static6.outboundBuffer.pjstr(Player.password); if (GlobalConfig.LOGIN_EXTRA_INFO) { Static6.outboundBuffer.pjstr(Static28.parse("")); Static6.outboundBuffer.pjstr(Static28.parse("")); @@ -108,7 +108,7 @@ public final class Static216 { } Static6.outboundBuffer.encryptRsa(GlobalConfig.RSA_EXPONENT, GlobalConfig.RSA_MODULUS); Static17.aClass3_Sub15_Sub1_2.offset = 0; - if (Static244.gameState == 40) { + if (client.gameState == 40) { Static17.aClass3_Sub15_Sub1_2.p1(18); } else { Static17.aClass3_Sub15_Sub1_2.p1(16); @@ -118,18 +118,18 @@ public final class Static216 { // pretend that we're loading the archive so we don't throw the packet size off offset = 4; } - Static17.aClass3_Sub15_Sub1_2.p2(Static6.outboundBuffer.offset + Static229.method3937(Static47.settings) + (159 + offset)); + Static17.aClass3_Sub15_Sub1_2.p2(Static6.outboundBuffer.offset + Static229.method3937(client.settings) + (159 + offset)); Static17.aClass3_Sub15_Sub1_2.p4(530); Static17.aClass3_Sub15_Sub1_2.p1(Static5.anInt39); - Static17.aClass3_Sub15_Sub1_2.p1(Static249.advertSuppressed ? 1 : 0); + Static17.aClass3_Sub15_Sub1_2.p1(client.advertSuppressed ? 1 : 0); Static17.aClass3_Sub15_Sub1_2.p1(1); Static17.aClass3_Sub15_Sub1_2.p1(Static144.getWindowMode()); Static17.aClass3_Sub15_Sub1_2.p2(GameShell.canvasWidth); Static17.aClass3_Sub15_Sub1_2.p2(GameShell.canvasHeight); - Static17.aClass3_Sub15_Sub1_2.p1(Static186.antiAliasingMode); + Static17.aClass3_Sub15_Sub1_2.p1(Preferences.antiAliasingMode); Static140.method2705(Static17.aClass3_Sub15_Sub1_2); - Static17.aClass3_Sub15_Sub1_2.pjstr(Static47.settings); - Static17.aClass3_Sub15_Sub1_2.p4(Static204.affiliate); + Static17.aClass3_Sub15_Sub1_2.pjstr(client.settings); + Static17.aClass3_Sub15_Sub1_2.p4(client.affiliate); Static17.aClass3_Sub15_Sub1_2.p4(Static145.method2746()); Static18.serverUpdatedPreferences = true; Static17.aClass3_Sub15_Sub1_2.p2(Static189.anInt4443); @@ -156,7 +156,7 @@ public final class Static216 { Static17.aClass3_Sub15_Sub1_2.p4(Static253.js5Archive20.method4480()); Static17.aClass3_Sub15_Sub1_2.p4(Static122.js5Archive21.method4480()); Static17.aClass3_Sub15_Sub1_2.p4(Static156.js5Archive22.method4480()); - Static17.aClass3_Sub15_Sub1_2.p4(Static227.js5Archive23.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(client.js5Archive23.method4480()); Static17.aClass3_Sub15_Sub1_2.p4(Static254.js5Archive24.method4480()); Static17.aClass3_Sub15_Sub1_2.p4(Static28.js5Archive25.method4480()); Static17.aClass3_Sub15_Sub1_2.p4(Static167.js5Archive26.method4480()); @@ -165,7 +165,7 @@ public final class Static216 { Static17.aClass3_Sub15_Sub1_2.p4(0); } Static17.aClass3_Sub15_Sub1_2.pBytes(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); - Static124.socket.write(Static17.aClass3_Sub15_Sub1_2.data, Static17.aClass3_Sub15_Sub1_2.offset); + Protocol.socket.write(Static17.aClass3_Sub15_Sub1_2.data, Static17.aClass3_Sub15_Sub1_2.offset); Static6.outboundBuffer.method2240(local210); for (@Pc(583) int local583 = 0; local583 < 4; local583++) { local210[local583] += 50; @@ -174,10 +174,10 @@ public final class Static216 { Static184.loginStep = 4; } if (Static184.loginStep == 4) { - if (Static124.socket.available() < 1) { + if (Protocol.socket.available() < 1) { return; } - @Pc(623) int local623 = Static124.socket.read(); + @Pc(623) int local623 = Protocol.socket.read(); if (local623 == 21) { Static184.loginStep = 7; } else if (local623 == 29) { @@ -196,51 +196,51 @@ public final class Static216 { Static184.loginStep = 1; Static276.anInt5816++; Static92.anInt2430 = 0; - Static124.socket.close(); - Static124.socket = null; + Protocol.socket.close(); + Protocol.socket = null; return; } else { Static266.reply = local623; Static184.loginStep = 0; - Static124.socket.close(); - Static124.socket = null; + Protocol.socket.close(); + Protocol.socket = null; return; } } if (Static184.loginStep == 6) { Static6.outboundBuffer.offset = 0; Static6.outboundBuffer.p1isaac(17); - Static124.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); + Protocol.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); Static184.loginStep = 4; return; } if (Static184.loginStep == 7) { - if (Static124.socket.available() >= 1) { - Static231.anInt5202 = (Static124.socket.read() + 3) * 60; + if (Protocol.socket.available() >= 1) { + Static231.anInt5202 = (Protocol.socket.read() + 3) * 60; Static184.loginStep = 0; Static266.reply = 21; - Static124.socket.close(); - Static124.socket = null; + Protocol.socket.close(); + Protocol.socket = null; return; } return; } if (Static184.loginStep == 10) { - if (Static124.socket.available() >= 1) { - Static204.anInt4765 = Static124.socket.read(); + if (Protocol.socket.available() >= 1) { + Static204.anInt4765 = Protocol.socket.read(); Static184.loginStep = 0; Static266.reply = 29; - Static124.socket.close(); - Static124.socket = null; + Protocol.socket.close(); + Protocol.socket = null; return; } return; } if (Static184.loginStep == 8) { - if (Static124.socket.available() < 14) { + if (Protocol.socket.available() < 14) { return; } - Static124.socket.read(0, 14, Static57.aClass3_Sub15_Sub1_3.data); + Protocol.socket.read(0, 14, Static57.aClass3_Sub15_Sub1_3.data); Static57.aClass3_Sub15_Sub1_3.offset = 0; Static191.staffModLevel = Static57.aClass3_Sub15_Sub1_3.g1(); Static249.anInt5431 = Static57.aClass3_Sub15_Sub1_3.g1(); @@ -254,7 +254,7 @@ public final class Static216 { Static2.aBoolean1 = Static57.aClass3_Sub15_Sub1_3.g1() == 1; Static189.method3438(Static2.aBoolean1); Static9.method186(Static2.aBoolean1); - if (!Static249.advertSuppressed) { + if (!client.advertSuppressed) { if (Static124.aBoolean157 && !Static25.aBoolean57 || Static202.aBoolean233) { try { Static167.aClass100_781.method3157(GameShell.signLink.applet); @@ -272,11 +272,11 @@ public final class Static216 { Static184.loginStep = 9; } if (Static184.loginStep == 9) { - if (Static124.socket.available() < Static223.anInt5028) { + if (Protocol.socket.available() < Static223.anInt5028) { return; } Static57.aClass3_Sub15_Sub1_3.offset = 0; - Static124.socket.read(0, Static223.anInt5028, Static57.aClass3_Sub15_Sub1_3.data); + Protocol.socket.read(0, Static223.anInt5028, Static57.aClass3_Sub15_Sub1_3.data); Static266.reply = 2; Static184.loginStep = 0; Static243.method4221(); @@ -286,9 +286,9 @@ public final class Static216 { return; } } catch (@Pc(977) IOException local977) { - if (Static124.socket != null) { - Static124.socket.close(); - Static124.socket = null; + if (Protocol.socket != null) { + Protocol.socket.close(); + Protocol.socket = null; } if (Static276.anInt5816 >= 1) { Static184.loginStep = 0; diff --git a/client/src/main/java/Static217.java b/client/src/main/java/Static217.java index 801e96b..05cf5ff 100644 --- a/client/src/main/java/Static217.java +++ b/client/src/main/java/Static217.java @@ -10,10 +10,7 @@ public final class Static217 { @OriginalMember(owner = "client!rj", name = "Y", descriptor = "J") public static long js5ConnectTime; - @OriginalMember(owner = "client!rj", name = "P", descriptor = "I") - public static int anInt4901 = -1; - - @OriginalMember(owner = "client!rj", name = "U", descriptor = "Lclient!ih;") + @OriginalMember(owner = "client!rj", name = "U", descriptor = "Lclient!ih;") public static final LinkedList aClass69_116 = new LinkedList(); @OriginalMember(owner = "client!rj", name = "Z", descriptor = "[I") @@ -24,17 +21,17 @@ public final class Static217 { @OriginalMember(owner = "client!rj", name = "a", descriptor = "(IIILclient!e;I)V") public static void method3767(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Player arg2, @OriginalArg(4) int arg3) { - if (Static173.self == arg2 || Static231.anInt5204 >= 400) { + if (PlayerList.self == arg2 || Static231.anInt5204 >= 400) { return; } @Pc(158) JagString local158; if (arg2.anInt1671 == 0) { @Pc(22) boolean local22 = true; - if (Static173.self.anInt1667 != -1 && arg2.anInt1667 != -1) { - @Pc(43) int local43 = arg2.anInt1652 < Static173.self.anInt1652 ? Static173.self.anInt1652 : arg2.anInt1652; - @Pc(58) int local58 = Static173.self.anInt1667 < arg2.anInt1667 ? Static173.self.anInt1667 : arg2.anInt1667; + if (PlayerList.self.anInt1667 != -1 && arg2.anInt1667 != -1) { + @Pc(43) int local43 = arg2.anInt1652 < PlayerList.self.anInt1652 ? PlayerList.self.anInt1652 : arg2.anInt1652; + @Pc(58) int local58 = PlayerList.self.anInt1667 < arg2.anInt1667 ? PlayerList.self.anInt1667 : arg2.anInt1667; @Pc(69) int local69 = local43 * 10 / 100 + local58 + 5; - @Pc(76) int local76 = Static173.self.anInt1652 - arg2.anInt1652; + @Pc(76) int local76 = PlayerList.self.anInt1652 - arg2.anInt1652; if (local76 < 0) { local76 = -local76; } @@ -42,28 +39,28 @@ public final class Static217 { local22 = false; } } - @Pc(95) JagString local95 = Static266.game == 1 ? LocalizedText.RATING : LocalizedText.LEVEL; + @Pc(95) JagString local95 = client.game == 1 ? LocalizedText.RATING : LocalizedText.LEVEL; if (arg2.anInt1652 < arg2.anInt1656) { - local158 = Static34.concatenate(new JagString[] { arg2.method1264(), local22 ? Static123.method2420(arg2.anInt1652, Static173.self.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.parseInt(arg2.anInt1652), Static78.aClass100_465, Static123.parseInt(arg2.anInt1656 - arg2.anInt1652), Static72.aClass100_448 }); + local158 = JagString.concatenate(new JagString[] { arg2.method1264(), local22 ? Static123.method2420(arg2.anInt1652, PlayerList.self.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.parseInt(arg2.anInt1652), Static78.aClass100_465, Static123.parseInt(arg2.anInt1656 - arg2.anInt1652), Static72.aClass100_448 }); } else { - local158 = Static34.concatenate(new JagString[] { arg2.method1264(), local22 ? Static123.method2420(arg2.anInt1652, Static173.self.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.parseInt(arg2.anInt1652), Static72.aClass100_448 }); + local158 = JagString.concatenate(new JagString[] { arg2.method1264(), local22 ? Static123.method2420(arg2.anInt1652, PlayerList.self.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.parseInt(arg2.anInt1652), Static72.aClass100_448 }); } } else { - local158 = Static34.concatenate(new JagString[] { arg2.method1264(), Static123.aClass100_593, LocalizedText.SKILL, Static123.parseInt(arg2.anInt1671), Static72.aClass100_448 }); + local158 = JagString.concatenate(new JagString[] { arg2.method1264(), Static123.aClass100_593, LocalizedText.SKILL, Static123.parseInt(arg2.anInt1671), Static72.aClass100_448 }); } @Pc(275) int local275; if (Static260.anInt5014 == 1) { - Static98.method1966(Static169.anInt4075, (long) arg0, Static34.concatenate(new JagString[] { Static34.aClass100_203, Static105.aClass100_561, local158 }), arg3, (short) 1, LocalizedText.USE, arg1); + Static98.method1966(Static169.anInt4075, (long) arg0, JagString.concatenate(new JagString[] { Static34.aClass100_203, Static105.aClass100_561, local158 }), arg3, (short) 1, LocalizedText.USE, arg1); } else if (!Static241.aBoolean302) { for (local275 = 7; local275 >= 0; local275--) { if (Static160.aClass100Array121[local275] != null) { @Pc(291) short local291 = 0; - if (Static266.game == 0 && Static160.aClass100Array121[local275].equalsIgnoreCase(LocalizedText.ATTACK)) { - if (arg2.anInt1652 > Static173.self.anInt1652) { + if (client.game == 0 && Static160.aClass100Array121[local275].equalsIgnoreCase(LocalizedText.ATTACK)) { + if (arg2.anInt1652 > PlayerList.self.anInt1652) { local291 = 2000; } - if (Static173.self.anInt1650 != 0 && arg2.anInt1650 != 0) { - if (Static173.self.anInt1650 == arg2.anInt1650) { + if (PlayerList.self.anInt1650 != 0 && arg2.anInt1650 != 0) { + if (PlayerList.self.anInt1650 == arg2.anInt1650) { local291 = 2000; } else { local291 = 0; @@ -74,15 +71,15 @@ public final class Static217 { } @Pc(353) short local353 = Static5.aShortArray2[local275]; @Pc(358) short local358 = (short) (local353 + local291); - Static98.method1966(Static191.anIntArray388[local275], (long) arg0, Static34.concatenate(new JagString[] { Static204.aClass100_896, local158 }), arg3, local358, Static160.aClass100Array121[local275], arg1); + Static98.method1966(Static191.anIntArray388[local275], (long) arg0, JagString.concatenate(new JagString[] { Static204.aClass100_896, local158 }), arg3, local358, Static160.aClass100Array121[local275], arg1); } } } else if ((Static274.anInt4999 & 0x8) != 0) { - Static98.method1966(Static246.anInt5393, (long) arg0, Static34.concatenate(new JagString[] { Static78.aClass100_466, Static105.aClass100_561, local158 }), arg3, (short) 15, Static102.aClass100_545, arg1); + Static98.method1966(Static246.anInt5393, (long) arg0, JagString.concatenate(new JagString[] { Static78.aClass100_466, Static105.aClass100_561, local158 }), arg3, (short) 15, Static102.aClass100_545, arg1); } for (local275 = 0; local275 < Static231.anInt5204; local275++) { if (Static39.aShortArray6[local275] == 60) { - Static233.aClass100Array160[local275] = Static34.concatenate(new JagString[] { Static204.aClass100_896, local158 }); + Static233.aClass100Array160[local275] = JagString.concatenate(new JagString[] { Static204.aClass100_896, local158 }); break; } } @@ -106,7 +103,7 @@ public final class Static217 { Static10.method351(); Static230.method3947(); Static147.method2764(); - if (Static81.modeWhat != 0) { + if (client.modeWhat != 0) { for (@Pc(54) int local54 = 0; local54 < Static51.aByteArrayArray8.length; local54++) { Static51.aByteArrayArray8[local54] = null; } diff --git a/client/src/main/java/Static219.java b/client/src/main/java/Static219.java index 6a7607d..4837850 100644 --- a/client/src/main/java/Static219.java +++ b/client/src/main/java/Static219.java @@ -3,16 +3,10 @@ import org.openrs2.deob.annotation.Pc; public final class Static219 { - @OriginalMember(owner = "client!rl", name = "V", descriptor = "[Lclient!qf;") - public static Sprite[] aClass3_Sub2_Sub1Array9; - @OriginalMember(owner = "client!rl", name = "P", descriptor = "Lclient!n;") public static final SoftLruHashTable sprites = new SoftLruHashTable(64); - @OriginalMember(owner = "client!rl", name = "S", descriptor = "Lclient!na;") - public static final JagString aClass100_920 = Static28.parse("hitmarks"); - - @OriginalMember(owner = "client!rl", name = "T", descriptor = "Lclient!na;") + @OriginalMember(owner = "client!rl", name = "T", descriptor = "Lclient!na;") private static final JagString aClass100_921 = Static28.parse("Sat"); @OriginalMember(owner = "client!rl", name = "U", descriptor = "Lclient!na;") diff --git a/client/src/main/java/Static22.java b/client/src/main/java/Static22.java index ce27e2d..3a5a33e 100644 --- a/client/src/main/java/Static22.java +++ b/client/src/main/java/Static22.java @@ -12,10 +12,7 @@ public final class Static22 { @OriginalMember(owner = "client!bl", name = "T", descriptor = "I") public static int anInt726 = 0; - @OriginalMember(owner = "client!bl", name = "W", descriptor = "I") - public static int anInt729 = 0; - - @OriginalMember(owner = "client!bl", name = "X", descriptor = "I") + @OriginalMember(owner = "client!bl", name = "X", descriptor = "I") public static int anInt730 = -1; @OriginalMember(owner = "client!bl", name = "a", descriptor = "(IIIIIIII)V") diff --git a/client/src/main/java/Static220.java b/client/src/main/java/Static220.java index 39b8c21..1e10e1e 100644 --- a/client/src/main/java/Static220.java +++ b/client/src/main/java/Static220.java @@ -10,10 +10,7 @@ public final class Static220 { @OriginalMember(owner = "client!rm", name = "d", descriptor = "Lclient!n;") public static final SoftLruHashTable aClass99_28 = new SoftLruHashTable(64); - @OriginalMember(owner = "client!rm", name = "g", descriptor = "Z") - public static boolean highWaterDetail = true; - - @OriginalMember(owner = "client!rm", name = "i", descriptor = "Lclient!na;") + @OriginalMember(owner = "client!rm", name = "i", descriptor = "Lclient!na;") public static final JagString aClass100_930 = Static28.parse("(Z"); @OriginalMember(owner = "client!rm", name = "a", descriptor = "(IBI)V") @@ -59,14 +56,6 @@ public final class Static220 { Static69.method1543(Static55.level, arg1, arg0, Static207.method3685(Static55.level, arg1 * 128 + 64, arg0 * 128 + 64), local30.aClass8_Sub7_1, local152, local89, local91); } - @OriginalMember(owner = "client!rm", name = "a", descriptor = "(JB)V") - public static void method3799(@OriginalArg(0) long arg0) { - try { - Thread.sleep(arg0); - } catch (@Pc(11) InterruptedException local11) { - } - } - @OriginalMember(owner = "client!rm", name = "a", descriptor = "(ZIIIILclient!ak;I)Lclient!ak;") public static Model method3800(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) Model arg4, @OriginalArg(6) int arg5) { @Pc(4) long local4 = (long) arg2; diff --git a/client/src/main/java/Static221.java b/client/src/main/java/Static221.java index 9e2a104..43d4ef9 100644 --- a/client/src/main/java/Static221.java +++ b/client/src/main/java/Static221.java @@ -31,7 +31,7 @@ public final class Static221 { Static250.anInt5434 = 0; } @Pc(20) int local20 = 0; - @Pc(24) int local24 = Static129.width * arg1; + @Pc(24) int local24 = SoftwareRaster.width * arg1; @Pc(26) int local26 = 0; for (@Pc(28) int local28 = 1; local28 < 255; local28++) { @Pc(43) int local43 = (256 - local28) * Static35.anIntArray83[local28] / 256; @@ -41,7 +41,7 @@ public final class Static221 { local20 += local43; @Pc(55) int local55; for (local55 = local43; local55 < 128; local55++) { - @Pc(65) int local65 = Static129.pixels[local24++ + arg0]; + @Pc(65) int local65 = SoftwareRaster.pixels[local24++ + arg0]; @Pc(70) int local70 = Static216.anIntArray188[local20++]; if (local70 == 0) { Static167.aClass3_Sub2_Sub1_Sub1_3.anIntArray20[local26++] = local65; @@ -59,9 +59,9 @@ public final class Static221 { } } for (local55 = 0; local55 < local43; local55++) { - Static167.aClass3_Sub2_Sub1_Sub1_3.anIntArray20[local26++] = Static129.pixels[arg0 + local24++]; + Static167.aClass3_Sub2_Sub1_Sub1_3.anIntArray20[local26++] = SoftwareRaster.pixels[arg0 + local24++]; } - local24 += Static129.width - 128; + local24 += SoftwareRaster.width - 128; } if (GlRenderer.enabled) { Static46.method1178(Static167.aClass3_Sub2_Sub1_Sub1_3.anIntArray20, arg0, arg1, Static167.aClass3_Sub2_Sub1_Sub1_3.anInt1867, Static167.aClass3_Sub2_Sub1_Sub1_3.anInt1859); diff --git a/client/src/main/java/Static223.java b/client/src/main/java/Static223.java index 97911f5..18034d2 100644 --- a/client/src/main/java/Static223.java +++ b/client/src/main/java/Static223.java @@ -1,4 +1,3 @@ -import java.awt.Component; import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @@ -34,7 +33,7 @@ public final class Static223 { @OriginalMember(owner = "client!sc", name = "a", descriptor = "(IIILclient!km;)V") public static void method3855(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) Npc arg2) { - if (arg2.anInt3369 == arg1 && arg1 != -1) { + if (arg2.seqId == arg1 && arg1 != -1) { @Pc(10) SeqType local10 = Static36.get(arg1); @Pc(13) int local13 = local10.anInt5347; if (local13 == 1) { @@ -43,21 +42,21 @@ public final class Static223 { arg2.anInt3360 = 0; arg2.anInt3371 = 0; arg2.anInt3420 = arg0; - Static152.method2836(arg2.zFine, local10, arg2.xFine, false, arg2.anInt3425); + SoundPlayer.playSeqSound(arg2.zFine, local10, arg2.xFine, false, arg2.anInt3425); } if (local13 == 2) { arg2.anInt3371 = 0; } - } else if (arg1 == -1 || arg2.anInt3369 == -1 || Static36.get(arg1).anInt5355 >= Static36.get(arg2.anInt3369).anInt5355) { + } else if (arg1 == -1 || arg2.seqId == -1 || Static36.get(arg1).anInt5355 >= Static36.get(arg2.seqId).anInt5355) { arg2.anInt3360 = 0; - arg2.anInt3369 = arg1; + arg2.seqId = arg1; arg2.anInt3373 = 1; arg2.anInt3371 = 0; arg2.anInt3420 = arg0; arg2.anInt3405 = arg2.movementQueueSize; arg2.anInt3425 = 0; - if (arg2.anInt3369 != -1) { - Static152.method2836(arg2.zFine, Static36.get(arg2.anInt3369), arg2.xFine, false, arg2.anInt3425); + if (arg2.seqId != -1) { + SoundPlayer.playSeqSound(arg2.zFine, Static36.get(arg2.seqId), arg2.xFine, false, arg2.anInt3425); } } } @@ -159,11 +158,4 @@ public final class Static223 { } } - @OriginalMember(owner = "client!sc", name = "a", descriptor = "(ILjava/awt/Component;)V") - public static void stop(@OriginalArg(1) Component arg0) { - arg0.removeMouseListener(Static93.instance); - arg0.removeMouseMotionListener(Static93.instance); - arg0.removeFocusListener(Static93.instance); - Static57.anInt1759 = 0; - } } diff --git a/client/src/main/java/Static224.java b/client/src/main/java/Static224.java index 2834306..6b3d5ff 100644 --- a/client/src/main/java/Static224.java +++ b/client/src/main/java/Static224.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static224 { - @OriginalMember(owner = "client!sd", name = "I", descriptor = "I") - public static int anInt5057; - - @OriginalMember(owner = "client!sd", name = "R", descriptor = "I") + @OriginalMember(owner = "client!sd", name = "R", descriptor = "I") public static int anInt5062; @OriginalMember(owner = "client!sd", name = "S", descriptor = "I") diff --git a/client/src/main/java/Static225.java b/client/src/main/java/Static225.java index 3e11afd..976350b 100644 --- a/client/src/main/java/Static225.java +++ b/client/src/main/java/Static225.java @@ -53,7 +53,7 @@ public final class Static225 { if (local121 > 15) { local121 -= 32; } - local65.method1265(local92 + Static173.self.movementQueueX[0], local116 == 1, Static173.self.movementQueueZ[0] + local121); + local65.method1265(local92 + PlayerList.self.movementQueueX[0], local116 == 1, PlayerList.self.movementQueueZ[0] + local121); continue; } } @@ -79,10 +79,10 @@ public final class Static225 { @OriginalMember(owner = "client!se", name = "a", descriptor = "(Lclient!na;Lclient!na;IB)V") public static void method3896(@OriginalArg(0) JagString arg0, @OriginalArg(1) JagString arg1, @OriginalArg(2) int arg2) { - Static186.password = arg1; + Player.password = arg1; Static5.anInt39 = arg2; - Static186.username = arg0; - if (Static186.username.strEquals(Static186.EMPTY) || Static186.password.strEquals(Static186.EMPTY)) { + Player.username = arg0; + if (Player.username.strEquals(JagString.EMPTY) || Player.password.strEquals(JagString.EMPTY)) { Static266.reply = 3; } else if (Static125.worldId == -1) { Static20.anInt673 = 0; @@ -93,9 +93,9 @@ public final class Static225 { local43.p1(10); local43.p2((int) (Math.random() * 99999.0D)); local43.p2(530); - local43.p8(Static186.username.encode37()); + local43.p8(Player.username.encode37()); local43.p4((int) (Math.random() * 9.9999999E7D)); - local43.pjstr(Static186.password); + local43.pjstr(Player.password); local43.p4((int) (Math.random() * 9.9999999E7D)); local43.encryptRsa(GlobalConfig.RSA_EXPONENT, GlobalConfig.RSA_MODULUS); Static6.outboundBuffer.offset = 0; diff --git a/client/src/main/java/Static226.java b/client/src/main/java/Static226.java index 040ee64..3f912eb 100644 --- a/client/src/main/java/Static226.java +++ b/client/src/main/java/Static226.java @@ -24,8 +24,10 @@ public final class Static226 { @OriginalMember(owner = "client!sf", name = "i", descriptor = "I") public static int anInt5084 = 0; + @OriginalMember(owner = "client!ml", name = "Q", descriptor = "I") + public static int anInt3953 = 0; - @OriginalMember(owner = "client!sf", name = "a", descriptor = "(ILclient!cd;)V") + @OriginalMember(owner = "client!sf", name = "a", descriptor = "(ILclient!cd;)V") public static void method3898(@OriginalArg(1) Class3_Sub7 arg0) { @Pc(5) long local5 = 0L; @Pc(7) int local7 = -1; @@ -60,11 +62,11 @@ public final class Static226 { @OriginalMember(owner = "client!sf", name = "b", descriptor = "(B)V") public static void method3901() { - @Pc(16) int local16 = Static280.aClass3_Sub2_Sub9_43.getStringWidth(LocalizedText.CHOOSE_OPTION); + @Pc(16) int local16 = Fonts.b12Full.getStringWidth(LocalizedText.CHOOSE_OPTION); @Pc(18) int local18; @Pc(27) int local27; for (local18 = 0; local18 < Static231.anInt5204; local18++) { - local27 = Static280.aClass3_Sub2_Sub9_43.getStringWidth(Static269.method2228(local18)); + local27 = Fonts.b12Full.getStringWidth(Static269.method2228(local18)); if (local27 > local16) { local16 = local27; } @@ -85,10 +87,10 @@ public final class Static226 { if (local43 < 0) { local43 = 0; } - if (Static162.anInt3953 == 1) { + if (anInt3953 == 1) { if (Static155.anInt3751 == Static277.anInt5850 && Static280.anInt5895 == Static60.anInt1892) { Static13.anInt436 = Static231.anInt5204 * 15 + (Static261.aBoolean298 ? 26 : 22); - Static162.anInt3953 = 0; + anInt3953 = 0; Static229.anInt5138 = local43; Static183.anInt4271 = local27; Static60.aBoolean108 = true; @@ -96,7 +98,7 @@ public final class Static226 { } } else if (Static155.anInt3751 == Static7.clickX && Static60.anInt1892 == Static60.clickY) { Static183.anInt4271 = local27; - Static162.anInt3953 = 0; + anInt3953 = 0; Static24.anInt761 = local16; Static229.anInt5138 = local43; Static13.anInt436 = (Static261.aBoolean298 ? 26 : 22) + Static231.anInt5204 * 15; @@ -104,7 +106,7 @@ public final class Static226 { } else { Static280.anInt5895 = Static60.clickY; Static277.anInt5850 = Static7.clickX; - Static162.anInt3953 = 1; + anInt3953 = 1; } } } diff --git a/client/src/main/java/Static227.java b/client/src/main/java/Static227.java index 14b14b0..76da057 100644 --- a/client/src/main/java/Static227.java +++ b/client/src/main/java/Static227.java @@ -2,16 +2,10 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static227 { - @OriginalMember(owner = "client!sg", name = "h", descriptor = "I") - public static int anInt5091; - @OriginalMember(owner = "client!sg", name = "i", descriptor = "Lclient!be;") public static Component staticActiveComponent2; - @OriginalMember(owner = "client!sg", name = "k", descriptor = "Lclient!ve;") - public static Js5 js5Archive23; - - @OriginalMember(owner = "client!sg", name = "o", descriptor = "I") + @OriginalMember(owner = "client!sg", name = "o", descriptor = "I") public static int cameraType; @OriginalMember(owner = "client!sg", name = "b", descriptor = "[I") diff --git a/client/src/main/java/Static228.java b/client/src/main/java/Static228.java index e9681a5..343d9b8 100644 --- a/client/src/main/java/Static228.java +++ b/client/src/main/java/Static228.java @@ -19,10 +19,7 @@ public final class Static228 { @OriginalMember(owner = "client!sh", name = "i", descriptor = "[[I") public static final int[][] anIntArrayArray35 = new int[][] { { 0, 128, 0, 0, 128, 0, 128, 128 }, { 0, 128, 0, 0, 128, 0 }, { 0, 0, 64, 128, 0, 128 }, { 128, 128, 64, 128, 128, 0 }, { 0, 0, 128, 0, 128, 128, 64, 128 }, { 0, 128, 0, 0, 128, 0, 64, 128 }, { 64, 128, 0, 128, 0, 0, 64, 0 }, { 0, 0, 64, 0, 0, 64 }, { 128, 0, 128, 128, 0, 128, 0, 64, 64, 0 }, { 0, 128, 0, 0, 32, 64, 64, 96, 128, 128 }, { 0, 0, 128, 0, 128, 128, 64, 96, 32, 64 }, { 0, 0, 128, 0, 96, 32, 32, 32 } }; - @OriginalMember(owner = "client!sh", name = "j", descriptor = "Lclient!na;") - public static final JagString aClass100_968 = Static28.parse("headicons_prayer"); - - @OriginalMember(owner = "client!sh", name = "k", descriptor = "Z") + @OriginalMember(owner = "client!sh", name = "k", descriptor = "Z") public static final boolean aBoolean248 = false; @OriginalMember(owner = "client!sh", name = "a", descriptor = "(II)[B") diff --git a/client/src/main/java/Static229.java b/client/src/main/java/Static229.java index 86ce1a1..2764f71 100644 --- a/client/src/main/java/Static229.java +++ b/client/src/main/java/Static229.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static229 { - @OriginalMember(owner = "client!si", name = "R", descriptor = "[[[B") - public static byte[][][] aByteArrayArrayArray12; - - @OriginalMember(owner = "client!si", name = "S", descriptor = "[Lclient!na;") + @OriginalMember(owner = "client!si", name = "S", descriptor = "[Lclient!na;") public static JagString[] aClass100Array156; @OriginalMember(owner = "client!si", name = "ab", descriptor = "I") diff --git a/client/src/main/java/Static23.java b/client/src/main/java/Static23.java index 51c177d..acfe87a 100644 --- a/client/src/main/java/Static23.java +++ b/client/src/main/java/Static23.java @@ -84,7 +84,7 @@ public final class Static23 { public static byte[] method648(@OriginalArg(1) byte[] arg0) { @Pc(6) int local6 = arg0.length; @Pc(9) byte[] local9 = new byte[local6]; - Static289.copy(arg0, 0, local9, 0, local6); + JagString.copy(arg0, 0, local9, 0, local6); return local9; } } diff --git a/client/src/main/java/Static230.java b/client/src/main/java/Static230.java index c16dbab..e692b28 100644 --- a/client/src/main/java/Static230.java +++ b/client/src/main/java/Static230.java @@ -149,20 +149,20 @@ public final class Static230 { @OriginalMember(owner = "client!sj", name = "a", descriptor = "(ILclient!na;)V") public static void method3954(@OriginalArg(1) JagString arg0) { - Static47.settings = arg0; + client.settings = arg0; if (GameShell.signLink.applet == null) { return; } try { @Pc(17) JagString local17 = Static272.aClass100_989.fromParameters(GameShell.signLink.applet); @Pc(23) JagString local23 = Static246.aClass100_1029.fromParameters(GameShell.signLink.applet); - @Pc(48) JagString local48 = Static34.concatenate(new JagString[] { local17, Static142.aClass100_667, arg0, Static276.aClass100_1095, local23 }); + @Pc(48) JagString local48 = JagString.concatenate(new JagString[] { local17, Static142.aClass100_667, arg0, Static276.aClass100_1095, local23 }); if (arg0.length() == 0) { - local48 = Static34.concatenate(new JagString[] { local48, Static245.aClass100_1018 }); + local48 = JagString.concatenate(new JagString[] { local48, Static245.aClass100_1018 }); } else { - local48 = Static34.concatenate(new JagString[] { local48, Static263.aClass100_1082, Static33.method873(MonotonicClock.currentTimeMillis() + 94608000000L), Static64.aClass100_431, Static154.method2929(94608000L) }); + local48 = JagString.concatenate(new JagString[] { local48, Static263.aClass100_1082, Static33.method873(MonotonicClock.currentTimeMillis() + 94608000000L), Static64.aClass100_431, Static154.method2929(94608000L) }); } - Static34.concatenate(new JagString[] { Static221.aClass100_821, local48, Static223.aClass100_946 }).method3134(GameShell.signLink.applet); + JagString.concatenate(new JagString[] { Static221.aClass100_821, local48, Static223.aClass100_946 }).method3134(GameShell.signLink.applet); } catch (@Pc(124) Throwable local124) { } } diff --git a/client/src/main/java/Static231.java b/client/src/main/java/Static231.java index b04a8af..cc7da94 100644 --- a/client/src/main/java/Static231.java +++ b/client/src/main/java/Static231.java @@ -29,67 +29,6 @@ public final class Static231 { @OriginalMember(owner = "client!sk", name = "lb", descriptor = "Z") public static boolean aBoolean252 = false; - @OriginalMember(owner = "client!sk", name = "a", descriptor = "(ILclient!wa;)V") - public static void method3980(@OriginalArg(1) Buffer arg0) { - label83: while (true) { - if (arg0.offset < arg0.data.length) { - @Pc(23) int local23 = 0; - @Pc(25) boolean local25 = false; - @Pc(27) int local27 = 0; - if (arg0.g1() == 1) { - local25 = true; - local23 = arg0.g1(); - local27 = arg0.g1(); - } - @Pc(46) int local46 = arg0.g1(); - @Pc(50) int local50 = arg0.g1(); - @Pc(57) int local57 = local46 * 64 - Static158.anInt3846; - @Pc(68) int local68 = Static181.anInt4296 + Static2.anInt13 - local50 * 64 - 1; - @Pc(146) byte local146; - @Pc(96) int local96; - if (local57 >= 0 && local68 - 63 >= 0 && Static48.anInt1449 > local57 + 63 && local68 < Static181.anInt4296) { - local96 = local57 >> 6; - @Pc(100) int local100 = local68 >> 6; - @Pc(102) int local102 = 0; - while (true) { - if (local102 >= 64) { - continue label83; - } - for (@Pc(107) int local107 = 0; local107 < 64; local107++) { - if (!local25 || local23 * 8 <= local102 && local23 * 8 + 8 > local102 && local107 >= local27 * 8 && local27 * 8 + 8 > local107) { - local146 = arg0.g1s(); - if (local146 != 0) { - if (Static229.aByteArrayArrayArray12[local96][local100] == null) { - Static229.aByteArrayArrayArray12[local96][local100] = new byte[4096]; - } - Static229.aByteArrayArrayArray12[local96][local100][(63 - local107 << 6) + local102] = local146; - @Pc(182) byte local182 = arg0.g1s(); - if (Static125.aByteArrayArrayArray10[local96][local100] == null) { - Static125.aByteArrayArrayArray10[local96][local100] = new byte[4096]; - } - Static125.aByteArrayArrayArray10[local96][local100][local102 + (63 - local107 << 6)] = local182; - } - } - } - local102++; - } - } - local96 = 0; - while (true) { - if (local96 >= (local25 ? 64 : 4096)) { - continue label83; - } - local146 = arg0.g1s(); - if (local146 != 0) { - arg0.offset++; - } - local96++; - } - } - return; - } - } - @OriginalMember(owner = "client!sk", name = "a", descriptor = "(IIIIBIII)V") public static void method3981(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) { @Pc(7) int local7 = 0; @@ -270,20 +209,7 @@ public final class Static231 { } } - @OriginalMember(owner = "client!sk", name = "a", descriptor = "(JI)V") - public static void sleep(@OriginalArg(0) long arg0) { - if (arg0 <= 0L) { - return; - } - if (arg0 % 10L == 0L) { - Static220.method3799(arg0 - 1L); - Static220.method3799(1L); - } else { - Static220.method3799(arg0); - } - } - - @OriginalMember(owner = "client!sk", name = "c", descriptor = "(II)I") + @OriginalMember(owner = "client!sk", name = "c", descriptor = "(II)I") public static int toLowerCase(@OriginalArg(1) int arg0) { if (arg0 >= 65 && arg0 <= 90 || arg0 >= 192 && arg0 <= 222 && arg0 != 215) { return arg0 + 32; diff --git a/client/src/main/java/Static232.java b/client/src/main/java/Static232.java index 755ae0a..7797e8d 100644 --- a/client/src/main/java/Static232.java +++ b/client/src/main/java/Static232.java @@ -43,8 +43,8 @@ public final class Static232 { if (local80 > 0) { @Pc(91) int local91 = arg4 + local50 >> 6; local65 += arg0; - if (local91 >= 0 && local91 <= Static83.anIntArrayArrayArray3.length - 1) { - @Pc(116) int[][] local116 = Static83.anIntArrayArrayArray3[local91]; + if (local91 >= 0 && local91 <= WorldMap.underlayColors.length - 1) { + @Pc(116) int[][] local116 = WorldMap.underlayColors[local91]; for (@Pc(119) int local119 = -local47; local119 < local39 + local47; local119++) { @Pc(136) int local136 = arg3 * (local119 + 1) >> 16; @Pc(144) int local144 = local119 * arg3 >> 16; @@ -57,15 +57,15 @@ public final class Static232 { @Pc(209) int local209 = local116[local163][local203]; if (local209 != 0) { @Pc(222) LocType local222 = Static271.get(local209 - 1); - if (!Static258.aBooleanArray130[local222.anInt4400]) { - if (local11 != -1 && local222.anInt4400 == Static9.anInt172) { - @Pc(243) Class3_Sub26 local243 = new Class3_Sub26(); + if (!Static258.aBooleanArray130[local222.mapElement]) { + if (local11 != -1 && local222.mapElement == Static9.anInt172) { + @Pc(243) MapElement local243 = new MapElement(); local243.anInt4307 = local65; local243.anInt4314 = local144; - local243.anInt4308 = local222.anInt4400; - Static172.aClass69_97.method2282(local243); + local243.id = local222.mapElement; + Static172.aClass69_97.addTail(local243); } else { - Static241.aClass3_Sub2_Sub1_Sub1Array13[local222.anInt4400].method1423(local65 - 7, local144 + -7); + Static241.aClass3_Sub2_Sub1_Sub1Array13[local222.mapElement].method1423(local65 - 7, local144 + -7); } } } @@ -75,12 +75,12 @@ public final class Static232 { } } } - for (@Pc(285) Class3_Sub26 local285 = (Class3_Sub26) Static172.aClass69_97.method2289(); local285 != null; local285 = (Class3_Sub26) Static172.aClass69_97.method2288()) { - Static129.method2502(local285.anInt4307, local285.anInt4314, 15, local11); - Static129.method2502(local285.anInt4307, local285.anInt4314, 13, local11); - Static129.method2502(local285.anInt4307, local285.anInt4314, 11, local11); - Static129.method2502(local285.anInt4307, local285.anInt4314, 9, local11); - Static241.aClass3_Sub2_Sub1_Sub1Array13[local285.anInt4308].method1423(local285.anInt4307 - 7, local285.anInt4314 + -7); + for (@Pc(285) MapElement local285 = (MapElement) Static172.aClass69_97.method2289(); local285 != null; local285 = (MapElement) Static172.aClass69_97.method2288()) { + SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 15, local11); + SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 13, local11); + SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 11, local11); + SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 9, local11); + Static241.aClass3_Sub2_Sub1_Sub1Array13[local285.id].method1423(local285.anInt4307 - 7, local285.anInt4314 + -7); } Static172.aClass69_97.clear(); } diff --git a/client/src/main/java/Static233.java b/client/src/main/java/Static233.java index eabdb99..814486d 100644 --- a/client/src/main/java/Static233.java +++ b/client/src/main/java/Static233.java @@ -34,10 +34,7 @@ public final class Static233 { @OriginalMember(owner = "client!t", name = "w", descriptor = "[J") public static final long[] aLongArray9 = new long[100]; - @OriginalMember(owner = "client!t", name = "x", descriptor = "Z") - public static boolean javaScript = false; - - @OriginalMember(owner = "client!t", name = "y", descriptor = "I") + @OriginalMember(owner = "client!t", name = "y", descriptor = "I") public static int loadingScreenState = 0; @OriginalMember(owner = "client!t", name = "z", descriptor = "I") @@ -66,7 +63,7 @@ public final class Static233 { if (local17 != null && local17.anInt4058 == 2) { Static198.method1026(arg0 >> 1, arg4, (local17.anInt4046 - Static142.originZ << 7) + local17.anInt4047, local17.anInt4050 * 2, arg2 >> 1, local17.anInt4045 + (local17.anInt4053 - Static225.originX << 7), arg3); if (Static65.anInt1951 > -1 && Static83.loop % 20 < 10) { - Static276.aClass3_Sub2_Sub1Array11[local17.anInt4048].method1423(arg1 + Static65.anInt1951 - 12, arg5 + -28 - -Static16.anInt548); + Sprites.headhints[local17.anInt4048].method1423(arg1 + Static65.anInt1951 - 12, arg5 + -28 - -Static16.anInt548); } } local3++; @@ -136,9 +133,9 @@ public final class Static233 { if (local24 != 0) { local73 = (local73 << local24 & 0xF) + (local73 >> 4 - local24); } - Static102.method2075(Static173.self.movementQueueZ[0], 0, local59, true, local73, arg2, local62, 0, 2, arg1, Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, local59, true, local73, arg2, local62, 0, 2, arg1, PlayerList.self.movementQueueX[0]); } else { - Static102.method2075(Static173.self.movementQueueZ[0], local24, 0, true, 0, arg2, 0, local12 + 1, 2, arg1, Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], local24, 0, true, 0, arg2, 0, local12 + 1, 2, arg1, PlayerList.self.movementQueueX[0]); } Static25.y = Static60.clickY; Static17.milliseconds = 0; diff --git a/client/src/main/java/Static234.java b/client/src/main/java/Static234.java index b7e11f4..2efc4f8 100644 --- a/client/src/main/java/Static234.java +++ b/client/src/main/java/Static234.java @@ -78,7 +78,7 @@ public final class Static234 { if (local227 != -1) { @Pc(236) SeqType local236 = Static36.get(local227); if (local236 != null && local236.frames != null) { - Static152.method2836(local14.zFine, local236, local14.xFine, false, 0); + SoundPlayer.playSeqSound(local14.zFine, local236, local14.xFine, false, 0); } } } @@ -122,17 +122,6 @@ public final class Static234 { } } - @OriginalMember(owner = "client!ta", name = "a", descriptor = "(Lclient!ve;III)Z") - public static boolean method4016(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { - @Pc(9) byte[] local9 = arg0.getFile(arg2, arg1); - if (local9 == null) { - return false; - } else { - Static84.method1770(local9); - return true; - } - } - @OriginalMember(owner = "client!ta", name = "a", descriptor = "(IZIII)V") public static void method4017(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { if (Static245.load(arg2)) { @@ -142,14 +131,14 @@ public final class Static234 { @OriginalMember(owner = "client!ta", name = "a", descriptor = "([Lclient!mm;ILclient!ve;)V") public static void method4018(@OriginalArg(0) SoftwareSprite[] arg0, @OriginalArg(2) Js5 arg1) { - Static119.aClass153_44 = arg1; + MapList.archive = arg1; Static241.aClass3_Sub2_Sub1_Sub1Array13 = arg0; Static258.aBooleanArray130 = new boolean[Static241.aClass3_Sub2_Sub1_Sub1Array13.length]; Static228.aClass69_120.clear(); - @Pc(25) int local25 = Static119.aClass153_44.getGroupId(Static54.aClass100_374); - @Pc(30) int[] local30 = Static119.aClass153_44.method4503(local25); + @Pc(25) int local25 = MapList.archive.getGroupId(Static54.aClass100_374); + @Pc(30) int[] local30 = MapList.archive.method4503(local25); for (@Pc(32) int local32 = 0; local32 < local30.length; local32++) { - Static228.aClass69_120.method2282(Static210.method3713(new Buffer(Static119.aClass153_44.getFile(local25, local30[local32])))); + Static228.aClass69_120.addTail(Static210.method3713(new Buffer(MapList.archive.getFile(local25, local30[local32])))); } } @@ -162,16 +151,4 @@ public final class Static234 { } } - @OriginalMember(owner = "client!ta", name = "a", descriptor = "(Z)V") - public static void resetTimer() { - GameShell.timer.method3394(); - @Pc(10) int local10; - for (local10 = 0; local10 < 32; local10++) { - GameShell.redrawTimes[local10] = 0L; - } - for (local10 = 0; local10 < 32; local10++) { - GameShell.logicTimes[local10] = 0L; - } - GameShell.logicCycles = 0; - } } diff --git a/client/src/main/java/Static235.java b/client/src/main/java/Static235.java index 8ad6e44..161627d 100644 --- a/client/src/main/java/Static235.java +++ b/client/src/main/java/Static235.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static235 { @OriginalMember(owner = "client!tb", name = "X", descriptor = "Lclient!se;") - public static MapFunctionGroup mapFunctionGroup; + public static MapElementList mapElementList; @OriginalMember(owner = "client!tb", name = "P", descriptor = "Lclient!na;") public static final JagString aClass100_1002 = Static28.parse("(U5"); diff --git a/client/src/main/java/Static236.java b/client/src/main/java/Static236.java index 4b8b8e3..dbbb457 100644 --- a/client/src/main/java/Static236.java +++ b/client/src/main/java/Static236.java @@ -4,12 +4,15 @@ import org.openrs2.deob.annotation.Pc; public final class Static236 { + @OriginalMember(owner = "client!df", name = "n", descriptor = "I") + public static int anInt1396 = 0; + @OriginalMember(owner = "client!tc", name = "a", descriptor = "(B)I") public static int method4047() { if (Static127.neverRemoveRoofs) { return 0; - } else if (Static138.allLevelsAreVisible()) { - return Static80.removeRoofsSelectively ? 2 : 1; + } else if (SceneGraph.allLevelsAreVisible()) { + return Preferences.removeRoofsSelectively ? 2 : 1; } else { return 1; } @@ -18,9 +21,9 @@ public final class Static236 { @OriginalMember(owner = "client!tc", name = "a", descriptor = "(IILclient!be;BIIII)V") public static void method4049(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Component arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) { if (Static45.aBoolean84) { - Static42.anInt1396 = 32; + anInt1396 = 32; } else { - Static42.anInt1396 = 0; + anInt1396 = 0; } Static45.aBoolean84 = false; @Pc(139) int local139; @@ -31,7 +34,7 @@ public final class Static236 { } else if (arg3 >= arg4 && arg3 < arg4 + 16 && arg0 >= arg1 + arg5 - 16 && arg1 + arg5 > arg0) { arg2.scrollY += 4; Static43.redraw(arg2); - } else if (arg3 >= arg4 - Static42.anInt1396 && arg3 < arg4 + Static42.anInt1396 + 16 && arg0 >= arg5 + 16 && arg1 + arg5 - 16 > arg0) { + } else if (arg3 >= arg4 - anInt1396 && arg3 < arg4 + anInt1396 + 16 && arg0 >= arg5 + 16 && arg1 + arg5 - 16 > arg0) { local139 = arg1 * (arg1 - 32) / arg6; if (local139 < 8) { local139 = 8; diff --git a/client/src/main/java/Static238.java b/client/src/main/java/Static238.java index df901e1..4878ab5 100644 --- a/client/src/main/java/Static238.java +++ b/client/src/main/java/Static238.java @@ -20,10 +20,10 @@ public final class Static238 { @OriginalMember(owner = "client!te", name = "a", descriptor = "(III)Lclient!da;") public static DelayedStateChange method4143(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - @Pc(13) DelayedStateChange local13 = (DelayedStateChange) Static36.aClass133_3.get((long) arg1 | (long) arg0 << 32); + @Pc(13) DelayedStateChange local13 = (DelayedStateChange) DelayedStateChange.changes.get((long) arg1 | (long) arg0 << 32); if (local13 == null) { local13 = new DelayedStateChange(arg0, arg1); - Static36.aClass133_3.put(local13, local13.key); + DelayedStateChange.changes.put(local13, local13.key); } return local13; } diff --git a/client/src/main/java/Static24.java b/client/src/main/java/Static24.java index e174445..68c26e9 100644 --- a/client/src/main/java/Static24.java +++ b/client/src/main/java/Static24.java @@ -10,10 +10,7 @@ public final class Static24 { @OriginalMember(owner = "client!bn", name = "O", descriptor = "I") public static int anInt761; - @OriginalMember(owner = "client!bn", name = "V", descriptor = "I") - public static int anInt766 = 0; - - @OriginalMember(owner = "client!bn", name = "eb", descriptor = "I") + @OriginalMember(owner = "client!bn", name = "eb", descriptor = "I") public static int anInt773 = 0; @OriginalMember(owner = "client!bn", name = "c", descriptor = "(II)V") diff --git a/client/src/main/java/Static240.java b/client/src/main/java/Static240.java index c5357b5..89b5b00 100644 --- a/client/src/main/java/Static240.java +++ b/client/src/main/java/Static240.java @@ -12,9 +12,6 @@ public final class Static240 { @OriginalMember(owner = "client!tg", name = "c", descriptor = "I") public static int screenLowerX; - @OriginalMember(owner = "client!tg", name = "d", descriptor = "[Lclient!qf;") - public static Sprite[] aClass3_Sub2_Sub1Array10; - @OriginalMember(owner = "client!tg", name = "f", descriptor = "Z") public static boolean aBoolean276; diff --git a/client/src/main/java/Static241.java b/client/src/main/java/Static241.java index ab55f6c..d436f97 100644 --- a/client/src/main/java/Static241.java +++ b/client/src/main/java/Static241.java @@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static241 { - @OriginalMember(owner = "client!th", name = "f", descriptor = "[Lclient!ok;") - public static IndexedSprite[] aClass36Array16; - @OriginalMember(owner = "client!th", name = "j", descriptor = "[[Lclient!be;") public static Component[][] components; diff --git a/client/src/main/java/Static242.java b/client/src/main/java/Static242.java index 9d07d54..f726e8d 100644 --- a/client/src/main/java/Static242.java +++ b/client/src/main/java/Static242.java @@ -14,9 +14,6 @@ public final class Static242 { @OriginalMember(owner = "client!tj", name = "c", descriptor = "I") private static int anInt5345; - @OriginalMember(owner = "client!tj", name = "d", descriptor = "[Lclient!ek;") - public static SoftwareIndexedSprite[] aClass36_Sub1Array2; - @OriginalMember(owner = "client!tj", name = "e", descriptor = "I") private static int anInt5346; @@ -113,9 +110,9 @@ public final class Static242 { @Pc(43) int local43 = local19 - (local29 * Static161.anInt3920 >> 8) >> 3; @Pc(53) int local53 = local33 - (local29 * Static161.anInt3921 >> 8) >> 3; if (arg0 != 0 && arg0 != 1 && (arg2 || arg3)) { - method4210(aClass36_Sub1Array2[arg0], shadowMapImage, local43 + 1, local53 + 1, arg1, arg2); + method4210(Sprites.floorShadows[arg0], shadowMapImage, local43 + 1, local53 + 1, arg1, arg2); } else { - method4194(aClass36_Sub1Array2[1], shadowMapImage, local43 + 1, local53 + 1); + method4194(Sprites.floorShadows[1], shadowMapImage, local43 + 1, local53 + 1); } } @@ -281,7 +278,7 @@ public final class Static242 { @OriginalMember(owner = "client!tj", name = "a", descriptor = "()V") public static void method4203() { shadowMapImage = null; - aClass36_Sub1Array2 = null; + Sprites.floorShadows = null; shadows = null; } diff --git a/client/src/main/java/Static243.java b/client/src/main/java/Static243.java index 10e0dd0..307d4d5 100644 --- a/client/src/main/java/Static243.java +++ b/client/src/main/java/Static243.java @@ -35,7 +35,7 @@ public final class Static243 { Static204.anInt4762 = 0; Static67.prevFocus = true; Static183.prevClickTime = 0L; - Static178.instance.samples = 0; + MouseRecorder.instance.samples = 0; GameShell.focus = true; Static114.method4625(); Static49.anInt1462 = -1; @@ -80,7 +80,7 @@ public final class Static243 { for (local3506 = 0; local3506 < 32768; local3506++) { Static175.npcs[local3506] = null; } - Static173.self = Static159.players[2047] = new Player(); + PlayerList.self = Static159.players[2047] = new Player(); Static217.aClass69_116.clear(); Static99.aClass69_64.clear(); if (Static159.aClass69ArrayArrayArray1 != null) { @@ -96,7 +96,7 @@ public final class Static243 { Static166.anInt4054 = 0; Static9.anInt178 = 0; Static8.method121(); - Static20.method601(); + DelayedStateChange.clear(); Static133.anInt5230 = 0; Static233.anInt5217 = 0; Static265.anInt5765 = 0; @@ -110,13 +110,13 @@ public final class Static243 { for (local3506 = 0; local3506 < Static155.varcs.length; local3506++) { Static155.varcs[local3506] = -1; } - if (Static154.topLevelInterface != -1) { - Static109.method2275(Static154.topLevelInterface); + if (InterfaceList.topLevelInterface != -1) { + Static109.method2275(InterfaceList.topLevelInterface); } for (@Pc(3755) Class3_Sub31 local3755 = (Class3_Sub31) Static119.aClass133_9.head(); local3755 != null; local3755 = (Class3_Sub31) Static119.aClass133_9.next()) { Static132.method2605(true, local3755); } - Static154.topLevelInterface = -1; + InterfaceList.topLevelInterface = -1; Static119.aClass133_9 = new HashTable(8); Static52.method1287(); Static39.aClass13_10 = null; diff --git a/client/src/main/java/Static244.java b/client/src/main/java/Static244.java index 6dc28c5..84e34be 100644 --- a/client/src/main/java/Static244.java +++ b/client/src/main/java/Static244.java @@ -7,11 +7,8 @@ public final class Static244 { @OriginalMember(owner = "client!tl", name = "c", descriptor = "Lclient!n;") public static final SoftLruHashTable models = new SoftLruHashTable(50); - @OriginalMember(owner = "client!tl", name = "d", descriptor = "I") - public static int gameState = 0; - - @OriginalMember(owner = "client!tl", name = "f", descriptor = "Lclient!na;") + @OriginalMember(owner = "client!tl", name = "f", descriptor = "Lclient!na;") public static final JagString aClass100_1014 = Static28.parse(":assist:"); @OriginalMember(owner = "client!tl", name = "i", descriptor = "Lclient!na;") diff --git a/client/src/main/java/Static246.java b/client/src/main/java/Static246.java index 3f018ab..1422abd 100644 --- a/client/src/main/java/Static246.java +++ b/client/src/main/java/Static246.java @@ -49,15 +49,15 @@ public final class Static246 { } @Pc(35) JagString local35 = arg0.name; if (arg0.combatLevel != 0) { - @Pc(47) JagString local47 = Static266.game == 1 ? LocalizedText.RATING : LocalizedText.LEVEL; - local35 = Static34.concatenate(new JagString[] { local35, Static123.method2420(arg0.combatLevel, Static173.self.anInt1652), Static123.aClass100_593, local47, Static123.parseInt(arg0.combatLevel), Static72.aClass100_448 }); + @Pc(47) JagString local47 = client.game == 1 ? LocalizedText.RATING : LocalizedText.LEVEL; + local35 = JagString.concatenate(new JagString[] { local35, Static123.method2420(arg0.combatLevel, PlayerList.self.anInt1652), Static123.aClass100_593, local47, Static123.parseInt(arg0.combatLevel), Static72.aClass100_448 }); } if (Static260.anInt5014 == 1) { - Static98.method1966(Static169.anInt4075, (long) arg2, Static34.concatenate(new JagString[] { Static34.aClass100_203, Static201.aClass100_407, local35 }), arg1, (short) 26, LocalizedText.USE, arg3); + Static98.method1966(Static169.anInt4075, (long) arg2, JagString.concatenate(new JagString[] { Static34.aClass100_203, Static201.aClass100_407, local35 }), arg1, (short) 26, LocalizedText.USE, arg3); } else if (Static241.aBoolean302) { @Pc(378) ParamType local378 = Static121.anInt3039 == -1 ? null : Static110.method2277(Static121.anInt3039); if ((Static274.anInt4999 & 0x2) != 0 && (local378 == null || arg0.getParam(Static121.anInt3039, local378.defaultInt) != local378.defaultInt)) { - Static98.method1966(anInt5393, (long) arg2, Static34.concatenate(new JagString[] { Static78.aClass100_466, Static201.aClass100_407, local35 }), arg1, (short) 45, Static102.aClass100_545, arg3); + Static98.method1966(anInt5393, (long) arg2, JagString.concatenate(new JagString[] { Static78.aClass100_466, Static201.aClass100_407, local35 }), arg1, (short) 45, Static102.aClass100_545, arg3); } } else { @Pc(129) JagString[] local129 = arg0.ops; @@ -67,7 +67,7 @@ public final class Static246 { @Pc(140) int local140; if (local129 != null) { for (local140 = 4; local140 >= 0; local140--) { - if (local129[local140] != null && (Static266.game != 0 || !local129[local140].equalsIgnoreCase(LocalizedText.ATTACK))) { + if (local129[local140] != null && (client.game != 0 || !local129[local140].equalsIgnoreCase(LocalizedText.ATTACK))) { @Pc(161) byte local161 = 0; if (local140 == 0) { local161 = 17; @@ -91,15 +91,15 @@ public final class Static246 { if (local140 == 4) { local161 = 2; } - Static98.method1966(local176, (long) arg2, Static34.concatenate(new JagString[] { Static226.aClass100_965, local35 }), arg1, local161, local129[local140], arg3); + Static98.method1966(local176, (long) arg2, JagString.concatenate(new JagString[] { Static226.aClass100_965, local35 }), arg1, local161, local129[local140], arg3); } } } - if (Static266.game == 0 && local129 != null) { + if (client.game == 0 && local129 != null) { for (local140 = 4; local140 >= 0; local140--) { if (local129[local140] != null && local129[local140].equalsIgnoreCase(LocalizedText.ATTACK)) { @Pc(271) short local271 = 0; - if (arg0.combatLevel > Static173.self.anInt1652) { + if (arg0.combatLevel > PlayerList.self.anInt1652) { local271 = 2000; } @Pc(281) short local281 = 0; @@ -121,11 +121,11 @@ public final class Static246 { if (local281 != 0) { local281 += local271; } - Static98.method1966(arg0.anInt3752, (long) arg2, Static34.concatenate(new JagString[] { Static226.aClass100_965, local35 }), arg1, local281, local129[local140], arg3); + Static98.method1966(arg0.anInt3752, (long) arg2, JagString.concatenate(new JagString[] { Static226.aClass100_965, local35 }), arg1, local281, local129[local140], arg3); } } } - Static98.method1966(Static225.anInt5073, (long) arg2, Static34.concatenate(new JagString[] { Static226.aClass100_965, local35 }), arg1, (short) 1007, LocalizedText.EXAMINE, arg3); + Static98.method1966(Static225.anInt5073, (long) arg2, JagString.concatenate(new JagString[] { Static226.aClass100_965, local35 }), arg1, (short) 1007, LocalizedText.EXAMINE, arg3); } } diff --git a/client/src/main/java/Static247.java b/client/src/main/java/Static247.java index ebf382f..38fe9c3 100644 --- a/client/src/main/java/Static247.java +++ b/client/src/main/java/Static247.java @@ -27,7 +27,7 @@ public final class Static247 { @OriginalMember(owner = "client!ub", name = "a", descriptor = "(Lclient!bj;Z)V") public static void method4245(@OriginalArg(0) Tile arg0, @OriginalArg(1) boolean arg1) { - Static7.aClass69_32.method2282(arg0); + Static7.aClass69_32.addTail(arg0); while (true) { @Pc(8) Tile local8; @Pc(18) int local18; @@ -77,7 +77,7 @@ public final class Static247 { if (var10 != Static152.anInt3604) { Static152.anInt3604 = var10; Static21.method619(var10); - Static161.method3066(Static123.method2422()); + Static161.method3066(WaterMaterialRenderer.method2422()); } local65 = var9 >>> 24 << 3; if (local65 != Static22.anInt730) { @@ -153,20 +153,20 @@ public final class Static247 { if (var22 != null) { if (GlRenderer.enabled) { if ((var22.anInt3049 & local8.anInt670) == 0) { - Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); + Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } else { - Static120.method2388(var22.anInt3049, Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local27, local18, local21); + Static120.method2388(var22.anInt3049, Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local27, local18, local21); } } - var22.aClass8_5.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.anInt3048 - Static149.anInt3555, var22.anInt3051 - Static162.anInt3947, var22.anInt3044 - Static217.anInt4903, var22.key, local24, null); + var22.aClass8_5.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.anInt3048 - Static149.anInt3555, var22.anInt3051 - Static123.anInt3947, var22.anInt3044 - Static217.anInt4903, var22.key, local24, null); } for (local65 = 0; local65 < local153.anInt662; local65++) { var25 = local153.aClass31Array1[local65]; if (var25 != null) { if (GlRenderer.enabled) { - Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); + Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } - var25.aClass8_4.method4546(var25.anInt1714, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var25.anInt1699 - Static149.anInt3555, var25.anInt1706 - Static162.anInt3947, var25.anInt1703 - Static217.anInt4903, var25.aLong56, local24, null); + var25.aClass8_4.method4546(var25.anInt1714, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var25.anInt1699 - Static149.anInt3555, var25.anInt1706 - Static123.anInt3947, var25.anInt1703 - Static217.anInt4903, var25.aLong56, local24, null); } } if (GlRenderer.enabled) { @@ -198,9 +198,9 @@ public final class Static247 { GlRenderer.method4159(local33 + 50.0F - 1.5F); } if (GlRenderer.enabled) { - Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); + Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } - local549.aClass8_1.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local549.anInt732 - Static149.anInt3555, local549.anInt733 - Static162.anInt3947, local549.anInt736 - Static217.anInt4903, local549.aLong26, local24, null); + local549.aClass8_1.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local549.anInt732 - Static149.anInt3555, local549.anInt733 - Static123.anInt3947, local549.anInt736 - Static217.anInt4903, local549.aLong26, local24, null); if (GlRenderer.enabled && local549.aBoolean49) { GlRenderer.method4159(local33); } @@ -246,15 +246,15 @@ public final class Static247 { } if ((local616.anInt3049 & local65) != 0 && !Static260.method3850(local27, local18, local21, local616.anInt3049)) { if (GlRenderer.enabled) { - Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); + Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } - local616.aClass8_5.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static162.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.key, local24, null); + local616.aClass8_5.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.key, local24, null); } if ((local616.anInt3052 & local65) != 0 && !Static260.method3850(local27, local18, local21, local616.anInt3052)) { if (GlRenderer.enabled) { - Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); + Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } - local616.aClass8_6.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static162.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.key, local24, null); + local616.aClass8_6.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.key, local24, null); } } if (local619 != null && !Static276.method4611(local27, local18, local21, local619.aClass8_3.method4549())) { @@ -263,12 +263,12 @@ public final class Static247 { } if ((local619.anInt1395 & local65) != 0) { if (GlRenderer.enabled) { - Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); + Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } - local619.aClass8_3.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local619.anInt1390 + local619.anInt1394 - Static149.anInt3555, local619.anInt1391 - Static162.anInt3947, local619.anInt1393 + local619.anInt1392 - Static217.anInt4903, local619.key, local24, null); + local619.aClass8_3.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local619.anInt1390 + local619.anInt1394 - Static149.anInt3555, local619.anInt1391 - Static123.anInt3947, local619.anInt1393 + local619.anInt1392 - Static217.anInt4903, local619.key, local24, null); } else if (local619.anInt1395 == 256) { local894 = local619.anInt1390 - Static149.anInt3555; - local899 = local619.anInt1391 - Static162.anInt3947; + local899 = local619.anInt1391 - Static123.anInt3947; local904 = local619.anInt1393 - Static217.anInt4903; var17 = local619.anInt1388; if (var17 == 1 || var17 == 2) { @@ -284,12 +284,12 @@ public final class Static247 { } if (local928 < var18) { if (GlRenderer.enabled) { - Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); + Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } local619.aClass8_3.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local894 + local619.anInt1394, local899, local904 + local619.anInt1392, local619.key, local24, null); } else if (local619.aClass8_2 != null) { if (GlRenderer.enabled) { - Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); + Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } local619.aClass8_2.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local894, local899, local904, local619.key, local24, null); } @@ -305,9 +305,9 @@ public final class Static247 { GlRenderer.method4159(local33 + 50.0F - 1.5F); } if (GlRenderer.enabled) { - Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); + Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } - local1001.aClass8_1.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1001.anInt732 - Static149.anInt3555, local1001.anInt733 - Static162.anInt3947, local1001.anInt736 - Static217.anInt4903, local1001.aLong26, local24, null); + local1001.aClass8_1.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1001.anInt732 - Static149.anInt3555, local1001.anInt733 - Static123.anInt3947, local1001.anInt736 - Static217.anInt4903, local1001.aLong26, local24, null); if (GlRenderer.enabled && local1001.aBoolean49) { GlRenderer.method4159(local33); } @@ -315,16 +315,16 @@ public final class Static247 { @Pc(1064) ObjStackEntity local1064 = local8.aClass79_1; if (local1064 != null && local1064.anInt3063 == 0) { if (GlRenderer.enabled) { - Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); + Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } if (local1064.aClass8_7 != null) { - local1064.aClass8_7.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1064.anInt3064 - Static149.anInt3555, local1064.anInt3057 - Static162.anInt3947, local1064.anInt3061 - Static217.anInt4903, local1064.aLong108, local24, null); + local1064.aClass8_7.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1064.anInt3064 - Static149.anInt3555, local1064.anInt3057 - Static123.anInt3947, local1064.anInt3061 - Static217.anInt4903, local1064.aLong108, local24, null); } if (local1064.aClass8_8 != null) { - local1064.aClass8_8.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1064.anInt3064 - Static149.anInt3555, local1064.anInt3057 - Static162.anInt3947, local1064.anInt3061 - Static217.anInt4903, local1064.aLong108, local24, null); + local1064.aClass8_8.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1064.anInt3064 - Static149.anInt3555, local1064.anInt3057 - Static123.anInt3947, local1064.anInt3061 - Static217.anInt4903, local1064.aLong108, local24, null); } if (local1064.aClass8_9 != null) { - local1064.aClass8_9.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1064.anInt3064 - Static149.anInt3555, local1064.anInt3057 - Static162.anInt3947, local1064.anInt3061 - Static217.anInt4903, local1064.aLong108, local24, null); + local1064.aClass8_9.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1064.anInt3064 - Static149.anInt3555, local1064.anInt3057 - Static123.anInt3947, local1064.anInt3061 - Static217.anInt4903, local1064.aLong108, local24, null); } } } @@ -333,25 +333,25 @@ public final class Static247 { if (local18 < Static167.anInt4069 && (local894 & 0x4) != 0) { var32 = local31[local18 + 1][local21]; if (var32 != null && var32.aBoolean46) { - Static7.aClass69_32.method2282(var32); + Static7.aClass69_32.addTail(var32); } } if (local21 < Static193.anInt4539 && (local894 & 0x2) != 0) { var32 = local31[local18][local21 + 1]; if (var32 != null && var32.aBoolean46) { - Static7.aClass69_32.method2282(var32); + Static7.aClass69_32.addTail(var32); } } if (local18 > Static167.anInt4069 && (local894 & 0x1) != 0) { var32 = local31[local18 - 1][local21]; if (var32 != null && var32.aBoolean46) { - Static7.aClass69_32.method2282(var32); + Static7.aClass69_32.addTail(var32); } } if (local21 > Static193.anInt4539 && (local894 & 0x8) != 0) { var32 = local31[local18][local21 - 1]; if (var32 != null && var32.aBoolean46) { - Static7.aClass69_32.method2282(var32); + Static7.aClass69_32.addTail(var32); } } } @@ -378,36 +378,36 @@ public final class Static247 { local65 -= 64; local115 += 64; if (local115 < local65 && local18 > 0 && local21 < Static99.mapSizeZ - 1) { - Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18 - 1, local21 + 1); + Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18 - 1, local21 + 1); break label882; } } else if (local1332 == 1) { local65 += 64; local115 += 64; if (local115 < -local65 && local18 < Static152.mapSizeX - 1 && local21 < Static99.mapSizeZ - 1) { - Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18 + 1, local21 + 1); + Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18 + 1, local21 + 1); break label882; } } else if (local1332 == 2) { local65 += 64; local115 -= 64; if (local115 > local65 && local18 < Static152.mapSizeX - 1 && local21 > 0) { - Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18 + 1, local21 - 1); + Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18 + 1, local21 - 1); break label882; } } else if (local1332 == 3) { local65 -= 64; local115 -= 64; if (local115 > -local65 && local18 > 0 && local21 > 0) { - Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18 - 1, local21 - 1); + Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18 - 1, local21 - 1); break label882; } } } - Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); + Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } } - var22.aClass8_5.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.anInt3048 - Static149.anInt3555, var22.anInt3051 - Static162.anInt3947, var22.anInt3044 - Static217.anInt4903, var22.key, local24, null); + var22.aClass8_5.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.anInt3048 - Static149.anInt3555, var22.anInt3051 - Static123.anInt3947, var22.anInt3044 - Static217.anInt4903, var22.key, local24, null); } local8.anInt663 = 0; } @@ -493,7 +493,7 @@ public final class Static247 { if (!Static73.method1599(local27, local1697.anInt1701, local1697.anInt1713, local1697.anInt1696, local1697.anInt1698, local1697.aClass8_4.method4549())) { if (GlRenderer.enabled) { if ((local1697.aLong56 & 0xFC000L) == 147456L) { - Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); + Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); local894 = local1697.anInt1699 - Static149.anInt3555; local899 = local1697.anInt1703 - Static217.anInt4903; local904 = (int) (local1697.aLong56 >> 20 & 0x3L); @@ -509,18 +509,18 @@ public final class Static247 { Static120.method2397(local24, local18, local21 + 1, local18 - 1, local21); } } else { - Static120.method2391(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local1697.anInt1701, local1697.anInt1696, local1697.anInt1713, local1697.anInt1698); + Static120.method2391(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local1697.anInt1701, local1697.anInt1696, local1697.anInt1713, local1697.anInt1698); } } - local1697.aClass8_4.method4546(local1697.anInt1714, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1697.anInt1699 - Static149.anInt3555, local1697.anInt1706 - Static162.anInt3947, local1697.anInt1703 - Static217.anInt4903, local1697.aLong56, local24, null); + local1697.aClass8_4.method4546(local1697.anInt1714, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1697.anInt1699 - Static149.anInt3555, local1697.anInt1706 - Static123.anInt3947, local1697.anInt1703 - Static217.anInt4903, local1697.aLong56, local24, null); } for (local894 = local1697.anInt1701; local894 <= local1697.anInt1713; local894++) { for (local899 = local1697.anInt1696; local899 <= local1697.anInt1698; local899++) { @Pc(1863) Tile local1863 = local31[local894][local899]; if (local1863.anInt663 != 0) { - Static7.aClass69_32.method2282(local1863); + Static7.aClass69_32.addTail(local1863); } else if ((local894 != local18 || local899 != local21) && local1863.aBoolean46) { - Static7.aClass69_32.method2282(local1863); + Static7.aClass69_32.addTail(local1863); } } } @@ -560,16 +560,16 @@ public final class Static247 { @Pc(1999) ObjStackEntity local1999 = local8.aClass79_1; if (local1999 != null && local1999.anInt3063 != 0) { if (GlRenderer.enabled) { - Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); + Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } if (local1999.aClass8_7 != null) { - local1999.aClass8_7.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1999.anInt3064 - Static149.anInt3555, local1999.anInt3057 - Static162.anInt3947 - local1999.anInt3063, local1999.anInt3061 - Static217.anInt4903, local1999.aLong108, local24, null); + local1999.aClass8_7.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1999.anInt3064 - Static149.anInt3555, local1999.anInt3057 - Static123.anInt3947 - local1999.anInt3063, local1999.anInt3061 - Static217.anInt4903, local1999.aLong108, local24, null); } if (local1999.aClass8_8 != null) { - local1999.aClass8_8.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1999.anInt3064 - Static149.anInt3555, local1999.anInt3057 - Static162.anInt3947 - local1999.anInt3063, local1999.anInt3061 - Static217.anInt4903, local1999.aLong108, local24, null); + local1999.aClass8_8.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1999.anInt3064 - Static149.anInt3555, local1999.anInt3057 - Static123.anInt3947 - local1999.anInt3063, local1999.anInt3061 - Static217.anInt4903, local1999.aLong108, local24, null); } if (local1999.aClass8_9 != null) { - local1999.aClass8_9.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1999.anInt3064 - Static149.anInt3555, local1999.anInt3057 - Static162.anInt3947 - local1999.anInt3063, local1999.anInt3061 - Static217.anInt4903, local1999.aLong108, local24, null); + local1999.aClass8_9.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1999.anInt3064 - Static149.anInt3555, local1999.anInt3057 - Static123.anInt3947 - local1999.anInt3063, local1999.anInt3061 - Static217.anInt4903, local1999.aLong108, local24, null); } } if (local8.anInt670 != 0) { @@ -577,12 +577,12 @@ public final class Static247 { if (local2109 != null && !Static276.method4611(local27, local18, local21, local2109.aClass8_3.method4549())) { if ((local2109.anInt1395 & local8.anInt670) != 0) { if (GlRenderer.enabled) { - Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); + Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } - local2109.aClass8_3.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2109.anInt1390 + local2109.anInt1394 - Static149.anInt3555, local2109.anInt1391 - Static162.anInt3947, local2109.anInt1393 + local2109.anInt1392 - Static217.anInt4903, local2109.key, local24, null); + local2109.aClass8_3.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2109.anInt1390 + local2109.anInt1394 - Static149.anInt3555, local2109.anInt1391 - Static123.anInt3947, local2109.anInt1393 + local2109.anInt1392 - Static217.anInt4903, local2109.key, local24, null); } else if (local2109.anInt1395 == 256) { local65 = local2109.anInt1390 - Static149.anInt3555; - local115 = local2109.anInt1391 - Static162.anInt3947; + local115 = local2109.anInt1391 - Static123.anInt3947; local1332 = local2109.anInt1393 - Static217.anInt4903; local894 = local2109.anInt1388; if (local894 == 1 || local894 == 2) { @@ -597,12 +597,12 @@ public final class Static247 { } if (local904 >= local899) { if (GlRenderer.enabled) { - Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); + Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } local2109.aClass8_3.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local65 + local2109.anInt1394, local115, local1332 + local2109.anInt1392, local2109.key, local24, null); } else if (local2109.aClass8_2 != null) { if (GlRenderer.enabled) { - Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); + Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } local2109.aClass8_2.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local65, local115, local1332, local2109.key, local24, null); } @@ -612,15 +612,15 @@ public final class Static247 { if (local2275 != null) { if ((local2275.anInt3052 & local8.anInt670) != 0 && !Static260.method3850(local27, local18, local21, local2275.anInt3052)) { if (GlRenderer.enabled) { - Static120.method2388(local2275.anInt3052, Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local27, local18, local21); + Static120.method2388(local2275.anInt3052, Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local27, local18, local21); } - local2275.aClass8_6.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.anInt3048 - Static149.anInt3555, local2275.anInt3051 - Static162.anInt3947, local2275.anInt3044 - Static217.anInt4903, local2275.key, local24, null); + local2275.aClass8_6.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.anInt3048 - Static149.anInt3555, local2275.anInt3051 - Static123.anInt3947, local2275.anInt3044 - Static217.anInt4903, local2275.key, local24, null); } if ((local2275.anInt3049 & local8.anInt670) != 0 && !Static260.method3850(local27, local18, local21, local2275.anInt3049)) { if (GlRenderer.enabled) { - Static120.method2388(local2275.anInt3049, Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local27, local18, local21); + Static120.method2388(local2275.anInt3049, Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local27, local18, local21); } - local2275.aClass8_5.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.anInt3048 - Static149.anInt3555, local2275.anInt3051 - Static162.anInt3947, local2275.anInt3044 - Static217.anInt4903, local2275.key, local24, null); + local2275.aClass8_5.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.anInt3048 - Static149.anInt3555, local2275.anInt3051 - Static123.anInt3947, local2275.anInt3044 - Static217.anInt4903, local2275.key, local24, null); } } } @@ -628,31 +628,31 @@ public final class Static247 { if (local24 < Static126.anInt3114 - 1) { local2388 = Static130.aClass3_Sub5ArrayArrayArray1[local24 + 1][local18][local21]; if (local2388 != null && local2388.aBoolean46) { - Static7.aClass69_32.method2282(local2388); + Static7.aClass69_32.addTail(local2388); } } if (local18 < Static167.anInt4069) { local2388 = local31[local18 + 1][local21]; if (local2388 != null && local2388.aBoolean46) { - Static7.aClass69_32.method2282(local2388); + Static7.aClass69_32.addTail(local2388); } } if (local21 < Static193.anInt4539) { local2388 = local31[local18][local21 + 1]; if (local2388 != null && local2388.aBoolean46) { - Static7.aClass69_32.method2282(local2388); + Static7.aClass69_32.addTail(local2388); } } if (local18 > Static167.anInt4069) { local2388 = local31[local18 - 1][local21]; if (local2388 != null && local2388.aBoolean46) { - Static7.aClass69_32.method2282(local2388); + Static7.aClass69_32.addTail(local2388); } } if (local21 > Static193.anInt4539) { local2388 = local31[local18][local21 - 1]; if (local2388 != null && local2388.aBoolean46) { - Static7.aClass69_32.method2282(local2388); + Static7.aClass69_32.addTail(local2388); } } } diff --git a/client/src/main/java/Static248.java b/client/src/main/java/Static248.java index ed0d19e..2434406 100644 --- a/client/src/main/java/Static248.java +++ b/client/src/main/java/Static248.java @@ -8,10 +8,7 @@ public final class Static248 { @OriginalMember(owner = "client!uc", name = "c", descriptor = "Lclient!ve;") public static Js5 js5Archive4; - @OriginalMember(owner = "client!uc", name = "d", descriptor = "[[[I") - public static int[][][] anIntArrayArrayArray17; - - @OriginalMember(owner = "client!uc", name = "f", descriptor = "I") + @OriginalMember(owner = "client!uc", name = "f", descriptor = "I") public static int anInt4232; @OriginalMember(owner = "client!uc", name = "a", descriptor = "I") @@ -113,7 +110,7 @@ public final class Static248 { if (local285.anInt2486 != Static152.anInt3604) { Static152.anInt3604 = local285.anInt2486; Static21.method619(local285.anInt2486); - Static161.method3066(Static123.method2422()); + Static161.method3066(WaterMaterialRenderer.method2422()); } local285.method1944(Static130.aClass3_Sub5ArrayArrayArray1, local294, false); } @@ -128,12 +125,12 @@ public final class Static248 { for (local37 = 0; local37 < Static182.aClass3_Sub14ArrayArray2[local32].length; local37++) { @Pc(336) GlTile local336 = Static182.aClass3_Sub14ArrayArray2[local32][local37]; @Pc(350) float local350 = 201.5F - (float) local32 * 50.0F - (local336.aBoolean140 ? 1.0F : 0.5F); - if (local336.anInt2485 != -1 && Rasteriser.textureProvider.method3237(local336.anInt2485) == 4 && Static220.highWaterDetail) { + if (local336.anInt2485 != -1 && Rasteriser.textureProvider.method3237(local336.anInt2485) == 4 && Preferences.highWaterDetail) { Static21.method619(local336.anInt2486); } local336.method1944(Static130.aClass3_Sub5ArrayArrayArray1, local350, false); } - if (local32 == 0 && Static139.sceneryShadowsType > 0) { + if (local32 == 0 && Preferences.sceneryShadowsType > 0) { GlRenderer.method4159(101.5F); Static242.method4198(Static167.anInt4069, Static193.anInt4539, Static277.tileVisibilityDistance, arg1, Static48.aBooleanArrayArray1, Static83.activeTileHeightMap[0]); } diff --git a/client/src/main/java/Static249.java b/client/src/main/java/Static249.java index fe3f711..029f83b 100644 --- a/client/src/main/java/Static249.java +++ b/client/src/main/java/Static249.java @@ -18,10 +18,7 @@ public final class Static249 { @OriginalMember(owner = "client!ud", name = "Q", descriptor = "Lclient!na;") public static final JagString aClass100_1039 = Static28.parse(" x "); - @OriginalMember(owner = "client!ud", name = "S", descriptor = "Z") - public static boolean advertSuppressed = false; - - @OriginalMember(owner = "client!ud", name = "T", descriptor = "[I") + @OriginalMember(owner = "client!ud", name = "T", descriptor = "[I") public static final int[] anIntArray478 = new int[32]; @OriginalMember(owner = "client!ud", name = "a", descriptor = "(ILclient!be;)Z") diff --git a/client/src/main/java/Static25.java b/client/src/main/java/Static25.java index 106c3ec..b3273ee 100644 --- a/client/src/main/java/Static25.java +++ b/client/src/main/java/Static25.java @@ -1,7 +1,4 @@ -import java.awt.Frame; -import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; public final class Static25 { @@ -17,23 +14,7 @@ public final class Static25 { @OriginalMember(owner = "client!c", name = "hb", descriptor = "Z") public static boolean aBoolean57 = false; - @OriginalMember(owner = "client!c", name = "a", descriptor = "(Ljava/awt/Frame;ZLsignlink!ll;)V") - public static void exitFullScreen(@OriginalArg(0) Frame arg0, @OriginalArg(2) SignLink arg1) { - while (true) { - @Pc(16) PrivilegedRequest local16 = arg1.exitFullScreen(arg0); - while (local16.status == 0) { - Static231.sleep(10L); - } - if (local16.status == 1) { - arg0.setVisible(false); - arg0.dispose(); - return; - } - Static231.sleep(100L); - } - } - - @OriginalMember(owner = "client!c", name = "c", descriptor = "(II)V") + @OriginalMember(owner = "client!c", name = "c", descriptor = "(II)V") public static void method715() { Static220.aClass99_28.method3102(5); } diff --git a/client/src/main/java/Static250.java b/client/src/main/java/Static250.java index 664c616..ddd24eb 100644 --- a/client/src/main/java/Static250.java +++ b/client/src/main/java/Static250.java @@ -12,19 +12,13 @@ public final class Static250 { @OriginalMember(owner = "client!uf", name = "r", descriptor = "Lclient!ve;") public static Js5 spritesArchive; - @OriginalMember(owner = "client!uf", name = "b", descriptor = "Z") - public static boolean showGroundDecorations = true; - - @OriginalMember(owner = "client!uf", name = "e", descriptor = "I") + @OriginalMember(owner = "client!uf", name = "e", descriptor = "I") public static int anInt5434 = 0; @OriginalMember(owner = "client!uf", name = "j", descriptor = "Lclient!n;") public static final SoftLruHashTable aClass99_33 = new SoftLruHashTable(260); - @OriginalMember(owner = "client!uf", name = "o", descriptor = "Lclient!na;") - public static final JagString aClass100_1041 = Static28.parse("scrollbar"); - - @OriginalMember(owner = "client!uf", name = "q", descriptor = "Lclient!na;") + @OriginalMember(owner = "client!uf", name = "q", descriptor = "Lclient!na;") public static final JagString aClass100_1042 = Static28.parse("Null"); @OriginalMember(owner = "client!uf", name = "s", descriptor = "Lclient!na;") @@ -35,8 +29,8 @@ public final class Static250 { @OriginalMember(owner = "client!uf", name = "a", descriptor = "(B)V") public static void method4273() { - @Pc(14) int playerX = Static173.self.xFine + Static132.anInt3291; - @Pc(20) int playerZ = Static173.self.zFine + Static206.anInt4774; + @Pc(14) int playerX = PlayerList.self.xFine + Static132.anInt3291; + @Pc(20) int playerZ = PlayerList.self.zFine + Static206.anInt4774; if (Static81.cameraX - playerX < -500 || Static81.cameraX - playerX > 500 || Static111.cameraZ - playerZ < -500 || Static111.cameraZ - playerZ > 500) { Static81.cameraX = playerX; Static111.cameraZ = playerZ; @@ -47,7 +41,7 @@ public final class Static250 { if (Static81.cameraX != playerX) { Static81.cameraX += (playerX - Static81.cameraX) / 16; } - if (Static33.aBoolean63) { + if (Preferences.aBoolean63) { for (@Pc(93) int local93 = 0; local93 < Static182.keyQueueSize; local93++) { @Pc(104) int code = Static227.keyCodes[local93]; if (code == Keyboard.KEY_UP) { diff --git a/client/src/main/java/Static251.java b/client/src/main/java/Static251.java index 9cbceb5..2fa676a 100644 --- a/client/src/main/java/Static251.java +++ b/client/src/main/java/Static251.java @@ -59,16 +59,6 @@ public final class Static251 { Static45.aClass99_6.method3103(); } - @OriginalMember(owner = "client!ug", name = "a", descriptor = "(I)V") - public static void quit() { - if (Static93.instance != null) { - @Pc(5) Mouse local5 = Static93.instance; - synchronized (Static93.instance) { - Static93.instance = null; - } - } - } - @OriginalMember(owner = "client!ug", name = "a", descriptor = "(II)V") public static void method4278(@OriginalArg(0) int arg0) { if (Static241.anIntArray522 == null || Static241.anIntArray522.length < arg0) { diff --git a/client/src/main/java/Static252.java b/client/src/main/java/Static252.java index 5fe038c..95eb92f 100644 --- a/client/src/main/java/Static252.java +++ b/client/src/main/java/Static252.java @@ -48,13 +48,13 @@ public final class Static252 { } return; } - if ((Static12.tileSettings[Static55.level][Static173.self.xFine >> 7][Static173.self.zFine >> 7] & 0x4) != 0) { - Static254.method4348(false, Static173.self.xFine >> 7, Static173.self.zFine >> 7, Static130.aClass3_Sub5ArrayArrayArray1, 0); + if ((Static12.tileSettings[Static55.level][PlayerList.self.xFine >> 7][PlayerList.self.zFine >> 7] & 0x4) != 0) { + Static254.method4348(false, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7, Static130.aClass3_Sub5ArrayArrayArray1, 0); } if (Static240.cameraPitch >= 310) { return; } - @Pc(135) int local135 = Static173.self.zFine >> 7; + @Pc(135) int local135 = PlayerList.self.zFine >> 7; local40 = Static134.renderZ >> 7; @Pc(146) int local146; if (local40 < local135) { @@ -63,7 +63,7 @@ public final class Static252 { local146 = local40 - local135; } local33 = Static138.renderX >> 7; - @Pc(162) int local162 = Static173.self.xFine >> 7; + @Pc(162) int local162 = PlayerList.self.xFine >> 7; @Pc(174) int local174; if (local162 > local33) { local174 = local162 - local33; diff --git a/client/src/main/java/Static253.java b/client/src/main/java/Static253.java index e99fa2f..063f4ac 100644 --- a/client/src/main/java/Static253.java +++ b/client/src/main/java/Static253.java @@ -54,7 +54,7 @@ public final class Static253 { if (Static176.aBooleanArray95[4] && Static276.anIntArray564[4] + 128 > local59) { local59 = Static276.anIntArray564[4] + 128; } - Static18.method555(Static81.cameraX, arg0, Static207.method3685(Static55.level, Static173.self.xFine, Static173.self.zFine) - 50, 600 - -(local59 * 3), local57, Static111.cameraZ, local59); + Static18.method555(Static81.cameraX, arg0, Static207.method3685(Static55.level, PlayerList.self.xFine, PlayerList.self.zFine) - 50, 600 - -(local59 * 3), local57, Static111.cameraZ, local59); } local57 = Static5.anInt40; local59 = Static138.renderX; @@ -100,7 +100,7 @@ public final class Static253 { } GlRenderer.method4171(arg2, arg4, arg3, arg0, arg3 / 2 + arg2, arg4 - -(arg0 / 2), local248, local253, Static223.anInt5029, Static223.anInt5029); } else { - Static129.method2496(arg2, arg4, arg3 + arg2, arg0 + arg4); + SoftwareRaster.method2496(arg2, arg4, arg3 + arg2, arg0 + arg4); Rasteriser.prepare(); } if (Static60.aBoolean108 || Static155.anInt3751 < arg2 || Static155.anInt3751 >= arg3 + arg2 || arg4 > Static60.anInt1892 || arg0 + arg4 <= Static60.anInt1892) { @@ -122,16 +122,16 @@ public final class Static253 { GlRenderer.method4173(); GlRenderer.setDepthTestEnabled(true); GlRenderer.setFogEnabled(true); - if (Static244.gameState == 10) { - local171 = Static103.method2235(Static178.anInt4247, Static134.renderZ >> 10, Static113.brightness, Static138.renderX >> 10); + if (client.gameState == 10) { + local171 = Static103.method2235(Static178.anInt4247, Static134.renderZ >> 10, Preferences.brightness, Static138.renderX >> 10); } else { - local171 = Static103.method2235(Static178.anInt4247, Static173.self.movementQueueZ[0] >> 3, Static113.brightness, Static173.self.movementQueueX[0] >> 3); + local171 = Static103.method2235(Static178.anInt4247, PlayerList.self.movementQueueZ[0] >> 3, Preferences.brightness, PlayerList.self.movementQueueX[0] >> 3); } - Static120.method2394(Static83.loop, !Static11.flickeringEffectsOn); + Static120.method2394(Static83.loop, !Preferences.flickeringEffectsOn); GlRenderer.clearColorAndDepthBuffers(local171); Static143.method2731(Static240.cameraPitch, Static134.renderZ, Static5.anInt40, Static138.renderX, Static184.cameraYaw); GlRenderer.anInt5323 = Static83.loop; - Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Static55.level + 1, local387, Static173.self.xFine >> 7, Static173.self.zFine >> 7); + Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Static55.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7); Static263.aBoolean299 = true; Static120.method2390(); Static143.method2731(0, 0, 0, 0, 0); @@ -140,8 +140,8 @@ public final class Static253 { Static142.method2726(arg4, arg3, arg2, Static223.anInt5029, arg0, Static223.anInt5029); Static233.method4000(arg3, arg2, arg0, Static223.anInt5029, Static223.anInt5029, arg4); } else { - Static129.method2495(arg2, arg4, arg3, arg0, 0); - Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Static55.level + 1, local387, Static173.self.xFine >> 7, Static173.self.zFine >> 7); + SoftwareRaster.fillRect(arg2, arg4, arg3, arg0, 0); + Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Static55.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7); Static107.loop(); Static223.method3858(); Static142.method2726(arg4, arg3, arg2, 256, arg0, 256); @@ -154,14 +154,14 @@ public final class Static253 { Static5.anInt40 = local57; Static138.renderX = local59; Static184.cameraYaw = local125; - if (Static19.aBoolean43 && Static107.js5NetQueue.method2328() == 0) { + if (Static19.aBoolean43 && client.js5NetQueue.method2328() == 0) { Static19.aBoolean43 = false; } if (Static19.aBoolean43) { if (GlRenderer.enabled) { Static46.method1186(arg2, arg4, arg3, arg0, 0); } else { - Static129.method2495(arg2, arg4, arg3, arg0, 0); + SoftwareRaster.fillRect(arg2, arg4, arg3, arg0, 0); } Static114.drawTextOnScreen(false, LocalizedText.LOADING); } @@ -190,21 +190,7 @@ public final class Static253 { return local10; } - @OriginalMember(owner = "client!ui", name = "h", descriptor = "(I)[Lclient!ok;") - public static IndexedSprite[] method4331() { - @Pc(8) IndexedSprite[] local8 = new IndexedSprite[Static165.anInt4038]; - for (@Pc(10) int local10 = 0; local10 < Static165.anInt4038; local10++) { - if (GlRenderer.enabled) { - local8[local10] = new GlIndexedSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local10], Static269.anIntArray252[local10], Static254.anIntArray488[local10], Static26.anIntArray66[local10], Static7.aByteArrayArray5[local10], Static259.anIntArray513); - } else { - local8[local10] = new SoftwareIndexedSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local10], Static269.anIntArray252[local10], Static254.anIntArray488[local10], Static26.anIntArray66[local10], Static7.aByteArrayArray5[local10], Static259.anIntArray513); - } - } - Static75.method1631(); - return local8; - } - - @OriginalMember(owner = "client!ui", name = "d", descriptor = "(II)V") + @OriginalMember(owner = "client!ui", name = "d", descriptor = "(II)V") public static void method4332(@OriginalArg(0) int arg0) { if (arg0 >= 0 && Static258.aBooleanArray130.length > arg0) { Static258.aBooleanArray130[arg0] = !Static258.aBooleanArray130[arg0]; diff --git a/client/src/main/java/Static254.java b/client/src/main/java/Static254.java index 991df06..217f03d 100644 --- a/client/src/main/java/Static254.java +++ b/client/src/main/java/Static254.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static254 { - @OriginalMember(owner = "client!uj", name = "x", descriptor = "[I") - public static int[] anIntArray488; - - @OriginalMember(owner = "client!uj", name = "E", descriptor = "I") + @OriginalMember(owner = "client!uj", name = "E", descriptor = "I") public static int anInt5556; @OriginalMember(owner = "client!uj", name = "H", descriptor = "I") @@ -28,17 +25,6 @@ public final class Static254 { @OriginalMember(owner = "client!uj", name = "C", descriptor = "[Lclient!na;") public static final JagString[] aClass100Array168 = new JagString[500]; - @OriginalMember(owner = "client!uj", name = "a", descriptor = "(BLclient!ve;I)Z") - public static boolean method4346(@OriginalArg(1) Js5 arg0, @OriginalArg(2) int arg1) { - @Pc(13) byte[] local13 = arg0.method4500(arg1); - if (local13 == null) { - return false; - } else { - Static84.method1770(local13); - return true; - } - } - @OriginalMember(owner = "client!uj", name = "a", descriptor = "(BZII[[[Lclient!bj;I)Z") public static boolean method4348(@OriginalArg(1) boolean arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Tile[][][] arg3, @OriginalArg(5) int arg4) { @Pc(14) byte local14 = arg0 ? 1 : (byte) (Static136.anInt3325 & 0xFF); diff --git a/client/src/main/java/Static256.java b/client/src/main/java/Static256.java index 73de23b..7b72800 100644 --- a/client/src/main/java/Static256.java +++ b/client/src/main/java/Static256.java @@ -10,8 +10,8 @@ public final class Static256 { @OriginalMember(owner = "client!um", name = "a", descriptor = "(Z)V") public static void method4392() { Static11.anInt384 = 0; - @Pc(17) int local17 = Static225.originX + (Static173.self.xFine >> 7); - @Pc(25) int local25 = (Static173.self.zFine >> 7) + Static142.originZ; + @Pc(17) int local17 = Static225.originX + (PlayerList.self.xFine >> 7); + @Pc(25) int local25 = (PlayerList.self.zFine >> 7) + Static142.originZ; if (local17 >= 3053 && local17 <= 3156 && local25 >= 3056 && local25 <= 3136) { Static11.anInt384 = 1; } diff --git a/client/src/main/java/Static257.java b/client/src/main/java/Static257.java index da47b6e..f5b4715 100644 --- a/client/src/main/java/Static257.java +++ b/client/src/main/java/Static257.java @@ -13,12 +13,6 @@ public final class Static257 { @OriginalMember(owner = "client!v", name = "a", descriptor = "Lclient!na;") public static final JagString aClass100_98 = Static28.parse(")4a="); - @OriginalMember(owner = "client!v", name = "c", descriptor = "[F") - public static final float[] aFloatArray2 = new float[] { 0.073F, 0.169F, 0.24F, 1.0F }; - - @OriginalMember(owner = "client!v", name = "d", descriptor = "Lclient!na;") - public static final JagString aClass100_99 = Static28.parse("::clientdrop"); - @OriginalMember(owner = "client!v", name = "a", descriptor = "(IIIJ)Z") public static boolean method523(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) long arg3) { @Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2]; diff --git a/client/src/main/java/Static258.java b/client/src/main/java/Static258.java index e84bd42..391c20c 100644 --- a/client/src/main/java/Static258.java +++ b/client/src/main/java/Static258.java @@ -21,26 +21,26 @@ public final class Static258 { @OriginalMember(owner = "client!va", name = "a", descriptor = "(IZILclient!be;)V") public static void method4418(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component arg2) { if (arg2.anInt530 == 1) { - Static98.method1966(-1, 0L, Static186.EMPTY, 0, (short) 8, arg2.aClass100_89, arg2.id); + Static98.method1966(-1, 0L, JagString.EMPTY, 0, (short) 8, arg2.aClass100_89, arg2.id); } @Pc(47) JagString local47; if (arg2.anInt530 == 2 && !Static241.aBoolean302) { local47 = Static97.method1963(arg2); if (local47 != null) { - Static98.method1966(-1, 0L, Static34.concatenate(new JagString[] { Static42.aClass100_332, arg2.aClass100_85 }), -1, (short) 32, local47, arg2.id); + Static98.method1966(-1, 0L, JagString.concatenate(new JagString[] { MiniMenu.COLOR_GREEN, arg2.aClass100_85 }), -1, (short) 32, local47, arg2.id); } } if (arg2.anInt530 == 3) { - Static98.method1966(-1, 0L, Static186.EMPTY, 0, (short) 28, LocalizedText.CLOSE, arg2.id); + Static98.method1966(-1, 0L, JagString.EMPTY, 0, (short) 28, LocalizedText.CLOSE, arg2.id); } if (arg2.anInt530 == 4) { - Static98.method1966(-1, 0L, Static186.EMPTY, 0, (short) 59, arg2.aClass100_89, arg2.id); + Static98.method1966(-1, 0L, JagString.EMPTY, 0, (short) 59, arg2.aClass100_89, arg2.id); } if (arg2.anInt530 == 5) { - Static98.method1966(-1, 0L, Static186.EMPTY, 0, (short) 51, arg2.aClass100_89, arg2.id); + Static98.method1966(-1, 0L, JagString.EMPTY, 0, (short) 51, arg2.aClass100_89, arg2.id); } if (arg2.anInt530 == 6 && Static39.aClass13_10 == null) { - Static98.method1966(-1, 0L, Static186.EMPTY, -1, (short) 41, arg2.aClass100_89, arg2.id); + Static98.method1966(-1, 0L, JagString.EMPTY, -1, (short) 41, arg2.aClass100_89, arg2.id); } @Pc(173) int local173; @Pc(171) int local171; @@ -62,12 +62,12 @@ public final class Static258 { @Pc(276) ObjType local276 = Static71.get(arg2.objTypes[local171] - 1); if (Static260.anInt5014 == 1 && local267.method510()) { if (Static224.anInt5062 != arg2.id || Static185.anInt4370 != local171) { - Static98.method1966(-1, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static34.aClass100_203, Static223.aClass100_947, local276.name}), local171, (short) 40, LocalizedText.USE, arg2.id); + Static98.method1966(-1, (long) local276.anInt2354, JagString.concatenate(new JagString[] { Static34.aClass100_203, Static223.aClass100_947, local276.name}), local171, (short) 40, LocalizedText.USE, arg2.id); } } else if (Static241.aBoolean302 && local267.method510()) { @Pc(596) ParamType local596 = Static121.anInt3039 == -1 ? null : Static110.method2277(Static121.anInt3039); if ((Static274.anInt4999 & 0x10) != 0 && (local596 == null || local276.getParam(local596.defaultInt, Static121.anInt3039) != local596.defaultInt)) { - Static98.method1966(Static246.anInt5393, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static78.aClass100_466, Static223.aClass100_947, local276.name}), local171, (short) 3, Static102.aClass100_545, arg2.id); + Static98.method1966(Static246.anInt5393, (long) local276.anInt2354, JagString.concatenate(new JagString[] { Static78.aClass100_466, Static223.aClass100_947, local276.name}), local171, (short) 3, Static102.aClass100_545, arg2.id); } } else { @Pc(296) JagString[] local296 = local276.inventoryOps; @@ -84,12 +84,12 @@ public final class Static258 { } else { local334 = 58; } - Static98.method1966(-1, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, local334, local296[local309], arg2.id); + Static98.method1966(-1, (long) local276.anInt2354, JagString.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, local334, local296[local309], arg2.id); } } } if (local267.method507()) { - Static98.method1966(Static169.anInt4075, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, (short) 22, LocalizedText.USE, arg2.id); + Static98.method1966(Static169.anInt4075, (long) local276.anInt2354, JagString.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, (short) 22, LocalizedText.USE, arg2.id); } if (local267.method510() && local296 != null) { for (local309 = 2; local309 >= 0; local309--) { @@ -104,7 +104,7 @@ public final class Static258 { if (local309 == 2) { local334 = 43; } - Static98.method1966(-1, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, local334, local296[local309], arg2.id); + Static98.method1966(-1, (long) local276.anInt2354, JagString.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, local334, local296[local309], arg2.id); } } } @@ -131,11 +131,11 @@ public final class Static258 { if (local309 == 4) { local334 = 13; } - Static98.method1966(-1, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, local334, local296[local309], arg2.id); + Static98.method1966(-1, (long) local276.anInt2354, JagString.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, local334, local296[local309], arg2.id); } } } - Static98.method1966(Static225.anInt5073, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, (short) 1006, LocalizedText.EXAMINE, arg2.id); + Static98.method1966(Static225.anInt5073, (long) local276.anInt2354, JagString.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, (short) 1006, LocalizedText.EXAMINE, arg2.id); } } } @@ -164,10 +164,10 @@ public final class Static258 { } } if (Static36.method940(arg2).method506()) { - Static98.method1966(-1, 0L, Static186.EMPTY, arg2.createdComponentId, (short) 41, LocalizedText.CONTINUE, arg2.id); + Static98.method1966(-1, 0L, JagString.EMPTY, arg2.createdComponentId, (short) 41, LocalizedText.CONTINUE, arg2.id); } } else if (Static36.method940(arg2).method508() && (Static274.anInt4999 & 0x20) != 0) { - Static98.method1966(Static246.anInt5393, 0L, Static34.concatenate(new JagString[] { Static78.aClass100_466, Static201.aClass100_408, arg2.aClass100_88 }), arg2.createdComponentId, (short) 12, Static102.aClass100_545, arg2.id); + Static98.method1966(Static246.anInt5393, 0L, JagString.concatenate(new JagString[] { Static78.aClass100_466, Static201.aClass100_408, arg2.aClass100_88 }), arg2.createdComponentId, (short) 12, Static102.aClass100_545, arg2.id); } } diff --git a/client/src/main/java/Static259.java b/client/src/main/java/Static259.java index 6b8b35c..657d305 100644 --- a/client/src/main/java/Static259.java +++ b/client/src/main/java/Static259.java @@ -2,19 +2,13 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static259 { - @OriginalMember(owner = "client!vc", name = "R", descriptor = "[I") - public static int[] anIntArray513; - @OriginalMember(owner = "client!vc", name = "db", descriptor = "[S") public static short[] aShortArray88; @OriginalMember(owner = "client!vc", name = "V", descriptor = "[J") public static final long[] aLongArray11 = new long[1000]; - @OriginalMember(owner = "client!vc", name = "ab", descriptor = "Lclient!na;") - public static final JagString aClass100_1075 = Static28.parse("mapflag"); - - @OriginalMember(owner = "client!vc", name = "bb", descriptor = "[S") + @OriginalMember(owner = "client!vc", name = "bb", descriptor = "[S") public static short[] aShortArray87 = new short[256]; @OriginalMember(owner = "client!vc", name = "eb", descriptor = "[I") diff --git a/client/src/main/java/Static26.java b/client/src/main/java/Static26.java index 3c4726f..cfffa53 100644 --- a/client/src/main/java/Static26.java +++ b/client/src/main/java/Static26.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static26 { - @OriginalMember(owner = "client!ca", name = "Y", descriptor = "[I") - public static int[] anIntArray66; - - @OriginalMember(owner = "client!ca", name = "Z", descriptor = "Lclient!ve;") + @OriginalMember(owner = "client!ca", name = "Z", descriptor = "Lclient!ve;") public static Js5 js5Archive5; @OriginalMember(owner = "client!ca", name = "X", descriptor = "Lclient!ih;") @@ -16,10 +13,7 @@ public final class Static26 { @OriginalMember(owner = "client!ca", name = "cb", descriptor = "Lclient!na;") public static final JagString aClass100_160 = Static165.method3165(); - @OriginalMember(owner = "client!ca", name = "db", descriptor = "I") - public static int anInt865 = 0; - - @OriginalMember(owner = "client!ca", name = "eb", descriptor = "[I") + @OriginalMember(owner = "client!ca", name = "eb", descriptor = "[I") public static final int[] anIntArray67 = new int[100]; @OriginalMember(owner = "client!ca", name = "fb", descriptor = "[I") @@ -47,11 +41,11 @@ public final class Static26 { for (@Pc(97) int local97 = (local23 - 6) / 8; local97 <= (local23 + 6) / 8; local97++) { @Pc(115) int local115 = (local80 << 8) + local97; Static238.regionBitPacked[local74] = local115; - Static36.mapFileIds[local74] = js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); - Static172.locationsMapFileIds[local74] = js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); - Static175.npcSpawnsFileIds[local74] = js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static179.aClass100_807, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); - Static99.underWaterMapFileIds[local74] = js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static165.aClass100_772, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); - Static35.underWaterLocationsMapFileIds[local74] = js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static278.aClass100_1103, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); + Static36.mapFileIds[local74] = js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); + Static172.locationsMapFileIds[local74] = js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); + Static175.npcSpawnsFileIds[local74] = js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static179.aClass100_807, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); + Static99.underWaterMapFileIds[local74] = js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); + Static35.underWaterLocationsMapFileIds[local74] = js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); if (Static175.npcSpawnsFileIds[local74] == -1) { Static36.mapFileIds[local74] = -1; Static172.locationsMapFileIds[local74] = -1; @@ -99,7 +93,7 @@ public final class Static26 { @OriginalMember(owner = "client!ca", name = "a", descriptor = "(IIII)V") public static void method744(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { - if (Static125.soundEffectVolume == 0 || arg0 == 0 || Static189.anInt4451 >= 50 || arg1 == -1) { + if (Preferences.soundEffectVolume == 0 || arg0 == 0 || Static189.anInt4451 >= 50 || arg1 == -1) { return; } Static200.anIntArray421[Static189.anInt4451] = arg1; diff --git a/client/src/main/java/Static260.java b/client/src/main/java/Static260.java index a185f6c..7956097 100644 --- a/client/src/main/java/Static260.java +++ b/client/src/main/java/Static260.java @@ -4,13 +4,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static260 { - @OriginalMember(owner = "client!vd", name = "w", descriptor = "Lclient!vk;") - public static FrameBuffer frameBuffer; - - @OriginalMember(owner = "client!vd", name = "v", descriptor = "Lclient!na;") - public static final JagString aClass100_944 = Static28.parse("hitbar_default"); - - @OriginalMember(owner = "client!vd", name = "B", descriptor = "[S") + @OriginalMember(owner = "client!vd", name = "B", descriptor = "[S") public static final short[] aShortArray71 = new short[] { 6798, 8741, 25238, 4626, 4550 }; @OriginalMember(owner = "client!vd", name = "C", descriptor = "I") diff --git a/client/src/main/java/Static263.java b/client/src/main/java/Static263.java index 7e13a41..4e41d58 100644 --- a/client/src/main/java/Static263.java +++ b/client/src/main/java/Static263.java @@ -119,7 +119,7 @@ public final class Static263 { Static104.method2247(arg1); } if (arg1.xFine < 128 || arg1.zFine < 128 || arg1.xFine >= 13184 || arg1.zFine >= 13184) { - arg1.anInt3369 = -1; + arg1.seqId = -1; arg1.anInt3432 = -1; arg1.anInt3395 = 0; arg1.anInt3386 = 0; @@ -127,11 +127,11 @@ public final class Static263 { arg1.zFine = arg1.movementQueueZ[0] * 128 + arg1.getSize() * 64; arg1.method2689(); } - if (arg1 == Static173.self && (arg1.xFine < 1536 || arg1.zFine < 1536 || arg1.xFine >= 11776 || arg1.zFine >= 11776)) { + if (arg1 == PlayerList.self && (arg1.xFine < 1536 || arg1.zFine < 1536 || arg1.xFine >= 11776 || arg1.zFine >= 11776)) { arg1.anInt3432 = -1; arg1.anInt3395 = 0; arg1.anInt3386 = 0; - arg1.anInt3369 = -1; + arg1.seqId = -1; arg1.xFine = arg1.movementQueueX[0] * 128 + arg1.getSize() * 64; arg1.zFine = arg1.movementQueueZ[0] * 128 + arg1.getSize() * 64; arg1.method2689(); diff --git a/client/src/main/java/Static265.java b/client/src/main/java/Static265.java index 240f0c3..78aca6b 100644 --- a/client/src/main/java/Static265.java +++ b/client/src/main/java/Static265.java @@ -10,17 +10,10 @@ public final class Static265 { @OriginalMember(owner = "client!vj", name = "j", descriptor = "Lclient!dd;") public static SoftwareFont p11FullSoftware; - @OriginalMember(owner = "client!vj", name = "m", descriptor = "Lclient!na;") - public static final JagString aClass100_1086 = Static28.parse("_labels"); - @OriginalMember(owner = "client!vj", name = "a", descriptor = "(III)J") public static long method4521(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { @Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2]; return local7 == null || local7.aClass77_1 == null ? 0L : local7.aClass77_1.key; } - @OriginalMember(owner = "client!vj", name = "a", descriptor = "(IIILclient!ve;)[Lclient!mm;") - public static SoftwareSprite[] method4523(@OriginalArg(2) int arg0, @OriginalArg(3) Js5 arg1) { - return Static234.method4016(arg1, 0, arg0) ? Static14.method474() : null; - } } diff --git a/client/src/main/java/Static266.java b/client/src/main/java/Static266.java index b193dbc..a5e415e 100644 --- a/client/src/main/java/Static266.java +++ b/client/src/main/java/Static266.java @@ -19,13 +19,7 @@ public final class Static266 { @OriginalMember(owner = "client!vk", name = "d", descriptor = "Lclient!na;") public static final JagString aClass100_1010 = Static28.parse("null"); - @OriginalMember(owner = "client!vk", name = "h", descriptor = "I") - public static final int anInt5338 = (int) (Math.random() * 33.0D) - 16; - - @OriginalMember(owner = "client!vk", name = "n", descriptor = "I") - public static int game = 0; - - @OriginalMember(owner = "client!vk", name = "a", descriptor = "(Lclient!ve;Lclient!ve;I)V") + @OriginalMember(owner = "client!vk", name = "a", descriptor = "(Lclient!ve;Lclient!ve;I)V") public static void init(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1) { Static93.modelsArchive = arg0; Static132.aClass153_48 = arg1; diff --git a/client/src/main/java/Static267.java b/client/src/main/java/Static267.java index b5c4026..bf4ab8f 100644 --- a/client/src/main/java/Static267.java +++ b/client/src/main/java/Static267.java @@ -45,7 +45,7 @@ public final class Static267 { @OriginalMember(owner = "client!vl", name = "a", descriptor = "(I)Z") public static boolean isShowingVideoAd() { - if (Static150.objectTag) { + if (client.objectTag) { try { return !((Boolean) Static119.aClass100_588.method3157(GameShell.signLink.applet)); } catch (@Pc(21) Throwable local21) { diff --git a/client/src/main/java/Static269.java b/client/src/main/java/Static269.java index ba815e9..14b268e 100644 --- a/client/src/main/java/Static269.java +++ b/client/src/main/java/Static269.java @@ -4,12 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static269 { - @OriginalMember(owner = "client!wa", name = "z", descriptor = "[I") - public static int[] anIntArray252; - - @OriginalMember(owner = "client!wa", name = "ub", descriptor = "Lclient!bn;") - public static Map aClass3_Sub2_Sub4_2; - @OriginalMember(owner = "client!wa", name = "X", descriptor = "[Lclient!na;") public static JagString[] aClass100Array87 = null; @@ -246,54 +240,54 @@ public final class Static269 { @OriginalMember(owner = "client!wa", name = "a", descriptor = "(IIIII)V") public static void method2225(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { - if (Static41.anInt1309 < 100) { - Static186.method3413(); + if (WorldMap.loadPercentage < 100) { + WorldMap.method3413(); } if (GlRenderer.enabled) { Static46.method1187(arg0, arg1, arg0 + arg3, arg2 + arg1); } else { - Static129.method2496(arg0, arg1, arg0 + arg3, arg2 + arg1); + SoftwareRaster.method2496(arg0, arg1, arg0 + arg3, arg2 + arg1); } @Pc(50) int local50; @Pc(61) int local61; - if (Static41.anInt1309 < 100) { + if (WorldMap.loadPercentage < 100) { local50 = arg0 + arg3 / 2; local61 = arg2 / 2 + arg1 - 18 - 20; if (GlRenderer.enabled) { Static46.method1186(arg0, arg1, arg3, arg2, 0); Static46.method1179(local50 - 152, local61, 304, 34, 9179409); Static46.method1179(local50 - 151, local61 + 1, 302, 32, 0); - Static46.method1186(local50 - 150, local61 + 2, Static41.anInt1309 * 3, 30, 9179409); - Static46.method1186(local50 + Static41.anInt1309 * 3 - 150, local61 - -2, 300 - Static41.anInt1309 * 3, 30, 0); + Static46.method1186(local50 - 150, local61 + 2, WorldMap.loadPercentage * 3, 30, 9179409); + Static46.method1186(local50 + WorldMap.loadPercentage * 3 - 150, local61 - -2, 300 - WorldMap.loadPercentage * 3, 30, 0); } else { - Static129.method2495(arg0, arg1, arg3, arg2, 0); - Static129.method2483(local50 - 152, local61, 304, 34, 9179409); - Static129.method2483(local50 - 151, local61 + 1, 302, 32, 0); - Static129.method2495(local50 - 150, local61 + 2, Static41.anInt1309 * 3, 30, 9179409); - Static129.method2495(Static41.anInt1309 * 3 + local50 - 150, local61 - -2, 300 - Static41.anInt1309 * 3, 30, 0); + SoftwareRaster.fillRect(arg0, arg1, arg3, arg2, 0); + SoftwareRaster.drawRect(local50 - 152, local61, 304, 34, 9179409); + SoftwareRaster.drawRect(local50 - 151, local61 + 1, 302, 32, 0); + SoftwareRaster.fillRect(local50 - 150, local61 + 2, WorldMap.loadPercentage * 3, 30, 9179409); + SoftwareRaster.fillRect(WorldMap.loadPercentage * 3 + local50 - 150, local61 - -2, 300 - WorldMap.loadPercentage * 3, 30, 0); } - Static280.aClass3_Sub2_Sub9_43.renderCenter(LocalizedText.LOADINGDOTDOTDOT, local50, local61 + 20, 16777215, -1); + Fonts.b12Full.renderCenter(LocalizedText.LOADINGDOTDOTDOT, local50, local61 + 20, 16777215, -1); return; } - Static37.anInt1176 = (int) ((float) (arg2 * 2) / Static83.aFloat3); - Static109.anInt2882 = Static13.anInt435 - (int) ((float) arg3 / Static83.aFloat3); - @Pc(211) int local211 = Static13.anInt435 - (int) ((float) arg3 / Static83.aFloat3); - local50 = Static28.anInt919 - (int) ((float) arg2 / Static83.aFloat3); - Static109.anInt2884 = Static28.anInt919 - (int) ((float) arg2 / Static83.aFloat3); - @Pc(236) int local236 = Static28.anInt919 + (int) ((float) arg2 / Static83.aFloat3); - local61 = (int) ((float) arg3 / Static83.aFloat3) + Static13.anInt435; - Static89.anInt2387 = (int) ((float) (arg3 * 2) / Static83.aFloat3); + Static37.anInt1176 = (int) ((float) (arg2 * 2) / WorldMap.zoom); + Static109.anInt2882 = WorldMap.anInt435 - (int) ((float) arg3 / WorldMap.zoom); + @Pc(211) int local211 = WorldMap.anInt435 - (int) ((float) arg3 / WorldMap.zoom); + local50 = WorldMap.anInt919 - (int) ((float) arg2 / WorldMap.zoom); + Static109.anInt2884 = WorldMap.anInt919 - (int) ((float) arg2 / WorldMap.zoom); + @Pc(236) int local236 = WorldMap.anInt919 + (int) ((float) arg2 / WorldMap.zoom); + local61 = (int) ((float) arg3 / WorldMap.zoom) + WorldMap.anInt435; + Static89.anInt2387 = (int) ((float) (arg3 * 2) / WorldMap.zoom); if (GlRenderer.enabled) { if (Static153.aClass3_Sub2_Sub1_Sub1_2 == null || Static153.aClass3_Sub2_Sub1_Sub1_2.anInt1867 != arg3 || Static153.aClass3_Sub2_Sub1_Sub1_2.anInt1859 != arg2) { Static153.aClass3_Sub2_Sub1_Sub1_2 = null; Static153.aClass3_Sub2_Sub1_Sub1_2 = new SoftwareSprite(arg3, arg2); } - Static129.method2491(Static153.aClass3_Sub2_Sub1_Sub1_2.anIntArray20, arg3, arg2); + SoftwareRaster.method2491(Static153.aClass3_Sub2_Sub1_Sub1_2.anIntArray20, arg3, arg2); Static214.method4364(arg3, 0, local61, local50, 0, local236, arg2, local211); Static48.method1195(arg3, 0, local61, local236, arg2, 0, local211, local50); Static38.method959(0, 0, local211, arg3, local236, local50, local61, arg2); Static46.method1178(Static153.aClass3_Sub2_Sub1_Sub1_2.anIntArray20, arg0, arg1, arg3, arg2); - Static129.pixels = null; + SoftwareRaster.pixels = null; } else { Static214.method4364(arg3 + arg0, arg1, local61, local50, arg0, local236, arg1 + arg2, local211); Static48.method1195(arg0 + arg3, arg0, local61, local236, arg2 + arg1, arg1, local211, local50); @@ -306,12 +300,12 @@ public final class Static269 { Static201.anInt1864--; } } - if (!Static43.displayFps) { + if (!Cheat.displayFps) { return; } @Pc(405) int local405 = arg1 + arg2 - 8; @Pc(412) int local412 = arg0 + arg3 - 5; - Static215.aClass3_Sub2_Sub9_32.renderRight(Static34.concatenate(new JagString[] { Static115.aClass100_579, Static123.parseInt(GameShell.framesPerSecond) }), local412, local405, 16776960, -1); + Fonts.p12Full.renderRight(JagString.concatenate(new JagString[] { Static115.aClass100_579, Static123.parseInt(GameShell.framesPerSecond) }), local412, local405, 16776960, -1); @Pc(434) Runtime local434 = Runtime.getRuntime(); @Pc(443) int local443 = (int) ((local434.totalMemory() - local434.freeMemory()) / 1024L); @Pc(445) int local445 = 16776960; @@ -319,12 +313,12 @@ public final class Static269 { if (local443 > 65536) { local445 = 16711680; } - Static215.aClass3_Sub2_Sub9_32.renderRight(Static34.concatenate(new JagString[] { Static203.aClass100_894, Static123.parseInt(local443), Static19.aClass100_112 }), local412, local446, local445, -1); + Fonts.p12Full.renderRight(JagString.concatenate(new JagString[] { Static203.aClass100_894, Static123.parseInt(local443), Static19.aClass100_112 }), local412, local446, local445, -1); local405 = local446 - 15; } @OriginalMember(owner = "client!wa", name = "a", descriptor = "(IZ)Lclient!na;") public static JagString method2228(@OriginalArg(0) int arg0) { - return Static233.aClass100Array160[arg0].length() > 0 ? Static34.concatenate(new JagString[] { Static254.aClass100Array168[arg0], LocalizedText.MINISEPARATOR, Static233.aClass100Array160[arg0] }) : Static254.aClass100Array168[arg0]; + return Static233.aClass100Array160[arg0].length() > 0 ? JagString.concatenate(new JagString[] { Static254.aClass100Array168[arg0], LocalizedText.MINISEPARATOR, Static233.aClass100Array160[arg0] }) : Static254.aClass100Array168[arg0]; } } diff --git a/client/src/main/java/Static27.java b/client/src/main/java/Static27.java index 6a3cfc9..031367b 100644 --- a/client/src/main/java/Static27.java +++ b/client/src/main/java/Static27.java @@ -19,15 +19,12 @@ public final class Static27 { @OriginalMember(owner = "client!cb", name = "cb", descriptor = "Lclient!na;") public static final JagString aClass100_165 = Static28.parse("titlebg"); - @OriginalMember(owner = "client!cb", name = "eb", descriptor = "Lclient!na;") - public static final JagString aClass100_167 = Static28.parse("name_icons"); - - @OriginalMember(owner = "client!cb", name = "fb", descriptor = "Lclient!na;") + @OriginalMember(owner = "client!cb", name = "fb", descriptor = "Lclient!na;") public static final JagString aClass100_168 = Static28.parse(": "); @OriginalMember(owner = "client!cb", name = "b", descriptor = "(III)V") public static void setMaterial(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - if (arg1 == 4 && !Static220.highWaterDetail) { + if (arg1 == 4 && !Preferences.highWaterDetail) { arg1 = 2; arg0 = 2; } diff --git a/client/src/main/java/Static270.java b/client/src/main/java/Static270.java index caa6d37..85a471c 100644 --- a/client/src/main/java/Static270.java +++ b/client/src/main/java/Static270.java @@ -7,9 +7,6 @@ public final class Static270 { @OriginalMember(owner = "client!wb", name = "b", descriptor = "[I") public static int[] anIntArray562; - @OriginalMember(owner = "client!wb", name = "l", descriptor = "Lclient!fd;") - public static WorldMapFont aClass41_9; - @OriginalMember(owner = "client!wb", name = "a", descriptor = "Lclient!na;") public static final JagString aClass100_1089 = Static28.parse(")2"); diff --git a/client/src/main/java/Static271.java b/client/src/main/java/Static271.java index 80ee518..86e962c 100644 --- a/client/src/main/java/Static271.java +++ b/client/src/main/java/Static271.java @@ -28,10 +28,10 @@ public final class Static271 { @OriginalMember(owner = "client!wc", name = "a", descriptor = "(Lclient!wa;I)V") public static void method4598(@OriginalArg(0) Buffer arg0) { - if (Static121.uid != null) { + if (client.uid != null) { try { - Static121.uid.seek(0L); - Static121.uid.write(arg0.data, arg0.offset, 24); + client.uid.seek(0L); + client.uid.write(arg0.data, arg0.offset, 24); } catch (@Pc(16) Exception local16) { } } diff --git a/client/src/main/java/Static273.java b/client/src/main/java/Static273.java index 2d73fc0..0460aa6 100644 --- a/client/src/main/java/Static273.java +++ b/client/src/main/java/Static273.java @@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static273 { - @OriginalMember(owner = "client!we", name = "v", descriptor = "Lclient!fd;") - public static WorldMapFont aClass41_7; - @OriginalMember(owner = "client!we", name = "H", descriptor = "[[B") public static byte[][] mapFilesBuffer; @@ -83,7 +80,7 @@ public final class Static273 { local41 = Static7.varps[local33[local39++]] * 100 / 46875; } if (local46 == 8) { - local41 = Static173.self.anInt1652; + local41 = PlayerList.self.anInt1652; } if (local46 == 9) { for (local124 = 0; local124 < 25; local124++) { @@ -122,10 +119,10 @@ public final class Static273 { local41 = Static155.getVarbit(local124); } if (local46 == 18) { - local41 = (Static173.self.xFine >> 7) + Static225.originX; + local41 = (PlayerList.self.xFine >> 7) + Static225.originX; } if (local46 == 19) { - local41 = (Static173.self.zFine >> 7) + Static142.originZ; + local41 = (PlayerList.self.zFine >> 7) + Static142.originZ; } if (local46 == 20) { local41 = local33[local39++]; diff --git a/client/src/main/java/Static274.java b/client/src/main/java/Static274.java index e00a554..a31548d 100644 --- a/client/src/main/java/Static274.java +++ b/client/src/main/java/Static274.java @@ -3,10 +3,7 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static274 { - @OriginalMember(owner = "client!wf", name = "b", descriptor = "[I") - public static int[] anIntArray440; - - @OriginalMember(owner = "client!wf", name = "d", descriptor = "I") + @OriginalMember(owner = "client!wf", name = "d", descriptor = "I") public static int anInt4997; @OriginalMember(owner = "client!wf", name = "f", descriptor = "I") diff --git a/client/src/main/java/Static276.java b/client/src/main/java/Static276.java index adec96f..c414bba 100644 --- a/client/src/main/java/Static276.java +++ b/client/src/main/java/Static276.java @@ -7,9 +7,6 @@ public final class Static276 { @OriginalMember(owner = "client!wh", name = "c", descriptor = "[[[Lclient!bj;") public static Tile[][][] underWaterGroundTiles; - @OriginalMember(owner = "client!wh", name = "l", descriptor = "[Lclient!qf;") - public static Sprite[] aClass3_Sub2_Sub1Array11; - @OriginalMember(owner = "client!wh", name = "g", descriptor = "[I") public static final int[] anIntArray563 = new int[50]; @@ -55,7 +52,7 @@ public final class Static276 { @Pc(28) Player local28 = Static159.players[Static105.anIntArray256[local15]]; if (local28 != null && local28.aClass100_364 != null && local28.aClass100_364.equalsIgnoreCase(local7)) { local13 = true; - Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local28.movementQueueX[0], 1, 0, 2, local28.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local28.movementQueueX[0], 1, 0, 2, local28.movementQueueZ[0], PlayerList.self.movementQueueX[0]); if (arg0 == 1) { Static6.outboundBuffer.p1isaac(68); Static6.outboundBuffer.p2leadd(Static105.anIntArray256[local15]); @@ -76,7 +73,7 @@ public final class Static276 { } } if (!local13) { - Static103.method2231(Static186.EMPTY, 0, Static34.concatenate(new JagString[] { LocalizedText.UNABLETOFIND, local7 })); + Static103.method2231(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { LocalizedText.UNABLETOFIND, local7 })); } } @@ -84,11 +81,11 @@ public final class Static276 { public static IndexedSprite method4614() { @Pc(27) IndexedSprite local27; if (GlRenderer.enabled) { - local27 = new GlIndexedSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], Static7.aByteArrayArray5[0], Static259.anIntArray513); + local27 = new GlIndexedSprite(SpriteLoader.width, SpriteLoader.height, SpriteLoader.xOffsets[0], SpriteLoader.yOffsets[0], SpriteLoader.innerWidths[0], SpriteLoader.innerHeights[0], SpriteLoader.pixels[0], SpriteLoader.palette); } else { - local27 = new SoftwareIndexedSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], Static7.aByteArrayArray5[0], Static259.anIntArray513); + local27 = new SoftwareIndexedSprite(SpriteLoader.width, SpriteLoader.height, SpriteLoader.xOffsets[0], SpriteLoader.yOffsets[0], SpriteLoader.innerWidths[0], SpriteLoader.innerHeights[0], SpriteLoader.pixels[0], SpriteLoader.palette); } - Static75.method1631(); + SpriteLoader.clear(); return local27; } diff --git a/client/src/main/java/Static277.java b/client/src/main/java/Static277.java index 97a39af..d1beb02 100644 --- a/client/src/main/java/Static277.java +++ b/client/src/main/java/Static277.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static277 { @OriginalMember(owner = "client!wi", name = "R", descriptor = "[Lclient!qf;") - public static Sprite[] aClass3_Sub2_Sub1Array12; + public static Sprite[] hintMapEdge; @OriginalMember(owner = "client!wi", name = "ab", descriptor = "I") public static int anInt5853; @@ -39,9 +39,9 @@ public final class Static277 { @OriginalMember(owner = "client!wi", name = "d", descriptor = "(II)V") public static void method4641(@OriginalArg(1) int arg0) { - Static217.anInt4901 = -1; - Static217.anInt4901 = -1; - Static28.anInt919 = arg0; - Static38.method965(); + WorldMap.anInt4901 = -1; + WorldMap.anInt4901 = -1; + WorldMap.anInt919 = arg0; + WorldMap.method965(); } } diff --git a/client/src/main/java/Static278.java b/client/src/main/java/Static278.java index 0af2d31..177dbfe 100644 --- a/client/src/main/java/Static278.java +++ b/client/src/main/java/Static278.java @@ -57,7 +57,7 @@ public final class Static278 { if (local37.anInt3376 == 0) { local37.anInt3381 = 0; } - local37.method2683(local37.getSize(), Static173.self.movementQueueX[0] + local124, local105 + Static173.self.movementQueueZ[0], local66 == 1); + local37.method2683(local37.getSize(), PlayerList.self.movementQueueX[0] + local124, local105 + PlayerList.self.movementQueueZ[0], local66 == 1); if (local37.type.hasAreaSound()) { Static122.method2411(local37.movementQueueZ[0], null, 0, local37, local37.movementQueueX[0], Static55.level, null); } @@ -107,9 +107,9 @@ public final class Static278 { @OriginalMember(owner = "client!wj", name = "a", descriptor = "(IIB)V") public static void method4650(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { - if (Static12.musicVolume != 0 && arg1 != -1) { - Static122.method2410(Static214.js5Archive11, arg1, Static12.musicVolume); - Static144.aBoolean173 = true; + if (Preferences.musicVolume != 0 && arg1 != -1) { + Static122.method2410(Static214.js5Archive11, arg1, Preferences.musicVolume); + MidiPlayer.jingle = true; } } @@ -195,9 +195,9 @@ public final class Static278 { @OriginalMember(owner = "client!wj", name = "b", descriptor = "(B)V") public static void processLogout() { - if (Static124.socket != null) { - Static124.socket.close(); - Static124.socket = null; + if (Protocol.socket != null) { + Protocol.socket.close(); + Protocol.socket = null; } Static217.method3768(); Static65.method1500(); @@ -208,7 +208,7 @@ public final class Static278 { Static116.clear(false); System.gc(); Static29.method801(); - Static144.aBoolean173 = false; + MidiPlayer.jingle = false; Static221.anInt4363 = -1; Static260.clearAmbientSounds(true); Static230.dynamicMapRegion = false; diff --git a/client/src/main/java/Static279.java b/client/src/main/java/Static279.java index 2b57d4e..4af7eaa 100644 --- a/client/src/main/java/Static279.java +++ b/client/src/main/java/Static279.java @@ -7,10 +7,7 @@ public final class Static279 { @OriginalMember(owner = "client!wk", name = "v", descriptor = "[I") public static int[] anIntArray568; - @OriginalMember(owner = "client!wk", name = "w", descriptor = "I") - public static int country; - - @OriginalMember(owner = "client!wk", name = "t", descriptor = "Lclient!n;") + @OriginalMember(owner = "client!wk", name = "t", descriptor = "Lclient!n;") public static final SoftLruHashTable aClass99_38 = new SoftLruHashTable(64); @OriginalMember(owner = "client!wk", name = "u", descriptor = "Lclient!na;") @@ -29,9 +26,9 @@ public final class Static279 { public static JagString[] method4664(@OriginalArg(1) JagString[] arg0) { @Pc(8) JagString[] local8 = new JagString[5]; for (@Pc(15) int local15 = 0; local15 < 5; local15++) { - local8[local15] = Static34.concatenate(new JagString[] { Static123.parseInt(local15), Static27.aClass100_168 }); + local8[local15] = JagString.concatenate(new JagString[] { Static123.parseInt(local15), Static27.aClass100_168 }); if (arg0 != null && arg0[local15] != null) { - local8[local15] = Static34.concatenate(new JagString[] { local8[local15], arg0[local15] }); + local8[local15] = JagString.concatenate(new JagString[] { local8[local15], arg0[local15] }); } } return local8; diff --git a/client/src/main/java/Static28.java b/client/src/main/java/Static28.java index 736ee52..6cecb0c 100644 --- a/client/src/main/java/Static28.java +++ b/client/src/main/java/Static28.java @@ -7,63 +7,9 @@ public final class Static28 { @OriginalMember(owner = "client!cd", name = "s", descriptor = "I") public static int anInt917; - @OriginalMember(owner = "client!cd", name = "u", descriptor = "I") - public static int anInt919; - - @OriginalMember(owner = "client!cd", name = "B", descriptor = "Lclient!ve;") + @OriginalMember(owner = "client!cd", name = "B", descriptor = "Lclient!ve;") public static Js5 js5Archive25; - @OriginalMember(owner = "client!cd", name = "a", descriptor = "(Lclient!ve;B)I") - public static int getReady(@OriginalArg(0) Js5 arg0) { - @Pc(5) int local5 = 0; - if (arg0.isFileReady(Static280.anInt5900)) { - local5++; - } - if (arg0.isFileReady(Static131.anInt3261)) { - local5++; - } - if (arg0.isFileReady(Static36.anInt1165)) { - local5++; - } - if (arg0.isFileReady(Static214.anInt5579)) { - local5++; - } - if (arg0.isFileReady(Static34.anInt1049)) { - local5++; - } - if (arg0.isFileReady(Static202.anInt4741)) { - local5++; - } - if (arg0.isFileReady(Static149.anInt3551)) { - local5++; - } - if (arg0.isFileReady(Static19.anInt647)) { - local5++; - } - if (arg0.isFileReady(Static32.anInt1016)) { - local5++; - } - if (arg0.isFileReady(Static78.anInt2147)) { - local5++; - } - if (arg0.isFileReady(Static124.anInt3083)) { - local5++; - } - if (arg0.isFileReady(Static224.anInt5057)) { - local5++; - } - if (arg0.isFileReady(Static84.anInt2257)) { - local5++; - } - if (arg0.isFileReady(Static163.anInt3962)) { - local5++; - } - if (arg0.isFileReady(Static128.anInt3143)) { - local5++; - } - return local5; - } - @OriginalMember(owner = "client!cd", name = "a", descriptor = "(Ljava/lang/String;B)Lclient!na;") public static JagString parse(@OriginalArg(0) String arg0) { @Pc(6) byte[] local6 = arg0.getBytes(); diff --git a/client/src/main/java/Static280.java b/client/src/main/java/Static280.java index 0009315..01ab022 100644 --- a/client/src/main/java/Static280.java +++ b/client/src/main/java/Static280.java @@ -4,18 +4,9 @@ import org.openrs2.deob.annotation.Pc; public final class Static280 { - @OriginalMember(owner = "client!wl", name = "q", descriptor = "Lclient!rk;") - public static Font aClass3_Sub2_Sub9_43; - @OriginalMember(owner = "client!wl", name = "s", descriptor = "Lclient!ve;") public static Js5 js5Archive16; - @OriginalMember(owner = "client!wl", name = "A", descriptor = "I") - public static int anInt5900; - - @OriginalMember(owner = "client!wl", name = "d", descriptor = "Lclient!na;") - public static final JagString aClass100_1108 = Static28.parse("compass"); - @OriginalMember(owner = "client!wl", name = "h", descriptor = "Lclient!be;") public static Component aClass13_26 = null; @@ -24,7 +15,7 @@ public final class Static280 { @OriginalMember(owner = "client!wl", name = "a", descriptor = "(Lclient!fe;B)V") public static void method4665(@OriginalArg(0) PathingEntity arg0) { - if (Static83.loop == arg0.anInt3386 || arg0.anInt3369 == -1 || arg0.anInt3420 != 0 || arg0.anInt3360 + 1 > Static36.get(arg0.anInt3369).anIntArray474[arg0.anInt3425]) { + if (Static83.loop == arg0.anInt3386 || arg0.seqId == -1 || arg0.anInt3420 != 0 || arg0.anInt3360 + 1 > Static36.get(arg0.seqId).anIntArray474[arg0.anInt3425]) { @Pc(35) int local35 = arg0.anInt3386 - arg0.anInt3395; @Pc(41) int local41 = Static83.loop - arg0.anInt3395; @Pc(52) int local52 = arg0.anInt3380 * 128 + arg0.getSize() * 64; @@ -61,40 +52,40 @@ public final class Static280 { @OriginalMember(owner = "client!wl", name = "a", descriptor = "([IIIIIIIIIZB)V") public static void method4667(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) boolean arg9) { @Pc(7) int local7 = arg2; - if (Static129.clipRight <= arg2) { + if (SoftwareRaster.clipRight <= arg2) { return; } - if (arg2 < Static129.clipLeft) { - local7 = Static129.clipLeft; + if (arg2 < SoftwareRaster.clipLeft) { + local7 = SoftwareRaster.clipLeft; } @Pc(30) int local30 = arg7 + arg2; - if (Static129.clipLeft >= local30) { + if (SoftwareRaster.clipLeft >= local30) { return; } - if (Static129.clipRight < local30) { - local30 = Static129.clipRight; + if (SoftwareRaster.clipRight < local30) { + local30 = SoftwareRaster.clipRight; } @Pc(43) int local43 = arg8; - if (Static129.clipBottom <= arg8) { + if (SoftwareRaster.clipBottom <= arg8) { return; } @Pc(56) int local56 = arg8 + arg6; - if (arg8 < Static129.clipTop) { - local43 = Static129.clipTop; + if (arg8 < SoftwareRaster.clipTop) { + local43 = SoftwareRaster.clipTop; } - if (local56 <= Static129.clipTop) { + if (local56 <= SoftwareRaster.clipTop) { return; } - @Pc(79) int local79 = local7 + Static129.width * local43; + @Pc(79) int local79 = local7 + SoftwareRaster.width * local43; if (arg5 == 9) { arg3 = arg3 + 1 & 0x3; arg5 = 1; } - @Pc(99) int local99 = local7 + Static129.width - local30; + @Pc(99) int local99 = local7 + SoftwareRaster.width - local30; local43 -= arg8; @Pc(108) int local108 = arg6 - local43; - if (Static129.clipBottom < local56) { - local56 = Static129.clipBottom; + if (SoftwareRaster.clipBottom < local56) { + local56 = SoftwareRaster.clipBottom; } if (arg5 == 10) { arg3 = arg3 + 3 & 0x3; diff --git a/client/src/main/java/Static281.java b/client/src/main/java/Static281.java deleted file mode 100644 index fd8662b..0000000 --- a/client/src/main/java/Static281.java +++ /dev/null @@ -1,7 +0,0 @@ -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static281 { - - @OriginalMember(owner = "client!wm", name = "g", descriptor = "[B") - public static final byte[] aByteArray82 = new byte[16384]; -} diff --git a/client/src/main/java/Static285.java b/client/src/main/java/Static285.java index 14c0246..334f408 100644 --- a/client/src/main/java/Static285.java +++ b/client/src/main/java/Static285.java @@ -46,8 +46,8 @@ public final class Static285 { @OriginalMember(owner = "client!dd", name = "a", descriptor = "([I[BIIIIIIIII[I[I)V") public static void method1138(@OriginalArg(0) int[] arg0, @OriginalArg(1) byte[] arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10, @OriginalArg(11) int[] arg11, @OriginalArg(12) int[] arg12) { - @Pc(3) int local3 = arg2 - Static129.clipLeft; - @Pc(7) int local7 = arg3 - Static129.clipTop; + @Pc(3) int local3 = arg2 - SoftwareRaster.clipLeft; + @Pc(7) int local7 = arg3 - SoftwareRaster.clipTop; for (@Pc(9) int local9 = local7; local9 < local7 + arg5; local9++) { @Pc(18) int local18 = arg11[local9]; @Pc(22) int local22 = arg12[local9]; @@ -82,7 +82,7 @@ public final class Static285 { if (arg1[arg7++] == 0) { arg8++; } else { - Static129.pixels[arg8++] = arg6; + SoftwareRaster.pixels[arg8++] = arg6; } } arg7 += local31 + arg10; diff --git a/client/src/main/java/Static288.java b/client/src/main/java/Static288.java deleted file mode 100644 index 1b59f7b..0000000 --- a/client/src/main/java/Static288.java +++ /dev/null @@ -1,14 +0,0 @@ -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static288 { - - @OriginalMember(owner = "client!ji", name = "a", descriptor = "(II)I") - public static int method2416(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { - @Pc(10) int local10; - for (local10 = (int) Math.pow((double) arg0, 1.0D / (double) arg1) + 1; Static209.method3709(arg1, local10) > arg0; local10--) { - } - return local10; - } -} diff --git a/client/src/main/java/Static289.java b/client/src/main/java/Static289.java index 320a795..6dec46d 100644 --- a/client/src/main/java/Static289.java +++ b/client/src/main/java/Static289.java @@ -44,55 +44,7 @@ public final class Static289 { } } - @OriginalMember(owner = "client!kg", name = "a", descriptor = "([BI[BII)V") - public static void copy(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) byte[] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { - @Pc(15) int local15; - if (arg0 == arg2) { - if (arg1 == arg3) { - return; - } - if (arg3 > arg1 && arg3 < arg1 + arg4) { - local15 = arg4 - 1; - @Pc(19) int local19 = arg1 + local15; - @Pc(23) int local23 = arg3 + local15; - local15 = local19 - local15; - local15 += 7; - while (local19 >= local15) { - arg2[local23--] = arg0[local19--]; - arg2[local23--] = arg0[local19--]; - arg2[local23--] = arg0[local19--]; - arg2[local23--] = arg0[local19--]; - arg2[local23--] = arg0[local19--]; - arg2[local23--] = arg0[local19--]; - arg2[local23--] = arg0[local19--]; - arg2[local23--] = arg0[local19--]; - } - local15 -= 7; - while (local19 >= local15) { - arg2[local23--] = arg0[local19--]; - } - return; - } - } - local15 = arg4 + arg1; - @Pc(115) int local115 = local15 - 7; - while (arg1 < local115) { - arg2[arg3++] = arg0[arg1++]; - arg2[arg3++] = arg0[arg1++]; - arg2[arg3++] = arg0[arg1++]; - arg2[arg3++] = arg0[arg1++]; - arg2[arg3++] = arg0[arg1++]; - arg2[arg3++] = arg0[arg1++]; - arg2[arg3++] = arg0[arg1++]; - arg2[arg3++] = arg0[arg1++]; - } - local15 = local115 + 7; - while (arg1 < local15) { - arg2[arg3++] = arg0[arg1++]; - } - } - - @OriginalMember(owner = "client!kg", name = "a", descriptor = "([II[III)V") + @OriginalMember(owner = "client!kg", name = "a", descriptor = "([II[III)V") public static void method2613(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int[] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { @Pc(15) int local15; if (arg0 == arg2) { diff --git a/client/src/main/java/Static29.java b/client/src/main/java/Static29.java index 504dc0f..4ed922d 100644 --- a/client/src/main/java/Static29.java +++ b/client/src/main/java/Static29.java @@ -14,11 +14,11 @@ public final class Static29 { } @Pc(27) Font local27; if (GlRenderer.enabled) { - local27 = new GlFont(arg0, Static274.anIntArray440, Static269.anIntArray252, Static254.anIntArray488, Static26.anIntArray66, Static7.aByteArrayArray5); + local27 = new GlFont(arg0, SpriteLoader.xOffsets, SpriteLoader.yOffsets, SpriteLoader.innerWidths, SpriteLoader.innerHeights, SpriteLoader.pixels); } else { - local27 = new SoftwareFont(arg0, Static274.anIntArray440, Static269.anIntArray252, Static254.anIntArray488, Static26.anIntArray66, Static7.aByteArrayArray5); + local27 = new SoftwareFont(arg0, SpriteLoader.xOffsets, SpriteLoader.yOffsets, SpriteLoader.innerWidths, SpriteLoader.innerHeights, SpriteLoader.pixels); } - Static75.method1631(); + SpriteLoader.clear(); return local27; } @@ -38,7 +38,7 @@ public final class Static29 { local9.anInt918 = arg0; local9.anInt927 = arg6; Static226.method3898(local9); - Static26.aClass69_27.method2282(local9); + Static26.aClass69_27.addTail(local9); } local9.anInt926 = arg7; local9.anInt925 = arg8; diff --git a/client/src/main/java/Static291.java b/client/src/main/java/Static291.java deleted file mode 100644 index 08926b9..0000000 --- a/client/src/main/java/Static291.java +++ /dev/null @@ -1,12 +0,0 @@ -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static291 { - - @OriginalMember(owner = "client!rf", name = "a", descriptor = "(Lclient!ve;II)Lclient!rf;") - public static Song method3742(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { - @Pc(5) byte[] local5 = arg0.getFile(arg1, arg2); - return local5 == null ? null : new Song(new Buffer(local5)); - } -} diff --git a/client/src/main/java/Static292.java b/client/src/main/java/Static292.java deleted file mode 100644 index a1a54d0..0000000 --- a/client/src/main/java/Static292.java +++ /dev/null @@ -1,12 +0,0 @@ -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static292 { - - @OriginalMember(owner = "client!sl", name = "a", descriptor = "(Lclient!ve;II)Lclient!sl;") - public static SynthSound method3988(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { - @Pc(5) byte[] local5 = arg0.getFile(arg1, arg2); - return local5 == null ? null : new SynthSound(new Buffer(local5)); - } -} diff --git a/client/src/main/java/Static3.java b/client/src/main/java/Static3.java index 445f98f..d046f3b 100644 --- a/client/src/main/java/Static3.java +++ b/client/src/main/java/Static3.java @@ -20,7 +20,7 @@ public final class Static3 { public static void method4656(@OriginalArg(0) JagString arg0) { @Pc(9) int local9 = Static171.method3218(arg0); if (local9 != -1) { - Static80.method3616(Static203.aClass134_1.aShortArray73[local9], Static203.aClass134_1.aShortArray72[local9]); + Static80.method3616(WorldMap.labels.aShortArray73[local9], WorldMap.labels.aShortArray72[local9]); } } @@ -29,21 +29,7 @@ public final class Static3 { Static232.aClass99_30.method3103(); } - @OriginalMember(owner = "client!ab", name = "a", descriptor = "(II)V") - public static void setLanguage(@OriginalArg(1) int arg0) { - if (arg0 == 0) { - return; - } - if (arg0 == 1) { - LocalizedText.switchToGerman(); - } else if (arg0 == 2) { - LocalizedText.switchToFrench(); - } else { - throw new RuntimeException(); - } - } - - @OriginalMember(owner = "client!ab", name = "c", descriptor = "(B)[Lclient!od;") + @OriginalMember(owner = "client!ab", name = "c", descriptor = "(B)[Lclient!od;") public static Class114[] method4660() { if (Static105.aClass114Array1 == null) { @Pc(16) Class114[] local16 = Static197.method3558(GameShell.signLink); diff --git a/client/src/main/java/Static30.java b/client/src/main/java/Static30.java index 42b89b3..70fee68 100644 --- a/client/src/main/java/Static30.java +++ b/client/src/main/java/Static30.java @@ -1,6 +1,4 @@ -import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; public final class Static30 { @@ -10,75 +8,7 @@ public final class Static30 { @OriginalMember(owner = "client!cg", name = "e", descriptor = "Lclient!na;") public static final JagString aClass100_184 = Static28.parse("1"); - @OriginalMember(owner = "client!cg", name = "f", descriptor = "I") - public static int ambientSoundsVolume = 127; - - @OriginalMember(owner = "client!cg", name = "h", descriptor = "Lclient!na;") + @OriginalMember(owner = "client!cg", name = "h", descriptor = "Lclient!na;") public static final JagString aClass100_185 = Static28.parse(")3"); - @OriginalMember(owner = "client!cg", name = "a", descriptor = "(ZILclient!ve;I)[Lclient!ek;") - private static SoftwareIndexedSprite[] method837(@OriginalArg(1) int arg0, @OriginalArg(2) Js5 arg1) { - return Static234.method4016(arg1, 0, arg0) ? Static121.method2406() : null; - } - - @OriginalMember(owner = "client!cg", name = "a", descriptor = "(ILclient!ve;)V") - public static void load(@OriginalArg(1) Js5 arg0) { - Static173.aClass3_Sub2_Sub1_Sub1Array9 = Static265.method4523(Static280.anInt5900, arg0); - Static213.aClass3_Sub2_Sub1Array8 = Static209.method3708(Static131.anInt3261, arg0); - Static116.aClass3_Sub2_Sub1Array3 = Static209.method3708(Static36.anInt1165, arg0); - Static219.aClass3_Sub2_Sub1Array9 = Static209.method3708(Static214.anInt5579, arg0); - Static138.aClass3_Sub2_Sub1Array5 = Static209.method3708(Static34.anInt1049, arg0); - Static276.aClass3_Sub2_Sub1Array11 = Static209.method3708(Static202.anInt4741, arg0); - Static149.aClass3_Sub2_Sub1Array7 = Static209.method3708(Static149.anInt3551, arg0); - Static84.aClass3_Sub2_Sub1_4 = Static150.method2800(Static19.anInt647, arg0); - Static240.aClass3_Sub2_Sub1Array10 = Static131.method2580(Static32.anInt1016, arg0); - Static139.aClass3_Sub2_Sub1Array6 = Static131.method2580(Static78.anInt2147, arg0); - Static241.aClass36Array16 = Static146.method2749(arg0, Static124.anInt3083); - Static159.aClass36Array12 = Static146.method2749(arg0, Static224.anInt5057); - Static114.aClass3_Sub2_Sub9_42.setNameIcons(Static159.aClass36Array12, null); - Static215.aClass3_Sub2_Sub9_32.setNameIcons(Static159.aClass36Array12, null); - Static280.aClass3_Sub2_Sub9_43.setNameIcons(Static159.aClass36Array12, null); - if (GlRenderer.enabled) { - Static242.aClass36_Sub1Array2 = method837(Static84.anInt2257, arg0); - for (@Pc(101) int local101 = 0; local101 < Static242.aClass36_Sub1Array2.length; local101++) { - Static242.aClass36_Sub1Array2[local101].method1396(); - } - } - @Pc(124) SoftwareSprite local124 = Static78.method1693(0, arg0, Static163.anInt3962); - local124.method311(); - if (GlRenderer.enabled) { - Static106.aClass3_Sub2_Sub1_7 = new GlSprite(local124); - } else { - Static106.aClass3_Sub2_Sub1_7 = local124; - } - @Pc(143) SoftwareSprite[] local143 = Static265.method4523(Static128.anInt3143, arg0); - @Pc(145) int local145; - for (local145 = 0; local145 < local143.length; local145++) { - local143[local145].method311(); - } - if (GlRenderer.enabled) { - Static277.aClass3_Sub2_Sub1Array12 = new Sprite[local143.length]; - for (local145 = 0; local145 < local143.length; local145++) { - Static277.aClass3_Sub2_Sub1Array12[local145] = new GlSprite(local143[local145]); - } - } else { - Static277.aClass3_Sub2_Sub1Array12 = local143; - } - @Pc(196) int local196 = (int) ((double) 21 * Math.random()) - 10; - local145 = (int) (Math.random() * 21.0D) - 10; - @Pc(210) int local210 = (int) (Math.random() * 21.0D) - 10; - @Pc(217) int local217 = (int) (Math.random() * 41.0D) - 20; - @Pc(219) int local219; - for (local219 = 0; local219 < Static173.aClass3_Sub2_Sub1_Sub1Array9.length; local219++) { - Static173.aClass3_Sub2_Sub1_Sub1Array9[local219].method315(local145 + local217, local217 + local196, local217 + local210); - } - if (GlRenderer.enabled) { - Static67.aClass3_Sub2_Sub1Array4 = new Sprite[Static173.aClass3_Sub2_Sub1_Sub1Array9.length]; - for (local219 = 0; local219 < Static173.aClass3_Sub2_Sub1_Sub1Array9.length; local219++) { - Static67.aClass3_Sub2_Sub1Array4[local219] = new GlSprite(Static173.aClass3_Sub2_Sub1_Sub1Array9[local219]); - } - } else { - Static67.aClass3_Sub2_Sub1Array4 = Static173.aClass3_Sub2_Sub1_Sub1Array9; - } - } } diff --git a/client/src/main/java/Static31.java b/client/src/main/java/Static31.java index 1cd2e52..c4ad915 100644 --- a/client/src/main/java/Static31.java +++ b/client/src/main/java/Static31.java @@ -15,9 +15,6 @@ public final class Static31 { @OriginalMember(owner = "client!ch", name = "x", descriptor = "Lclient!na;") public static final JagString aClass100_193 = Static28.parse(":"); - @OriginalMember(owner = "client!ch", name = "y", descriptor = "[Z") - public static final boolean[] rectangleRedraw = new boolean[100]; - @OriginalMember(owner = "client!ch", name = "z", descriptor = "[I") public static final int[] anIntArray76 = new int[5]; @@ -26,8 +23,8 @@ public final class Static31 { @OriginalMember(owner = "client!ch", name = "c", descriptor = "(I)V") public static void method846() { - if (!Static138.allLevelsAreVisible() && Static41.anInt1316 != Static55.level) { - Static127.method2463(Static55.level, Static52.anInt1695, Static80.anInt4701, Static173.self.movementQueueZ[0], false, Static173.self.movementQueueX[0]); + if (!SceneGraph.allLevelsAreVisible() && Static41.anInt1316 != Static55.level) { + Static127.method2463(Static55.level, Static52.anInt1695, Static80.anInt4701, PlayerList.self.movementQueueZ[0], false, PlayerList.self.movementQueueX[0]); } else if (Static55.level != Static107.anInt2875 && Static137.method2665(Static55.level)) { Static107.anInt2875 = Static55.level; Static269.method2218(); @@ -41,9 +38,9 @@ public final class Static31 { } try { if (++Static20.anInt673 > 1500) { - if (Static124.socket != null) { - Static124.socket.close(); - Static124.socket = null; + if (Protocol.socket != null) { + Protocol.socket.close(); + Protocol.socket = null; } if (Static196.anInt4587 >= 1) { Static266.reply = -5; @@ -71,54 +68,54 @@ public final class Static31 { if (Static72.aClass212_3.status != 1) { return; } - Static124.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, GameShell.signLink); + Protocol.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, GameShell.signLink); Static72.aClass212_3 = null; - Static124.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); - if (Static11.musicChannel != null) { - Static11.musicChannel.method3571(); + Protocol.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); + if (client.musicChannel != null) { + client.musicChannel.method3571(); } - if (Static147.soundChannel != null) { - Static147.soundChannel.method3571(); + if (client.soundChannel != null) { + client.soundChannel.method3571(); } - local126 = Static124.socket.read(); - if (Static11.musicChannel != null) { - Static11.musicChannel.method3571(); + local126 = Protocol.socket.read(); + if (client.musicChannel != null) { + client.musicChannel.method3571(); } - if (Static147.soundChannel != null) { - Static147.soundChannel.method3571(); + if (client.soundChannel != null) { + client.soundChannel.method3571(); } if (local126 != 101) { Static266.reply = local126; Static219.anInt4937 = 0; - Static124.socket.close(); - Static124.socket = null; + Protocol.socket.close(); + Protocol.socket = null; return; } Static219.anInt4937 = 3; } if (Static219.anInt4937 == 3) { - if (Static124.socket.available() < 2) { + if (Protocol.socket.available() < 2) { return; } - local126 = Static124.socket.read() << 8 | Static124.socket.read(); + local126 = Protocol.socket.read() << 8 | Protocol.socket.read(); Static176.hopWorld(local126); if (Static125.worldId == -1) { Static219.anInt4937 = 0; Static266.reply = 6; - Static124.socket.close(); - Static124.socket = null; + Protocol.socket.close(); + Protocol.socket = null; return; } Static219.anInt4937 = 0; - Static124.socket.close(); - Static124.socket = null; + Protocol.socket.close(); + Protocol.socket = null; Static49.method1208(); return; } } catch (@Pc(210) IOException local210) { - if (Static124.socket != null) { - Static124.socket.close(); - Static124.socket = null; + if (Protocol.socket != null) { + Protocol.socket.close(); + Protocol.socket = null; } if (Static196.anInt4587 < 1) { if (Static208.worldListPort == Static249.worldListDefaultPort) { diff --git a/client/src/main/java/Static32.java b/client/src/main/java/Static32.java index 30cc16d..ac4be45 100644 --- a/client/src/main/java/Static32.java +++ b/client/src/main/java/Static32.java @@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static32 { - @OriginalMember(owner = "client!ci", name = "t", descriptor = "I") - public static int anInt1016; - @OriginalMember(owner = "client!ci", name = "q", descriptor = "Lclient!ek;") public static SoftwareIndexedSprite aClass36_Sub1_1 = null; @@ -38,7 +35,7 @@ public final class Static32 { local76.anInt5399 = 0; local76.anInt5408 = local28; local76.anInt5404 = 0; - Static152.method2836(arg2.zFine, local68, arg2.xFine, arg2 == Static173.self, 0); + SoundPlayer.playSeqSound(arg2.zFine, local68, arg2.xFine, arg2 == PlayerList.self, 0); } else if (local71 == 2) { local76.anInt5400 = 0; } @@ -54,7 +51,7 @@ public final class Static32 { local76.anInt5408 = local28; local76.anInt5399 = 0; local76.anInt5400 = 0; - Static152.method2836(arg2.zFine, local68, arg2.xFine, arg2 == Static173.self, 0); + SoundPlayer.playSeqSound(arg2.zFine, local68, arg2.xFine, arg2 == PlayerList.self, 0); } } } diff --git a/client/src/main/java/Static33.java b/client/src/main/java/Static33.java index 2a69a8d..b6d9db5 100644 --- a/client/src/main/java/Static33.java +++ b/client/src/main/java/Static33.java @@ -8,10 +8,7 @@ public final class Static33 { @OriginalMember(owner = "client!cj", name = "e", descriptor = "[[S") public static short[][] aShortArrayArray2; - @OriginalMember(owner = "client!cj", name = "h", descriptor = "Z") - public static boolean aBoolean63; - - @OriginalMember(owner = "client!cj", name = "n", descriptor = "Lsignlink!im;") + @OriginalMember(owner = "client!cj", name = "n", descriptor = "Lsignlink!im;") public static PrivilegedRequest openUrlRequest; @OriginalMember(owner = "client!cj", name = "i", descriptor = "[I") @@ -19,7 +16,7 @@ public final class Static33 { @OriginalMember(owner = "client!cj", name = "a", descriptor = "(ILclient!pb;ZIIII)Z") public static boolean method867(@OriginalArg(0) int arg0, @OriginalArg(1) LocType arg1, @OriginalArg(5) int arg2, @OriginalArg(6) int arg3) { - @Pc(10) MsiType local10 = Static40.method1013(arg1.mapSceneId); + @Pc(10) MsiType local10 = MsiTypeList.get(arg1.mapSceneId); if (local10.spriteId == -1) { return true; } @@ -53,127 +50,6 @@ public final class Static33 { return true; } - @OriginalMember(owner = "client!cj", name = "a", descriptor = "(BLclient!wa;)V") - public static void method868(@OriginalArg(1) Buffer arg0) { - @Pc(13) int local13 = Static266.anInt5338 >> 1; - @Pc(19) int local19 = Static131.anInt3254 >> 2 << 10; - @Pc(23) byte[][] local23 = new byte[Static48.anInt1449][Static181.anInt4296]; - @Pc(33) int local33; - @Pc(102) int local102; - @Pc(114) int local114; - while (arg0.offset < arg0.data.length) { - @Pc(31) int local31 = 0; - local33 = 0; - @Pc(35) boolean local35 = false; - if (arg0.g1() == 1) { - local33 = arg0.g1(); - local31 = arg0.g1(); - local35 = true; - } - @Pc(57) int local57 = arg0.g1(); - @Pc(61) int local61 = arg0.g1(); - @Pc(68) int local68 = local57 * 64 - Static158.anInt3846; - @Pc(78) int local78 = Static181.anInt4296 + Static2.anInt13 - local61 * 64 - 1; - if (local68 >= 0 && local78 - 63 >= 0 && Static48.anInt1449 > local68 + 63 && Static181.anInt4296 > local78) { - for (local102 = 0; local102 < 64; local102++) { - @Pc(112) byte[] local112 = local23[local68 + local102]; - for (local114 = 0; local114 < 64; local114++) { - if (!local35 || local102 >= local33 * 8 && local33 * 8 + 8 > local102 && local114 >= local31 * 8 && local114 < local31 * 8 + 8) { - local112[local78 - local114] = arg0.g1s(); - } - } - } - } else if (local35) { - arg0.offset += 64; - } else { - arg0.offset += 4096; - } - } - @Pc(175) int local175 = Static48.anInt1449; - local33 = Static181.anInt4296; - @Pc(180) int[] local180 = new int[local33]; - @Pc(183) int[] local183 = new int[local33]; - @Pc(186) int[] local186 = new int[local33]; - @Pc(189) int[] local189 = new int[local33]; - @Pc(192) int[] local192 = new int[local33]; - for (local102 = -5; local102 < local175; local102++) { - @Pc(225) int local225; - @Pc(293) int local293; - for (@Pc(203) int local203 = 0; local203 < local33; local203++) { - local114 = local102 + 5; - @Pc(272) int local272; - if (local175 > local114) { - local225 = local23[local114][local203] & 0xFF; - if (local225 > 0) { - @Pc(236) FluType local236 = Static199.method3593(local225 - 1); - local183[local203] += local236.weightedHue; - local180[local203] += local236.saturation; - local186[local203] += local236.lightness; - local189[local203] += local236.chroma; - local272 = local192[local203]++; - } - } - local225 = local102 - 5; - if (local225 >= 0) { - local293 = local23[local225][local203] & 0xFF; - if (local293 > 0) { - @Pc(302) FluType local302 = Static199.method3593(local293 - 1); - local183[local203] -= local302.weightedHue; - local180[local203] -= local302.saturation; - local186[local203] -= local302.lightness; - local189[local203] -= local302.chroma; - local272 = local192[local203]--; - } - } - } - if (local102 >= 0) { - @Pc(355) int[][] local355 = Static248.anIntArrayArrayArray17[local102 >> 6]; - local114 = 0; - local225 = 0; - @Pc(361) int local361 = 0; - @Pc(363) int local363 = 0; - local293 = 0; - for (@Pc(367) int local367 = -5; local367 < local33; local367++) { - @Pc(378) int local378 = local367 + 5; - if (local33 > local378) { - local363 += local192[local378]; - local225 += local180[local378]; - local293 += local186[local378]; - local114 += local183[local378]; - local361 += local189[local378]; - } - @Pc(415) int local415 = local367 - 5; - if (local415 >= 0) { - local293 -= local186[local415]; - local361 -= local189[local415]; - local114 -= local183[local415]; - local363 -= local192[local415]; - local225 -= local180[local415]; - } - if (local367 >= 0 && local363 > 0) { - @Pc(462) int[] local462 = local355[local367 >> 6]; - @Pc(480) int local480 = local361 == 0 ? 0 : Static54.method1309(local293 / local363, local225 / local363, local114 * 256 / local361); - if (local23[local102][local367] != 0) { - if (local462 == null) { - local462 = local355[local367 >> 6] = new int[4096]; - } - @Pc(519) int local519 = local13 + (local480 & 0x7F); - if (local519 < 0) { - local519 = 0; - } else if (local519 > 127) { - local519 = 127; - } - @Pc(541) int local541 = local519 + (local480 & 0x380) + (local480 + local19 & 0xFC00); - local462[((local367 & 0x3F) << 6) + (local102 & 0x3F)] = Rasteriser.palette[Static87.method1814(96, local541)]; - } else if (local462 != null) { - local462[((local367 & 0x3F) << 6) + (local102 & 0x3F)] = 0; - } - } - } - } - } - } - @OriginalMember(owner = "client!cj", name = "a", descriptor = "(ZI[B)Ljava/lang/Object;") public static Object method869(@OriginalArg(2) byte[] arg0) { if (arg0 == null) { @@ -191,27 +67,7 @@ public final class Static33 { return arg0; } - @OriginalMember(owner = "client!cj", name = "a", descriptor = "(I)[Lclient!qf;") - public static Sprite[] method870() { - @Pc(6) Sprite[] local6 = new Sprite[Static165.anInt4038]; - for (@Pc(15) int local15 = 0; local15 < Static165.anInt4038; local15++) { - @Pc(30) int local30 = Static254.anIntArray488[local15] * Static26.anIntArray66[local15]; - @Pc(34) byte[] local34 = Static7.aByteArrayArray5[local15]; - @Pc(37) int[] local37 = new int[local30]; - for (@Pc(39) int local39 = 0; local39 < local30; local39++) { - local37[local39] = Static259.anIntArray513[local34[local39] & 0xFF]; - } - if (GlRenderer.enabled) { - local6[local15] = new GlSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local15], Static269.anIntArray252[local15], Static254.anIntArray488[local15], Static26.anIntArray66[local15], local37); - } else { - local6[local15] = new SoftwareSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local15], Static269.anIntArray252[local15], Static254.anIntArray488[local15], Static26.anIntArray66[local15], local37); - } - } - Static75.method1631(); - return local6; - } - - @OriginalMember(owner = "client!cj", name = "a", descriptor = "(IB)I") + @OriginalMember(owner = "client!cj", name = "a", descriptor = "(IB)I") public static int method872(@OriginalArg(0) int arg0) { return arg0 & 0xFF; } @@ -226,7 +82,7 @@ public final class Static33 { @Pc(36) int local36 = Static35.aCalendar1.get(11); @Pc(40) int local40 = Static35.aCalendar1.get(12); @Pc(44) int local44 = Static35.aCalendar1.get(13); - return Static34.concatenate(new JagString[] { Static219.aClass100Array149[local13 - 1], Static74.aClass100_461, Static123.parseInt(local17 / 10), Static123.parseInt(local17 % 10), Static270.aClass100_1089, Static138.aClass100Array102[local21], Static270.aClass100_1089, Static123.parseInt(local32), Static49.aClass100_351, Static123.parseInt(local36 / 10), Static123.parseInt(local36 % 10), Static264.aClass100_875, Static123.parseInt(local40 / 10), Static123.parseInt(local40 % 10), Static264.aClass100_875, Static123.parseInt(local44 / 10), Static123.parseInt(local44 % 10), Static55.aClass100_376 }); + return JagString.concatenate(new JagString[] { Static219.aClass100Array149[local13 - 1], Static74.aClass100_461, Static123.parseInt(local17 / 10), Static123.parseInt(local17 % 10), Static270.aClass100_1089, Static138.aClass100Array102[local21], Static270.aClass100_1089, Static123.parseInt(local32), Static49.aClass100_351, Static123.parseInt(local36 / 10), Static123.parseInt(local36 % 10), Static264.aClass100_875, Static123.parseInt(local40 / 10), Static123.parseInt(local40 % 10), Static264.aClass100_875, Static123.parseInt(local44 / 10), Static123.parseInt(local44 % 10), Static55.aClass100_376 }); } @OriginalMember(owner = "client!cj", name = "a", descriptor = "(ZIIIIIIFB)[[I") diff --git a/client/src/main/java/Static34.java b/client/src/main/java/Static34.java index 761b12c..7b1afb0 100644 --- a/client/src/main/java/Static34.java +++ b/client/src/main/java/Static34.java @@ -4,12 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static34 { - @OriginalMember(owner = "client!ck", name = "F", descriptor = "I") - public static int anInt1049; - - @OriginalMember(owner = "client!ck", name = "J", descriptor = "[[[B") - public static byte[][][] aByteArrayArrayArray3; - @OriginalMember(owner = "client!ck", name = "X", descriptor = "I") public static int anInt1060; @@ -115,12 +109,12 @@ public final class Static34 { arg0.anInt3396 = 1; arg0.anInt3407++; arg0.anInt3388++; - Static152.method2836(arg0.zFine, local18, arg0.xFine, arg0 == Static173.self, arg0.anInt3407); + SoundPlayer.playSeqSound(arg0.zFine, local18, arg0.xFine, arg0 == PlayerList.self, arg0.anInt3407); } if (arg0.anInt3407 >= local18.frames.length) { arg0.anInt3407 = 0; arg0.anInt3396 = 0; - Static152.method2836(arg0.zFine, local18, arg0.xFine, Static173.self == arg0, arg0.anInt3407); + SoundPlayer.playSeqSound(arg0.zFine, local18, arg0.xFine, PlayerList.self == arg0, arg0.anInt3407); } arg0.anInt3388 = arg0.anInt3407 + 1; if (arg0.anInt3388 >= local18.frames.length) { @@ -140,13 +134,13 @@ public final class Static34 { } else { if (arg0.anInt3399 < 0) { arg0.anInt3399 = 0; - Static152.method2836(arg0.zFine, local165, arg0.xFine, Static173.self == arg0, 0); + SoundPlayer.playSeqSound(arg0.zFine, local165, arg0.xFine, PlayerList.self == arg0, 0); } arg0.anInt3361++; if (arg0.anInt3399 < local165.frames.length && local165.anIntArray474[arg0.anInt3399] < arg0.anInt3361) { arg0.anInt3399++; arg0.anInt3361 = 1; - Static152.method2836(arg0.zFine, local165, arg0.xFine, Static173.self == arg0, arg0.anInt3399); + SoundPlayer.playSeqSound(arg0.zFine, local165, arg0.xFine, PlayerList.self == arg0, arg0.anInt3399); } if (arg0.anInt3399 >= local165.frames.length) { arg0.anInt3432 = -1; @@ -158,33 +152,33 @@ public final class Static34 { } } } - if (arg0.anInt3369 != -1 && arg0.anInt3420 <= 1) { - local18 = Static36.get(arg0.anInt3369); + if (arg0.seqId != -1 && arg0.anInt3420 <= 1) { + local18 = Static36.get(arg0.seqId); if (local18.anInt5363 == 1 && arg0.anInt3405 > 0 && Static83.loop >= arg0.anInt3395 && Static83.loop > arg0.anInt3386) { arg0.anInt3420 = 1; return; } } - if (arg0.anInt3369 != -1 && arg0.anInt3420 == 0) { - local18 = Static36.get(arg0.anInt3369); + if (arg0.seqId != -1 && arg0.anInt3420 == 0) { + local18 = Static36.get(arg0.seqId); if (local18 == null || local18.frames == null) { - arg0.anInt3369 = -1; + arg0.seqId = -1; } else { arg0.anInt3360++; if (arg0.anInt3425 < local18.frames.length && arg0.anInt3360 > local18.anIntArray474[arg0.anInt3425]) { arg0.anInt3360 = 1; arg0.anInt3425++; - Static152.method2836(arg0.zFine, local18, arg0.xFine, arg0 == Static173.self, arg0.anInt3425); + SoundPlayer.playSeqSound(arg0.zFine, local18, arg0.xFine, arg0 == PlayerList.self, arg0.anInt3425); } if (local18.frames.length <= arg0.anInt3425) { arg0.anInt3425 -= local18.anInt5362; arg0.anInt3371++; if (arg0.anInt3371 >= local18.anInt5357) { - arg0.anInt3369 = -1; + arg0.seqId = -1; } else if (arg0.anInt3425 >= 0 && local18.frames.length > arg0.anInt3425) { - Static152.method2836(arg0.zFine, local18, arg0.xFine, Static173.self == arg0, arg0.anInt3425); + SoundPlayer.playSeqSound(arg0.zFine, local18, arg0.xFine, PlayerList.self == arg0, arg0.anInt3425); } else { - arg0.anInt3369 = -1; + arg0.seqId = -1; } } arg0.anInt3373 = arg0.anInt3425 + 1; @@ -216,7 +210,7 @@ public final class Static34 { if (local545.anInt5399 < local570.frames.length && local545.anInt5404 > local570.anIntArray474[local545.anInt5399]) { local545.anInt5399++; local545.anInt5404 = 1; - Static152.method2836(arg0.zFine, local570, arg0.xFine, arg0 == Static173.self, local545.anInt5399); + SoundPlayer.playSeqSound(arg0.zFine, local570, arg0.xFine, arg0 == PlayerList.self, local545.anInt5399); } if (local570.frames.length <= local545.anInt5399) { local545.anInt5400++; @@ -224,7 +218,7 @@ public final class Static34 { if (local570.anInt5357 <= local545.anInt5400) { arg0.aClass147Array3[local156] = null; } else if (local545.anInt5399 >= 0 && local545.anInt5399 < local570.frames.length) { - Static152.method2836(arg0.zFine, local570, arg0.xFine, Static173.self == arg0, local545.anInt5399); + SoundPlayer.playSeqSound(arg0.zFine, local570, arg0.xFine, PlayerList.self == arg0, local545.anInt5399); } else { arg0.aClass147Array3[local156] = null; } @@ -244,11 +238,4 @@ public final class Static34 { } } - @OriginalMember(owner = "client!ck", name = "a", descriptor = "([Lclient!na;B)Lclient!na;") - public static JagString concatenate(@OriginalArg(0) JagString[] arg0) { - if (arg0.length < 2) { - throw new IllegalArgumentException(); - } - return Static118.method2355(0, arg0.length, arg0); - } } diff --git a/client/src/main/java/Static36.java b/client/src/main/java/Static36.java index 0af8c5c..dcec4b8 100644 --- a/client/src/main/java/Static36.java +++ b/client/src/main/java/Static36.java @@ -4,18 +4,12 @@ import org.openrs2.deob.annotation.Pc; public final class Static36 { - @OriginalMember(owner = "client!client", name = "W", descriptor = "I") - public static int anInt1165; - @OriginalMember(owner = "client!client", name = "kb", descriptor = "[[Lclient!hg;") public static GlTile[][] surfaceHdTiles; @OriginalMember(owner = "client!client", name = "lb", descriptor = "[I") public static int[] mapFileIds; - @OriginalMember(owner = "client!client", name = "U", descriptor = "Lclient!sc;") - public static final HashTable aClass133_3 = new HashTable(16); - @OriginalMember(owner = "client!client", name = "a", descriptor = "(Lclient!be;)Lclient!be;") public static Component method938(@OriginalArg(0) Component arg0) { @Pc(4) int local4 = method940(arg0).method505(); @@ -93,7 +87,7 @@ public final class Static36 { continue; } if (local9.noClickThrough && Static215.anInt4873 >= local61 && Static223.anInt5032 >= local63 && Static215.anInt4873 < local65 && Static223.anInt5032 < local67) { - for (@Pc(164) HookRequest local164 = (HookRequest) Static185.lowPriorityRequests.method2289(); local164 != null; local164 = (HookRequest) Static185.lowPriorityRequests.method2288()) { + for (@Pc(164) HookRequest local164 = (HookRequest) InterfaceList.lowPriorityRequests.method2289(); local164 != null; local164 = (HookRequest) InterfaceList.lowPriorityRequests.method2288()) { if (local164.aBoolean158) { local164.unlink(); local164.source.aBoolean19 = false; @@ -129,7 +123,7 @@ public final class Static36 { if (local9.anIntArray49 == null || Static83.loop >= local9.anIntArray49[local243]) { @Pc(279) byte local279 = local9.aByteArray7[local243]; if (local279 == 0 || ((local279 & 0x2) == 0 || Keyboard.pressedKeys[Keyboard.KEY_ALT]) && ((local279 & 0x1) == 0 || Keyboard.pressedKeys[Keyboard.KEY_CTRL]) && ((local279 & 0x4) == 0 || Keyboard.pressedKeys[Keyboard.KEY_SHIFT])) { - Static263.method4512(Static186.EMPTY, -1, local243 + 1, local9.id); + Static263.method4512(JagString.EMPTY, -1, local243 + 1, local9.id); local322 = local9.anIntArray46[local243]; if (local9.anIntArray49 == null) { local9.anIntArray49 = new int[local9.aByteArray8.length]; @@ -165,7 +159,7 @@ public final class Static36 { local399.source = local9; local399.mouseY = Static58.wheelRotation; local399.arguments = local9.anObjectArray10; - Static185.lowPriorityRequests.method2282(local399); + InterfaceList.lowPriorityRequests.addTail(local399); } if (Static105.aClass13_14 != null || Static118.aClass13_15 != null || Static60.aBoolean108 || local9.anInt453 != 1400 && Static137.anInt3337 > 0) { local221 = false; @@ -190,12 +184,12 @@ public final class Static36 { Static24.component = local9; if (local221) { if (Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Static191.staffModLevel > 0) { - local243 = (int) ((double) (Static7.clickX - local50 - local9.anInt445 / 2) * 2.0D / (double) Static83.aFloat3); - local508 = (int) ((double) (Static60.clickY - local55 - local9.anInt459 / 2) * 2.0D / (double) Static83.aFloat3); - local322 = Static13.anInt435 + local243; - @Pc(516) int local516 = Static28.anInt919 + local508; - @Pc(520) int local520 = local322 + Static158.anInt3846; - @Pc(528) int local528 = Static181.anInt4296 + Static2.anInt13 - local516 - 1; + local243 = (int) ((double) (Static7.clickX - local50 - local9.anInt445 / 2) * 2.0D / (double) WorldMap.zoom); + local508 = (int) ((double) (Static60.clickY - local55 - local9.anInt459 / 2) * 2.0D / (double) WorldMap.zoom); + local322 = WorldMap.anInt435 + local243; + @Pc(516) int local516 = WorldMap.anInt919 + local508; + @Pc(520) int local520 = local322 + WorldMap.originX; + @Pc(528) int local528 = WorldMap.length + WorldMap.originZ - local516 - 1; Static61.teleport(local520, local528, 0); Static153.method2909(); continue; @@ -207,13 +201,13 @@ public final class Static36 { } if (local212 && Static137.anInt3337 > 0) { if (Static137.anInt3337 == 1 && (Static246.anInt5388 != Static215.anInt4873 || Static165.anInt4035 != Static223.anInt5032)) { - Static197.anInt4620 = Static13.anInt435; - Static71.anInt1885 = Static28.anInt919; + Static197.anInt4620 = WorldMap.anInt435; + Static71.anInt1885 = WorldMap.anInt919; Static137.anInt3337 = 2; } if (Static137.anInt3337 == 2) { - Static98.method1964(Static197.anInt4620 + (int) ((double) (Static246.anInt5388 - Static215.anInt4873) * 2.0D / (double) Static138.aFloat14)); - Static277.method4641(Static71.anInt1885 + (int) ((double) (Static165.anInt4035 - Static223.anInt5032) * 2.0D / (double) Static138.aFloat14)); + Static98.method1964(Static197.anInt4620 + (int) ((double) (Static246.anInt5388 - Static215.anInt4873) * 2.0D / (double) WorldMap.targetZoom)); + Static277.method4641(Static71.anInt1885 + (int) ((double) (Static165.anInt4035 - Static223.anInt5032) * 2.0D / (double) WorldMap.targetZoom)); } continue; } @@ -242,7 +236,7 @@ public final class Static36 { local399.mouseX = Static7.clickX - local50; local399.mouseY = Static60.clickY - local55; local399.arguments = local9.anObjectArray5; - Static185.lowPriorityRequests.method2282(local399); + InterfaceList.lowPriorityRequests.addTail(local399); } } if (local9.aBoolean24 && local212 && local9.anObjectArray6 != null) { @@ -252,7 +246,7 @@ public final class Static36 { local399.mouseX = Static215.anInt4873 - local50; local399.mouseY = Static223.anInt5032 - local55; local399.arguments = local9.anObjectArray6; - Static185.lowPriorityRequests.method2282(local399); + InterfaceList.lowPriorityRequests.addTail(local399); } if (local9.aBoolean24 && !local212) { local9.aBoolean24 = false; @@ -263,7 +257,7 @@ public final class Static36 { local399.mouseX = Static215.anInt4873 - local50; local399.mouseY = Static223.anInt5032 - local55; local399.arguments = local9.anObjectArray18; - Static115.mediumPriorityRequests.method2282(local399); + Static115.mediumPriorityRequests.addTail(local399); } } if (local212 && local9.anObjectArray9 != null) { @@ -273,7 +267,7 @@ public final class Static36 { local399.mouseX = Static215.anInt4873 - local50; local399.mouseY = Static223.anInt5032 - local55; local399.arguments = local9.anObjectArray9; - Static185.lowPriorityRequests.method2282(local399); + InterfaceList.lowPriorityRequests.addTail(local399); } if (!local9.aBoolean19 && local207) { local9.aBoolean19 = true; @@ -284,7 +278,7 @@ public final class Static36 { local399.mouseX = Static215.anInt4873 - local50; local399.mouseY = Static223.anInt5032 - local55; local399.arguments = local9.anObjectArray19; - Static185.lowPriorityRequests.method2282(local399); + InterfaceList.lowPriorityRequests.addTail(local399); } } if (local9.aBoolean19 && local207 && local9.anObjectArray23 != null) { @@ -294,7 +288,7 @@ public final class Static36 { local399.mouseX = Static215.anInt4873 - local50; local399.mouseY = Static223.anInt5032 - local55; local399.arguments = local9.anObjectArray23; - Static185.lowPriorityRequests.method2282(local399); + InterfaceList.lowPriorityRequests.addTail(local399); } if (local9.aBoolean19 && !local207) { local9.aBoolean19 = false; @@ -305,14 +299,14 @@ public final class Static36 { local399.mouseX = Static215.anInt4873 - local50; local399.mouseY = Static223.anInt5032 - local55; local399.arguments = local9.anObjectArray24; - Static115.mediumPriorityRequests.method2282(local399); + Static115.mediumPriorityRequests.addTail(local399); } } if (local9.anObjectArray22 != null) { local399 = new HookRequest(); local399.source = local9; local399.arguments = local9.anObjectArray22; - Static4.highPriorityRequests.method2282(local399); + Static4.highPriorityRequests.addTail(local399); } @Pc(966) HookRequest local966; if (local9.anObjectArray4 != null && Static4.updatedVarcsWriterIndex > local9.anInt511) { @@ -320,7 +314,7 @@ public final class Static36 { local399 = new HookRequest(); local399.source = local9; local399.arguments = local9.anObjectArray4; - Static185.lowPriorityRequests.method2282(local399); + InterfaceList.lowPriorityRequests.addTail(local399); } else { label563: for (local243 = local9.anInt511; local243 < Static4.updatedVarcsWriterIndex; local243++) { local508 = Static138.updatedVarcs[local243 & 0x1F]; @@ -329,7 +323,7 @@ public final class Static36 { local966 = new HookRequest(); local966.source = local9; local966.arguments = local9.anObjectArray4; - Static185.lowPriorityRequests.method2282(local966); + InterfaceList.lowPriorityRequests.addTail(local966); break label563; } } @@ -342,7 +336,7 @@ public final class Static36 { local399 = new HookRequest(); local399.source = local9; local399.arguments = local9.anObjectArray15; - Static185.lowPriorityRequests.method2282(local399); + InterfaceList.lowPriorityRequests.addTail(local399); } else { label539: for (local243 = local9.anInt487; local243 < Static72.updatedVarcstrsWriterIndex; local243++) { local508 = Static233.updatedVarcstrs[local243 & 0x1F]; @@ -351,7 +345,7 @@ public final class Static36 { local966 = new HookRequest(); local966.source = local9; local966.arguments = local9.anObjectArray15; - Static185.lowPriorityRequests.method2282(local966); + InterfaceList.lowPriorityRequests.addTail(local966); break label539; } } @@ -364,7 +358,7 @@ public final class Static36 { local399 = new HookRequest(); local399.source = local9; local399.arguments = local9.anObjectArray25; - Static185.lowPriorityRequests.method2282(local399); + InterfaceList.lowPriorityRequests.addTail(local399); } else { label515: for (local243 = local9.anInt471; local243 < Static70.updatedVarpsWriterIndex; local243++) { local508 = Static83.updatedVarps[local243 & 0x1F]; @@ -373,7 +367,7 @@ public final class Static36 { local966 = new HookRequest(); local966.source = local9; local966.arguments = local9.anObjectArray25; - Static185.lowPriorityRequests.method2282(local966); + InterfaceList.lowPriorityRequests.addTail(local966); break label515; } } @@ -386,7 +380,7 @@ public final class Static36 { local399 = new HookRequest(); local399.source = local9; local399.arguments = local9.anObjectArray7; - Static185.lowPriorityRequests.method2282(local399); + InterfaceList.lowPriorityRequests.addTail(local399); } else { label491: for (local243 = local9.anInt493; local243 < Static111.anInt2901; local243++) { local508 = Static27.anIntArray70[local243 & 0x1F]; @@ -395,7 +389,7 @@ public final class Static36 { local966 = new HookRequest(); local966.source = local9; local966.arguments = local9.anObjectArray7; - Static185.lowPriorityRequests.method2282(local966); + InterfaceList.lowPriorityRequests.addTail(local966); break label491; } } @@ -408,7 +402,7 @@ public final class Static36 { local399 = new HookRequest(); local399.source = local9; local399.arguments = local9.anObjectArray2; - Static185.lowPriorityRequests.method2282(local399); + InterfaceList.lowPriorityRequests.addTail(local399); } else { label467: for (local243 = local9.anInt525; local243 < Static89.anInt2385; local243++) { local508 = Static249.anIntArray478[local243 & 0x1F]; @@ -417,7 +411,7 @@ public final class Static36 { local966 = new HookRequest(); local966.source = local9; local966.arguments = local9.anObjectArray2; - Static185.lowPriorityRequests.method2282(local966); + InterfaceList.lowPriorityRequests.addTail(local966); break label467; } } @@ -429,31 +423,31 @@ public final class Static36 { local399 = new HookRequest(); local399.source = local9; local399.arguments = local9.anObjectArray20; - Static185.lowPriorityRequests.method2282(local399); + InterfaceList.lowPriorityRequests.addTail(local399); } if (Static185.anInt4369 > local9.anInt482 && local9.anObjectArray1 != null) { local399 = new HookRequest(); local399.source = local9; local399.arguments = local9.anObjectArray1; - Static185.lowPriorityRequests.method2282(local399); + InterfaceList.lowPriorityRequests.addTail(local399); } if (Static278.anInt5867 > local9.anInt482 && local9.anObjectArray28 != null) { local399 = new HookRequest(); local399.source = local9; local399.arguments = local9.anObjectArray28; - Static185.lowPriorityRequests.method2282(local399); + InterfaceList.lowPriorityRequests.addTail(local399); } if (Static207.anInt4778 > local9.anInt482 && local9.anObjectArray21 != null) { local399 = new HookRequest(); local399.source = local9; local399.arguments = local9.anObjectArray21; - Static185.lowPriorityRequests.method2282(local399); + InterfaceList.lowPriorityRequests.addTail(local399); } if (Static209.miscTransmitAt > local9.anInt482 && local9.anObjectArray30 != null) { local399 = new HookRequest(); local399.source = local9; local399.arguments = local9.anObjectArray30; - Static185.lowPriorityRequests.method2282(local399); + InterfaceList.lowPriorityRequests.addTail(local399); } local9.anInt482 = Static119.transmitTimer; if (local9.anObjectArray14 != null) { @@ -463,14 +457,14 @@ public final class Static36 { local1430.keyCode = Static227.keyCodes[local243]; local1430.keyChar = Static205.keyChars[local243]; local1430.arguments = local9.anObjectArray14; - Static185.lowPriorityRequests.method2282(local1430); + InterfaceList.lowPriorityRequests.addTail(local1430); } } if (Static13.aBoolean16 && local9.anObjectArray13 != null) { local399 = new HookRequest(); local399.source = local9; local399.arguments = local9.anObjectArray13; - Static185.lowPriorityRequests.method2282(local399); + InterfaceList.lowPriorityRequests.addTail(local399); } } } diff --git a/client/src/main/java/Static38.java b/client/src/main/java/Static38.java index c9c07ad..e646b70 100644 --- a/client/src/main/java/Static38.java +++ b/client/src/main/java/Static38.java @@ -12,63 +12,63 @@ public final class Static38 { @OriginalMember(owner = "client!cn", name = "a", descriptor = "(BIIIIIIII)V") public static void method959(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) { - for (@Pc(11) int local11 = 0; local11 < Static203.aClass134_1.anInt5074; local11++) { - if (Static203.aClass134_1.method3890(local11)) { - @Pc(32) int local32 = Static203.aClass134_1.aShortArray73[local11] - Static158.anInt3846; - @Pc(43) int local43 = Static2.anInt13 + Static181.anInt4296 - Static203.aClass134_1.aShortArray72[local11] - 1; + for (@Pc(11) int local11 = 0; local11 < WorldMap.labels.anInt5074; local11++) { + if (WorldMap.labels.method3890(local11)) { + @Pc(32) int local32 = WorldMap.labels.aShortArray73[local11] - WorldMap.originX; + @Pc(43) int local43 = WorldMap.originZ + WorldMap.length - WorldMap.labels.aShortArray72[local11] - 1; @Pc(59) int local59 = arg0 + (arg3 - arg0) * (local32 - arg2) / (arg6 - arg2); - @Pc(64) int local64 = Static203.aClass134_1.method3894(local11); + @Pc(64) int local64 = WorldMap.labels.method3894(local11); @Pc(80) int local80 = (arg7 - arg1) * (local43 - arg5) / (arg4 - arg5) + arg1; @Pc(82) int local82 = 16777215; @Pc(84) WorldMapFont local84 = null; if (local64 == 0) { - if ((double) Static83.aFloat3 == 3.0D) { - local84 = Static273.aClass41_7; + if ((double) WorldMap.zoom == 3.0D) { + local84 = WorldMap.font11; } - if ((double) Static83.aFloat3 == 4.0D) { - local84 = Static152.aClass41_3; + if ((double) WorldMap.zoom == 4.0D) { + local84 = WorldMap.font12; } - if ((double) Static83.aFloat3 == 6.0D) { - local84 = Static169.aClass41_5; + if ((double) WorldMap.zoom == 6.0D) { + local84 = WorldMap.font14; } - if ((double) Static83.aFloat3 >= 8.0D) { - local84 = Static130.aClass41_1; + if ((double) WorldMap.zoom >= 8.0D) { + local84 = WorldMap.font17; } } if (local64 == 1) { - if ((double) Static83.aFloat3 == 3.0D) { - local84 = Static169.aClass41_5; + if ((double) WorldMap.zoom == 3.0D) { + local84 = WorldMap.font14; } - if ((double) Static83.aFloat3 == 4.0D) { - local84 = Static130.aClass41_1; + if ((double) WorldMap.zoom == 4.0D) { + local84 = WorldMap.font17; } - if ((double) Static83.aFloat3 == 6.0D) { - local84 = Static203.aClass41_8; + if ((double) WorldMap.zoom == 6.0D) { + local84 = WorldMap.font19; } - if ((double) Static83.aFloat3 >= 8.0D) { - local84 = Static130.aClass41_2; + if ((double) WorldMap.zoom >= 8.0D) { + local84 = WorldMap.font22; } } if (local64 == 2) { - if ((double) Static83.aFloat3 == 3.0D) { - local84 = Static203.aClass41_8; + if ((double) WorldMap.zoom == 3.0D) { + local84 = WorldMap.font19; } local82 = 16755200; - if ((double) Static83.aFloat3 == 4.0D) { - local84 = Static130.aClass41_2; + if ((double) WorldMap.zoom == 4.0D) { + local84 = WorldMap.font22; } - if ((double) Static83.aFloat3 == 6.0D) { - local84 = Static270.aClass41_9; + if ((double) WorldMap.zoom == 6.0D) { + local84 = WorldMap.font26; } - if ((double) Static83.aFloat3 >= 8.0D) { - local84 = Static160.aClass41_4; + if ((double) WorldMap.zoom >= 8.0D) { + local84 = WorldMap.font30; } } - if (Static203.aClass134_1.anIntArray444[local11] != -1) { - local82 = Static203.aClass134_1.anIntArray444[local11]; + if (WorldMap.labels.anIntArray444[local11] != -1) { + local82 = WorldMap.labels.anIntArray444[local11]; } if (local84 != null) { - @Pc(211) int local211 = Static114.aClass3_Sub2_Sub9_42.splitParagraph(Static203.aClass134_1.aClass100Array153[local11], null, Static45.aClass100Array53); + @Pc(211) int local211 = Fonts.p11Full.splitParagraph(WorldMap.labels.aClass100Array153[local11], null, Static45.aClass100Array53); local80 -= local84.method1503() * (local211 - 1) / 2; local80 += local84.method1511() / 2; for (@Pc(231) int local231 = 0; local231 < local211; local231++) { @@ -139,8 +139,8 @@ public final class Static38 { public static int poll(@OriginalArg(0) boolean arg0) { @Pc(4) long local4 = MonotonicClock.currentTimeMillis(); for (@Pc(28) LongNode local28 = arg0 ? (LongNode) Static199.aClass133_20.head() : (LongNode) Static199.aClass133_20.next(); local28 != null; local28 = (LongNode) Static199.aClass133_20.next()) { - if ((local28.aLong55 & 0x3FFFFFFFFFFFFFFFL) < local4) { - if ((local28.aLong55 & 0x4000000000000000L) != 0L) { + if ((local28.value & 0x3FFFFFFFFFFFFFFFL) < local4) { + if ((local28.value & 0x4000000000000000L) != 0L) { @Pc(58) int local58 = (int) local28.key; Static7.varps[local58] = Static106.anIntArray257[local58]; local28.unlink(); @@ -155,7 +155,7 @@ public final class Static38 { @OriginalMember(owner = "client!cn", name = "b", descriptor = "(ZI)V") public static void method964(@OriginalArg(0) boolean arg0) { @Pc(3) int local3 = Static267.anInt5774; - if (Static115.anInt2939 == Static173.self.xFine >> 7 && Static173.self.zFine >> 7 == Static84.anInt2255) { + if (Static115.anInt2939 == PlayerList.self.xFine >> 7 && PlayerList.self.zFine >> 7 == Static84.anInt2255) { Static115.anInt2939 = 0; } if (arg0) { @@ -171,7 +171,7 @@ public final class Static38 { @Pc(106) int local106; for (local28 = 0; local28 < local3; local28++) { if (arg0) { - local39 = Static173.self; + local39 = PlayerList.self; } else { local39 = Static159.players[Static105.anIntArray256[local28]]; } @@ -214,7 +214,7 @@ public final class Static38 { label220: for (local28 = 0; local28 < local3; local28++) { @Pc(272) long local272; if (arg0) { - local39 = Static173.self; + local39 = PlayerList.self; local272 = 8791798054912L; } else { local39 = Static159.players[Static105.anIntArray256[local28]]; @@ -222,7 +222,7 @@ public final class Static38 { } if (local39 != null && local39.method2682()) { local39.aBoolean98 = false; - if ((Static15.manyIdleAnimations && Static267.anInt5774 > 200 || Static267.anInt5774 > 50) && !arg0 && local39.anInt3366 == local39.method2681().idleAnimationId) { + if ((Preferences.manyIdleAnimations && Static267.anInt5774 > 200 || Static267.anInt5774 > 50) && !arg0 && local39.anInt3366 == local39.method2681().idleAnimationId) { local39.aBoolean98 = true; } local82 = local39.getSize(); @@ -291,27 +291,4 @@ public final class Static38 { } } - @OriginalMember(owner = "client!cn", name = "e", descriptor = "(B)V") - public static void method965() { - if (Static13.anInt435 < 0) { - Static217.anInt4901 = -1; - Static13.anInt435 = 0; - Static142.anInt3482 = -1; - } - if (Static13.anInt435 > Static48.anInt1449) { - Static217.anInt4901 = -1; - Static13.anInt435 = Static48.anInt1449; - Static142.anInt3482 = -1; - } - if (Static28.anInt919 < 0) { - Static142.anInt3482 = -1; - Static217.anInt4901 = -1; - Static28.anInt919 = 0; - } - if (Static181.anInt4296 < Static28.anInt919) { - Static28.anInt919 = Static181.anInt4296; - Static217.anInt4901 = -1; - Static142.anInt3482 = -1; - } - } } diff --git a/client/src/main/java/Static4.java b/client/src/main/java/Static4.java index d0dde4c..44afb10 100644 --- a/client/src/main/java/Static4.java +++ b/client/src/main/java/Static4.java @@ -20,9 +20,6 @@ public final class Static4 { @OriginalMember(owner = "client!ac", name = "l", descriptor = "Lclient!ck;") public static final BasType aClass20_1 = new BasType(); - @OriginalMember(owner = "client!ac", name = "m", descriptor = "Lclient!na;") - public static final JagString aClass100_7 = Static28.parse("overlay"); - @OriginalMember(owner = "client!ac", name = "n", descriptor = "I") public static int anInt36 = 0; @@ -67,16 +64,16 @@ public final class Static4 { @OriginalMember(owner = "client!ac", name = "a", descriptor = "(B)Z") public static boolean method26() throws IOException { - if (Static124.socket == null) { + if (Protocol.socket == null) { return false; } - @Pc(14) int local14 = Static124.socket.available(); + @Pc(14) int local14 = Protocol.socket.available(); if (local14 == 0) { return false; } if (Static164.anInt3985 == -1) { local14--; - Static124.socket.read(0, 1, Static57.aClass3_Sub15_Sub1_3.data); + Protocol.socket.read(0, 1, Static57.aClass3_Sub15_Sub1_3.data); Static57.aClass3_Sub15_Sub1_3.offset = 0; Static164.anInt3985 = Static57.aClass3_Sub15_Sub1_3.method2243(); Static223.anInt5028 = Static234.anIntArray456[Static164.anInt3985]; @@ -85,7 +82,7 @@ public final class Static4 { if (local14 <= 0) { return false; } - Static124.socket.read(0, 1, Static57.aClass3_Sub15_Sub1_3.data); + Protocol.socket.read(0, 1, Static57.aClass3_Sub15_Sub1_3.data); local14--; Static223.anInt5028 = Static57.aClass3_Sub15_Sub1_3.data[0] & 0xFF; } @@ -94,7 +91,7 @@ public final class Static4 { return false; } local14 -= 2; - Static124.socket.read(0, 2, Static57.aClass3_Sub15_Sub1_3.data); + Protocol.socket.read(0, 2, Static57.aClass3_Sub15_Sub1_3.data); Static57.aClass3_Sub15_Sub1_3.offset = 0; Static223.anInt5028 = Static57.aClass3_Sub15_Sub1_3.g2(); } @@ -102,7 +99,7 @@ public final class Static4 { return false; } Static57.aClass3_Sub15_Sub1_3.offset = 0; - Static124.socket.read(0, Static223.anInt5028, Static57.aClass3_Sub15_Sub1_3.data); + Protocol.socket.read(0, Static223.anInt5028, Static57.aClass3_Sub15_Sub1_3.data); Static49.anInt1462 = Static5.anInt45; Static5.anInt45 = Static230.anInt5152; Static230.anInt5152 = Static164.anInt3985; @@ -181,20 +178,20 @@ public final class Static4 { } } if (!local262 && Static11.anInt384 == 0) { - Static103.method2231(local156, 10, Static186.EMPTY); + Static103.method2231(local156, 10, JagString.EMPTY); } } else if (local245.method3130(Static141.aClass100_664)) { local156 = local245.substring(local245.indexOf(Static141.aClass100_664), 0); - Static103.method2231(Static186.EMPTY, 11, local156); + Static103.method2231(JagString.EMPTY, 11, local156); } else if (local245.method3130(Static138.aClass100_654)) { local156 = local245.substring(local245.indexOf(Static138.aClass100_654), 0); if (Static11.anInt384 == 0) { - Static103.method2231(Static186.EMPTY, 12, local156); + Static103.method2231(JagString.EMPTY, 12, local156); } } else if (local245.method3130(Static244.aClass100_1014)) { local156 = local245.substring(local245.indexOf(Static244.aClass100_1014), 0); if (Static11.anInt384 == 0) { - Static103.method2231(Static186.EMPTY, 13, local156); + Static103.method2231(JagString.EMPTY, 13, local156); } } else if (local245.method3130(Static56.aClass100_379)) { local262 = false; @@ -207,7 +204,7 @@ public final class Static4 { } } if (!local262 && Static11.anInt384 == 0) { - Static103.method2231(local156, 14, Static186.EMPTY); + Static103.method2231(local156, 14, JagString.EMPTY); } } else if (local245.method3130(Static112.aClass100_574)) { local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); @@ -220,7 +217,7 @@ public final class Static4 { } } if (!local262 && Static11.anInt384 == 0) { - Static103.method2231(local156, 15, Static186.EMPTY); + Static103.method2231(local156, 15, JagString.EMPTY); } } else if (local245.method3130(Static217.aClass100_916)) { local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); @@ -233,7 +230,7 @@ public final class Static4 { } } if (!local262 && Static11.anInt384 == 0) { - Static103.method2231(local156, 16, Static186.EMPTY); + Static103.method2231(local156, 16, JagString.EMPTY); } } else if (local245.method3130(Static164.aClass100_770)) { local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); @@ -250,7 +247,7 @@ public final class Static4 { Static103.method2231(local156, 21, local506); } } else { - Static103.method2231(Static186.EMPTY, 0, local245); + Static103.method2231(JagString.EMPTY, 0, local245); } Static164.anInt3985 = -1; return true; @@ -331,9 +328,9 @@ public final class Static4 { Static251.anInt5447 = (Static251.anInt5447 + 1) % 100; @Pc(999) JagString local999 = Static230.method3953(local916).method770(Static57.aClass3_Sub15_Sub1_3); if (local908 == 2 || local908 == 3) { - Static154.method2928(local916, 20, local999, Static79.decode37(local275).method3125(), Static34.concatenate(new JagString[] { Static44.aClass100_336, Static79.decode37(local884).method3125() })); + Static154.method2928(local916, 20, local999, Static79.decode37(local275).method3125(), JagString.concatenate(new JagString[] { Static44.aClass100_336, Static79.decode37(local884).method3125() })); } else if (local908 == 1) { - Static154.method2928(local916, 20, local999, Static79.decode37(local275).method3125(), Static34.concatenate(new JagString[] { Static65.aClass100_435, Static79.decode37(local884).method3125() })); + Static154.method2928(local916, 20, local999, Static79.decode37(local275).method3125(), JagString.concatenate(new JagString[] { Static65.aClass100_435, Static79.decode37(local884).method3125() })); } else { Static154.method2928(local916, 20, local999, Static79.decode37(local275).method3125(), Static79.decode37(local884).method3125()); } @@ -463,10 +460,10 @@ public final class Static4 { if (local786 == 2) { Static5.method34(); } - Static154.topLevelInterface = local133; + InterfaceList.topLevelInterface = local133; Static81.method1753(local133); Static210.method3712(false); - Static74.method1626(Static154.topLevelInterface); + Static74.method1626(InterfaceList.topLevelInterface); for (local171 = 0; local171 < 100; local171++) { Static186.aBooleanArray100[local171] = true; } @@ -587,7 +584,7 @@ public final class Static4 { if (local1986 != -1) { local1994 = Static36.get(local1986); if (local1994 != null && local1994.frames != null) { - Static152.method2836(local1894.zFine, local1994, local1894.xFine, false, 0); + SoundPlayer.playSeqSound(local1894.zFine, local1994, local1894.xFine, false, 0); } } } @@ -597,7 +594,7 @@ public final class Static4 { local1146 = local864 & 0xFFFF; @Pc(2033) Player local2033; if (Static16.anInt549 == local1146) { - local2033 = Static173.self; + local2033 = PlayerList.self; } else { local2033 = Static159.players[local1146]; } @@ -627,7 +624,7 @@ public final class Static4 { if (local1986 != -1) { local1994 = Static36.get(local1986); if (local1994 != null && local1994.frames != null) { - Static152.method2836(local2033.zFine, local1994, local2033.xFine, local2033 == Static173.self, 0); + SoundPlayer.playSeqSound(local2033.zFine, local1994, local2033.xFine, local2033 == PlayerList.self, 0); } } } @@ -642,7 +639,7 @@ public final class Static4 { local1160 = local1160 * 128 + 64; local277 = local277 * 128 + 64; @Pc(2241) SpotAnim local2241 = new SpotAnim(local171, local1146, local277, local1160, Static207.method3685(local1146, local277, local1160) - local786, local133, Static83.loop); - Static99.aClass69_64.method2282(new SpotAnimNode(local2241)); + Static99.aClass69_64.addTail(new SpotAnimNode(local2241)); } } Static164.anInt3985 = -1; @@ -767,7 +764,7 @@ public final class Static4 { local786 = Static57.aClass3_Sub15_Sub1_3.g1add(); local864 = Static57.aClass3_Sub15_Sub1_3.g1(); Static55.level = local786 >> 1; - Static173.self.method1265(local133, (local786 & 0x1) == 1, local864); + PlayerList.self.method1265(local133, (local786 & 0x1) == 1, local864); Static164.anInt3985 = -1; return true; } else { @@ -783,7 +780,7 @@ public final class Static4 { local884 &= Long.MAX_VALUE; local262 = false; } - local506 = Static186.EMPTY; + local506 = JagString.EMPTY; if (local864 > 0) { local506 = Static57.aClass3_Sub15_Sub1_3.gjstr(); } @@ -793,10 +790,10 @@ public final class Static4 { if (local864 != Static104.anIntArray255[local1986]) { Static104.anIntArray255[local1986] = local864; if (local864 > 0) { - Static103.method2231(Static186.EMPTY, 5, Static34.concatenate(new JagString[] { local2834, LocalizedText.FRIENDLOGIN})); + Static103.method2231(JagString.EMPTY, 5, JagString.concatenate(new JagString[] { local2834, LocalizedText.FRIENDLOGIN})); } if (local864 == 0) { - Static103.method2231(Static186.EMPTY, 5, Static34.concatenate(new JagString[] { local2834, LocalizedText.FRIENDLOGOUT})); + Static103.method2231(JagString.EMPTY, 5, JagString.concatenate(new JagString[] { local2834, LocalizedText.FRIENDLOGOUT})); } } Static214.aClass100Array170[local1986] = local506; @@ -912,9 +909,9 @@ public final class Static4 { Static251.anInt5447 = (Static251.anInt5447 + 1) % 100; local3020 = Static230.method3953(local1986).method770(Static57.aClass3_Sub15_Sub1_3); if (local1160 == 2) { - Static154.method2928(local1986, 18, local3020, null, Static34.concatenate(new JagString[] { Static44.aClass100_336, Static79.decode37(local884).method3125() })); + Static154.method2928(local1986, 18, local3020, null, JagString.concatenate(new JagString[] { Static44.aClass100_336, Static79.decode37(local884).method3125() })); } else if (local1160 == 1) { - Static154.method2928(local1986, 18, local3020, null, Static34.concatenate(new JagString[] { Static65.aClass100_435, Static79.decode37(local884).method3125() })); + Static154.method2928(local1986, 18, local3020, null, JagString.concatenate(new JagString[] { Static65.aClass100_435, Static79.decode37(local884).method3125() })); } else { Static154.method2928(local1986, 18, local3020, null, Static79.decode37(local884).method3125()); } @@ -946,8 +943,8 @@ public final class Static4 { Static43.redraw(local3490); Static17.method531(local3490, true); } - if (Static154.topLevelInterface != -1) { - Static54.method1304(1, Static154.topLevelInterface); + if (InterfaceList.topLevelInterface != -1) { + Static54.method1304(1, InterfaceList.topLevelInterface); } } Static164.anInt3985 = -1; @@ -1002,8 +999,8 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 209) { - if (Static154.topLevelInterface != -1) { - Static54.method1304(0, Static154.topLevelInterface); + if (InterfaceList.topLevelInterface != -1) { + Static54.method1304(0, InterfaceList.topLevelInterface); } Static164.anInt3985 = -1; return true; @@ -1037,12 +1034,12 @@ public final class Static4 { return true; } else if (Static164.anInt3985 == 42) { if (GameShell.fullScreenFrame != null) { - Static241.setWindowMode(false, Static214.windowMode, -1, -1); + Static241.setWindowMode(false, Preferences.favoriteWorlds, -1, -1); } @Pc(3848) byte[] local3848 = new byte[Static223.anInt5028]; Static57.aClass3_Sub15_Sub1_3.method2237(local3848, Static223.anInt5028); local156 = Static10.decodeString(local3848, Static223.anInt5028, 0); - if (GameShell.frame == null && (SignLink.anInt5928 == 3 || !SignLink.osName.startsWith("win") || Static178.haveIe6)) { + if (GameShell.frame == null && (SignLink.anInt5928 == 3 || !SignLink.osName.startsWith("win") || client.haveIe6)) { Static169.openUrl(local156, true); } else { Static175.url = local156; @@ -1085,12 +1082,12 @@ public final class Static4 { } else if (Static164.anInt3985 == 131) { for (local133 = 0; local133 < Static159.players.length; local133++) { if (Static159.players[local133] != null) { - Static159.players[local133].anInt3369 = -1; + Static159.players[local133].seqId = -1; } } for (local133 = 0; local133 < Static175.npcs.length; local133++) { if (Static175.npcs[local133] != null) { - Static175.npcs[local133].anInt3369 = -1; + Static175.npcs[local133].seqId = -1; } } Static164.anInt3985 = -1; @@ -1101,7 +1098,7 @@ public final class Static4 { local786 = local133 >> 6; local4084.anInt4058 = local133 & 0x3F; local4084.anInt4048 = Static57.aClass3_Sub15_Sub1_3.g1(); - if (local4084.anInt4048 >= 0 && local4084.anInt4048 < Static276.aClass3_Sub2_Sub1Array11.length) { + if (local4084.anInt4048 >= 0 && local4084.anInt4048 < Sprites.headhints.length) { if (local4084.anInt4058 == 1 || local4084.anInt4058 == 10) { local4084.anInt4057 = Static57.aClass3_Sub15_Sub1_3.g2(); Static57.aClass3_Sub15_Sub1_3.offset += 3; @@ -1215,9 +1212,9 @@ public final class Static4 { Static251.anInt5447 = (Static251.anInt5447 + 1) % 100; @Pc(4518) JagString local4518 = Static218.method2862(Static65.method1497(Static57.aClass3_Sub15_Sub1_3).method3116()); if (local1160 == 2 || local1160 == 3) { - Static103.method2231(Static34.concatenate(new JagString[] { Static44.aClass100_336, Static79.decode37(local884).method3125() }), 7, local4518); + Static103.method2231(JagString.concatenate(new JagString[] { Static44.aClass100_336, Static79.decode37(local884).method3125() }), 7, local4518); } else if (local1160 == 1) { - Static103.method2231(Static34.concatenate(new JagString[] { Static65.aClass100_435, Static79.decode37(local884).method3125() }), 7, local4518); + Static103.method2231(JagString.concatenate(new JagString[] { Static65.aClass100_435, Static79.decode37(local884).method3125() }), 7, local4518); } else { Static103.method2231(Static79.decode37(local884).method3125(), 3, local4518); } @@ -1261,9 +1258,9 @@ public final class Static4 { Static251.anInt5447 = (Static251.anInt5447 + 1) % 100; local3038 = Static218.method2862(Static65.method1497(Static57.aClass3_Sub15_Sub1_3).method3116()); if (local908 == 2 || local908 == 3) { - Static73.method1598(local3038, Static34.concatenate(new JagString[] { Static44.aClass100_336, Static79.decode37(local884).method3125() }), Static79.decode37(local275).method3125()); + Static73.method1598(local3038, JagString.concatenate(new JagString[] { Static44.aClass100_336, Static79.decode37(local884).method3125() }), Static79.decode37(local275).method3125()); } else if (local908 == 1) { - Static73.method1598(local3038, Static34.concatenate(new JagString[] { Static65.aClass100_435, Static79.decode37(local884).method3125() }), Static79.decode37(local275).method3125()); + Static73.method1598(local3038, JagString.concatenate(new JagString[] { Static65.aClass100_435, Static79.decode37(local884).method3125() }), Static79.decode37(local275).method3125()); } else { Static73.method1598(local3038, Static79.decode37(local884).method3125(), Static79.decode37(local275).method3125()); } @@ -1289,8 +1286,8 @@ public final class Static4 { local786 = Static57.aClass3_Sub15_Sub1_3.g4rme(); if (Static248.method3288(local133)) { local864 = 0; - if (Static173.self.aClass59_1 != null) { - local864 = Static173.self.aClass59_1.method1952(); + if (PlayerList.self.appearance != null) { + local864 = PlayerList.self.appearance.method1952(); } Static132.method2607(-1, 3, local786, local864); } @@ -1584,7 +1581,7 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else { - Static89.report("T1 - " + Static164.anInt3985 + "," + Static5.anInt45 + "," + Static49.anInt1462 + " - " + Static223.anInt5028, null); + TracingException.report("T1 - " + Static164.anInt3985 + "," + Static5.anInt45 + "," + Static49.anInt1462 + " - " + Static223.anInt5028, null); Static278.processLogout(); return true; } diff --git a/client/src/main/java/Static40.java b/client/src/main/java/Static40.java index 533a570..4d879d8 100644 --- a/client/src/main/java/Static40.java +++ b/client/src/main/java/Static40.java @@ -76,22 +76,7 @@ public final class Static40 { @OriginalMember(owner = "client!da", name = "a", descriptor = "(ILclient!ve;Z)Lclient!ok;") public static IndexedSprite loadIndexedSpriteAutoDetect(@OriginalArg(0) int arg0, @OriginalArg(1) Js5 arg1) { - return Static254.method4346(arg1, arg0) ? Static276.method4614() : null; - } - - @OriginalMember(owner = "client!da", name = "c", descriptor = "(II)Lclient!aa;") - public static MsiType method1013(@OriginalArg(0) int arg0) { - @Pc(10) MsiType local10 = (MsiType) Static231.aClass99_29.get((long) arg0); - if (local10 != null) { - return local10; - } - @Pc(20) byte[] local20 = Static98.aClass153_42.getFile(34, arg0); - local10 = new MsiType(); - if (local20 != null) { - local10.decode(new Buffer(local20), arg0); - } - Static231.aClass99_29.put(local10, (long) arg0); - return local10; + return SpriteLoader.decode(arg1, arg0) ? Static276.method4614() : null; } @OriginalMember(owner = "client!da", name = "a", descriptor = "(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;") @@ -129,7 +114,7 @@ public final class Static40 { local8.p4((int) (Math.random() * 9.9999999E7D)); local8.pjstr(password); local8.p4((int) (Math.random() * 9.9999999E7D)); - local8.p2(Static204.affiliate); + local8.p2(client.affiliate); local8.p1(arg0); local8.p1(arg2); local8.p4((int) (Math.random() * 9.9999999E7D)); diff --git a/client/src/main/java/Static41.java b/client/src/main/java/Static41.java index fe69286..f081e90 100644 --- a/client/src/main/java/Static41.java +++ b/client/src/main/java/Static41.java @@ -16,9 +16,6 @@ public final class Static41 { @OriginalMember(owner = "client!dc", name = "M", descriptor = "Lclient!na;") public static final JagString aClass100_268 = Static28.parse(")4"); - @OriginalMember(owner = "client!dc", name = "O", descriptor = "I") - public static int anInt1309 = 0; - @OriginalMember(owner = "client!dc", name = "R", descriptor = "Lclient!na;") private static final JagString aClass100_269 = Static28.parse("Drop"); diff --git a/client/src/main/java/Static42.java b/client/src/main/java/Static42.java deleted file mode 100644 index 6e24328..0000000 --- a/client/src/main/java/Static42.java +++ /dev/null @@ -1,13 +0,0 @@ -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static42 { - - @OriginalMember(owner = "client!df", name = "c", descriptor = "Lclient!na;") - public static final JagString aClass100_331 = Static28.parse("loc"); - - @OriginalMember(owner = "client!df", name = "l", descriptor = "Lclient!na;") - public static final JagString aClass100_332 = Static28.parse(""); - - @OriginalMember(owner = "client!df", name = "n", descriptor = "I") - public static int anInt1396 = 0; -} diff --git a/client/src/main/java/Static43.java b/client/src/main/java/Static43.java index 19743ec..3780798 100644 --- a/client/src/main/java/Static43.java +++ b/client/src/main/java/Static43.java @@ -7,18 +7,6 @@ public final class Static43 { @OriginalMember(owner = "client!dg", name = "h", descriptor = "Lclient!be;") public static Component aClass13_11; - @OriginalMember(owner = "client!dg", name = "b", descriptor = "Lclient!na;") - public static final JagString aClass100_333 = Static28.parse("Shift)2click ENABLED(Q"); - - @OriginalMember(owner = "client!dg", name = "c", descriptor = "[[S") - public static final short[][] aShortArrayArray5 = new short[][] { { 6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002 }, { 9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019 }, new short[0], new short[0], new short[0] }; - - @OriginalMember(owner = "client!dg", name = "d", descriptor = "Lclient!na;") - public static final JagString aClass100_334 = Static28.parse("Cache:"); - - @OriginalMember(owner = "client!dg", name = "f", descriptor = "Z") - public static boolean displayFps = false; - @OriginalMember(owner = "client!dg", name = "a", descriptor = "(IIIIILclient!th;IJZ)Z") public static boolean method1141(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) Entity arg5, @OriginalArg(6) int arg6, @OriginalArg(7) long arg7, @OriginalArg(8) boolean arg8) { if (arg5 == null) { diff --git a/client/src/main/java/Static44.java b/client/src/main/java/Static44.java index e056315..fccdd9e 100644 --- a/client/src/main/java/Static44.java +++ b/client/src/main/java/Static44.java @@ -90,9 +90,9 @@ public final class Static44 { Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436); } else { Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436); - local53 = Static280.aClass3_Sub2_Sub9_43.getStringWidth(LocalizedText.CHOOSE_OPTION); + local53 = Fonts.b12Full.getStringWidth(LocalizedText.CHOOSE_OPTION); for (@Pc(95) int local95 = 0; local95 < Static231.anInt5204; local95++) { - @Pc(104) int local104 = Static280.aClass3_Sub2_Sub9_43.getStringWidth(Static269.method2228(local95)); + @Pc(104) int local104 = Fonts.b12Full.getStringWidth(Static269.method2228(local95)); if (local104 > local53) { local53 = local104; } @@ -104,8 +104,8 @@ public final class Static44 { Static17.method531(local28, false); } Static74.method1626(arg0); - if (Static154.topLevelInterface != -1) { - Static54.method1304(1, Static154.topLevelInterface); + if (InterfaceList.topLevelInterface != -1) { + Static54.method1304(1, InterfaceList.topLevelInterface); } return local9; } @@ -114,7 +114,7 @@ public final class Static44 { public static void method1149(@OriginalArg(0) JagString arg0) { @Pc(7) int local7 = Static91.method1879(arg0); if (local7 != -1) { - Static80.method3616(Static203.aClass134_1.aShortArray73[local7], Static203.aClass134_1.aShortArray72[local7]); + Static80.method3616(WorldMap.labels.aShortArray73[local7], WorldMap.labels.aShortArray72[local7]); } } diff --git a/client/src/main/java/Static45.java b/client/src/main/java/Static45.java index be4fcc6..4310b69 100644 --- a/client/src/main/java/Static45.java +++ b/client/src/main/java/Static45.java @@ -95,7 +95,7 @@ public final class Static45 { local146[local194][local178] = local200 - local273; } } - } else if (Static178.highDetailLighting) { + } else if (Preferences.highDetailLighting) { for (local168 = 1; local168 < 103; local168++) { for (local173 = 1; local173 < 103; local173++) { local194 = (local159[local173 + 1][local168] >> 3) + (local159[local173 - 1][local168] >> 2) + (local159[local173][local168 + -1] >> 2) + (local159[local173][local168 + 1] >> 3) + (local159[local173][local168] >> 1); @@ -188,7 +188,7 @@ public final class Static45 { } for (local168 = 1; local168 < 103; local168++) { label771: for (local173 = 1; local173 < 103; local173++) { - if (underwater || Static138.allLevelsAreVisible() || (Static12.tileSettings[0][local168][local173] & 0x2) != 0 || (Static12.tileSettings[local152][local168][local173] & 0x10) == 0 && Static4.method22(local173, local168, local152) == Static41.anInt1316) { + if (underwater || SceneGraph.allLevelsAreVisible() || (Static12.tileSettings[0][local168][local173] & 0x2) != 0 || (Static12.tileSettings[local152][local168][local173] & 0x10) == 0 && Static4.method22(local173, local168, local152) == Static41.anInt1316) { if (Static146.anInt3508 > local152) { Static146.anInt3508 = local152; } diff --git a/client/src/main/java/Static47.java b/client/src/main/java/Static47.java index 10fba95..4713728 100644 --- a/client/src/main/java/Static47.java +++ b/client/src/main/java/Static47.java @@ -4,13 +4,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static47 { - @OriginalMember(owner = "client!dk", name = "h", descriptor = "Lclient!na;") - public static JagString settings = null; - - @OriginalMember(owner = "client!dk", name = "j", descriptor = "[Lclient!en;") - public static final BufferedFile[] cacheIndexes = new BufferedFile[28]; - - @OriginalMember(owner = "client!dk", name = "a", descriptor = "(III)Lclient!ec;") + @OriginalMember(owner = "client!dk", name = "a", descriptor = "(III)Lclient!ec;") public static Scenery method3996(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { @Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2]; if (local7 == null) { @@ -26,64 +20,4 @@ public final class Static47 { return null; } - @OriginalMember(owner = "client!dk", name = "a", descriptor = "(Lclient!wa;Z)V") - public static void method3998(@OriginalArg(0) Buffer arg0) { - label87: while (true) { - if (arg0.offset < arg0.data.length) { - @Pc(22) int local22 = 0; - @Pc(24) boolean local24 = false; - @Pc(26) int local26 = 0; - if (arg0.g1() == 1) { - local24 = true; - local22 = arg0.g1(); - local26 = arg0.g1(); - } - @Pc(46) int local46 = arg0.g1(); - @Pc(50) int local50 = arg0.g1(); - @Pc(62) int local62 = Static2.anInt13 + Static181.anInt4296 - local50 * 64 - 1; - @Pc(69) int local69 = local46 * 64 - Static158.anInt3846; - @Pc(147) byte local147; - @Pc(91) int local91; - if (local69 >= 0 && local62 - 63 >= 0 && local69 + 63 < Static48.anInt1449 && local62 < Static181.anInt4296) { - local91 = local69 >> 6; - @Pc(95) int local95 = local62 >> 6; - @Pc(97) int local97 = 0; - while (true) { - if (local97 >= 64) { - continue label87; - } - for (@Pc(104) int local104 = 0; local104 < 64; local104++) { - if (!local24 || local97 >= local22 * 8 && local97 < local22 * 8 + 8 && local104 >= local26 * 8 && local104 < local26 * 8 + 8) { - local147 = arg0.g1s(); - if (local147 != 0) { - if (Static34.aByteArrayArrayArray3[local91][local95] == null) { - Static34.aByteArrayArrayArray3[local91][local95] = new byte[4096]; - } - Static34.aByteArrayArrayArray3[local91][local95][local97 + (63 - local104 << 6)] = local147; - @Pc(186) byte local186 = arg0.g1s(); - if (Static90.aByteArrayArrayArray8[local91][local95] == null) { - Static90.aByteArrayArrayArray8[local91][local95] = new byte[4096]; - } - Static90.aByteArrayArrayArray8[local91][local95][local97 + (63 - local104 << 6)] = local186; - } - } - } - local97++; - } - } - local91 = 0; - while (true) { - if ((local24 ? 64 : 4096) <= local91) { - continue label87; - } - local147 = arg0.g1s(); - if (local147 != 0) { - arg0.offset++; - } - local91++; - } - } - return; - } - } } diff --git a/client/src/main/java/Static48.java b/client/src/main/java/Static48.java index 60c082a..adf62b3 100644 --- a/client/src/main/java/Static48.java +++ b/client/src/main/java/Static48.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static48 { - @OriginalMember(owner = "client!dl", name = "e", descriptor = "I") - public static int anInt1449; - - @OriginalMember(owner = "client!dl", name = "h", descriptor = "[[Z") + @OriginalMember(owner = "client!dl", name = "h", descriptor = "[[Z") public static boolean[][] aBooleanArrayArray1; @OriginalMember(owner = "client!dl", name = "c", descriptor = "I") @@ -22,41 +19,6 @@ public final class Static48 { Static232.method3991(arg1, arg3, arg2, local35, arg6, local26, arg7, arg5); } - @OriginalMember(owner = "client!dl", name = "a", descriptor = "(B)Lclient!wa;") - public static Buffer method1196() { - @Pc(4) Buffer local4 = new Buffer(34); - local4.p1(11); - local4.p1(Static113.brightness); - local4.p1(Static162.aBoolean190 ? 1 : 0); - local4.p1(Static80.removeRoofsSelectively ? 1 : 0); - local4.p1(Static250.showGroundDecorations ? 1 : 0); - local4.p1(Static53.highDetailTextures ? 1 : 0); - local4.p1(Static15.manyIdleAnimations ? 1 : 0); - local4.p1(Static11.flickeringEffectsOn ? 1 : 0); - local4.p1(Static159.manyGroundTextures ? 1 : 0); - local4.p1(Static209.characterShadowsOn ? 1 : 0); - local4.p1(Static139.sceneryShadowsType); - local4.p1(Static178.highDetailLighting ? 1 : 0); - local4.p1(Static220.highWaterDetail ? 1 : 0); - local4.p1(Static71.fogEnabled ? 1 : 0); - local4.p1(Static102.windowMode); - local4.p1(Static99.stereo ? 1 : 0); - local4.p1(Static125.soundEffectVolume); - local4.p1(Static12.musicVolume); - local4.p1(Static30.ambientSoundsVolume); - local4.p2(Static114.anInt5831); - local4.p2(Static22.anInt729); - local4.p1(Static76.getParticleSetting()); - local4.p4(Static164.lastWorldId); - local4.p1(Static214.windowMode); - local4.p1(Static164.safeMode ? 1 : 0); - local4.p1(Static33.aBoolean63 ? 1 : 0); - local4.p1(Static141.buildArea); - local4.p1(Static127.aBoolean159 ? 1 : 0); - local4.p1(Static64.cursorsEnabled ? 1 : 0); - return local4; - } - @OriginalMember(owner = "client!dl", name = "a", descriptor = "(II)V") public static void setIdleLoops(@OriginalArg(1) int arg0) { @Pc(10) Mouse local10 = Static93.instance; diff --git a/client/src/main/java/Static49.java b/client/src/main/java/Static49.java index 250150d..e72316a 100644 --- a/client/src/main/java/Static49.java +++ b/client/src/main/java/Static49.java @@ -65,7 +65,7 @@ public final class Static49 { } while (local72 >= 103); } while (local68 >= 103); local95 = Static271.get(local17); - } while (local78 == 22 && !Static250.showGroundDecorations && local95.anInt4429 == 0 && local95.anInt4435 != 1 && !local95.aBoolean206); + } while (local78 == 22 && !Preferences.showGroundDecorations && local95.anInt4429 == 0 && local95.anInt4435 != 1 && !local95.aBoolean206); local39 = true; if (!local95.isReady()) { local15 = false; @@ -175,13 +175,13 @@ public final class Static49 { } @Pc(24) JagString local24 = Static13.method471(); if (arg0 == null) { - @Pc(40) int local40 = Static280.aClass3_Sub2_Sub9_43.method2859(local24, arg2 + 4, arg1 - -15, Static39.aRandom1, Static60.gregorianDateSeed); - Static133.method4012(arg2 + 4, Static280.aClass3_Sub2_Sub9_43.getStringWidth(local24) + local40, arg1, 15); + @Pc(40) int local40 = Fonts.b12Full.method2859(local24, arg2 + 4, arg1 - -15, Static39.aRandom1, Static60.gregorianDateSeed); + Static133.method4012(arg2 + 4, Fonts.b12Full.getStringWidth(local24) + local40, arg1, 15); return; } - @Pc(59) Font local59 = arg0.method491(Static159.aClass36Array12); + @Pc(59) Font local59 = arg0.method491(Sprites.nameIcons); if (local59 == null) { - local59 = Static280.aClass3_Sub2_Sub9_43; + local59 = Fonts.b12Full; } local59.method2878(local24, arg2, arg1, arg0.anInt445, arg0.anInt459, arg0.anInt474, arg0.anInt513, arg0.anInt460, arg0.anInt478, Static39.aRandom1, Static60.gregorianDateSeed, Static50.anIntArray132); Static133.method4012(Static50.anIntArray132[0], Static50.anIntArray132[2], Static50.anIntArray132[1], Static50.anIntArray132[3]); diff --git a/client/src/main/java/Static5.java b/client/src/main/java/Static5.java index 078adca..9d5829e 100644 --- a/client/src/main/java/Static5.java +++ b/client/src/main/java/Static5.java @@ -13,9 +13,6 @@ public final class Static5 { @OriginalMember(owner = "client!af", name = "c", descriptor = "I") public static int anInt39 = -1; - @OriginalMember(owner = "client!af", name = "g", descriptor = "Lclient!na;") - public static final JagString aClass100_9 = Static28.parse("hint_mapedge"); - @OriginalMember(owner = "client!af", name = "k", descriptor = "I") public static int anInt45 = 0; diff --git a/client/src/main/java/Static52.java b/client/src/main/java/Static52.java index 70c20ff..d88ec3b 100644 --- a/client/src/main/java/Static52.java +++ b/client/src/main/java/Static52.java @@ -41,11 +41,11 @@ public final class Static52 { @OriginalMember(owner = "client!eb", name = "b", descriptor = "(II)Lclient!na;") public static JagString method1288(@OriginalArg(1) int arg0) { if (arg0 < 100000) { - return Static34.concatenate(new JagString[] { Static105.aClass100_559, Static123.parseInt(arg0), Static123.aClass100_594 }); + return JagString.concatenate(new JagString[] { Static105.aClass100_559, Static123.parseInt(arg0), Static123.aClass100_594 }); } else if (arg0 >= 10000000) { - return Static34.concatenate(new JagString[] { Static184.aClass100_819, Static123.parseInt(arg0 / 1000000), LocalizedText.MILLION, Static123.aClass100_594 }); + return JagString.concatenate(new JagString[] { Static184.aClass100_819, Static123.parseInt(arg0 / 1000000), LocalizedText.MILLION, Static123.aClass100_594 }); } else { - return Static34.concatenate(new JagString[] { Static137.aClass100_637, Static123.parseInt(arg0 / 1000), LocalizedText.THOUSAND, Static123.aClass100_594 }); + return JagString.concatenate(new JagString[] { Static137.aClass100_637, Static123.parseInt(arg0 / 1000), LocalizedText.THOUSAND, Static123.aClass100_594 }); } } } diff --git a/client/src/main/java/Static53.java b/client/src/main/java/Static53.java index b2797c1..517893c 100644 --- a/client/src/main/java/Static53.java +++ b/client/src/main/java/Static53.java @@ -13,9 +13,6 @@ public final class Static53 { @OriginalMember(owner = "client!ec", name = "l", descriptor = "I") public static final int anInt1704 = 5063219; - @OriginalMember(owner = "client!ec", name = "n", descriptor = "Z") - public static boolean highDetailTextures = true; - @OriginalMember(owner = "client!ec", name = "B", descriptor = "[[I") public static final int[][] anIntArrayArray8 = new int[][] { new int[0], { 128, 0, 128, 128, 0, 128 }, { 0, 0, 128, 0, 128, 128, 64, 128 }, { 0, 128, 0, 0, 128, 0, 64, 128 }, { 0, 0, 64, 128, 0, 128 }, { 128, 128, 64, 128, 128, 0 }, { 64, 0, 128, 0, 128, 128, 64, 128 }, { 128, 0, 128, 128, 0, 128, 0, 64, 64, 0 }, { 0, 0, 64, 0, 0, 64 }, { 0, 0, 128, 0, 128, 128, 64, 96, 32, 64 }, { 0, 128, 0, 0, 32, 64, 64, 96, 128, 128 }, { 0, 128, 0, 0, 32, 32, 96, 32, 128, 0, 128, 128 } }; @@ -73,13 +70,7 @@ public final class Static53 { method1292(arg0, arg1, arg2, local17 + 1); } - @OriginalMember(owner = "client!ec", name = "a", descriptor = "(IZ)V") - public static void setAllVisibleLevels(@OriginalArg(1) boolean arg0) { - Static162.aBoolean190 = arg0; - Static87.aBoolean130 = !Static138.allLevelsAreVisible(); - } - - @OriginalMember(owner = "client!ec", name = "a", descriptor = "(B)V") + @OriginalMember(owner = "client!ec", name = "a", descriptor = "(B)V") public static void method1294() { if (!Static241.aBoolean302) { return; diff --git a/client/src/main/java/Static54.java b/client/src/main/java/Static54.java index 3d4cebc..be88141 100644 --- a/client/src/main/java/Static54.java +++ b/client/src/main/java/Static54.java @@ -23,12 +23,12 @@ public final class Static54 { if (GlRenderer.enabled) { Static46.method1187(arg2, arg1, arg2 + arg3.anInt445, arg1 + arg3.anInt459); } else { - Static129.method2496(arg2, arg1, arg2 + arg3.anInt445, arg1 + arg3.anInt459); + SoftwareRaster.method2496(arg2, arg1, arg2 + arg3.anInt445, arg1 + arg3.anInt459); } if (Static270.anInt5795 != 2 && Static270.anInt5795 != 5 && Static89.aClass3_Sub2_Sub1_5 != null) { @Pc(48) int local48 = Static59.anInt1814 + (int)Camera.yawTarget & 0x7FF; - @Pc(57) int local57 = Static173.self.xFine / 32 + 48; - @Pc(67) int local67 = 464 - Static173.self.zFine / 32; + @Pc(57) int local57 = PlayerList.self.xFine / 32 + 48; + @Pc(67) int local67 = 464 - PlayerList.self.zFine / 32; if (GlRenderer.enabled) { ((GlSprite) Static89.aClass3_Sub2_Sub1_5).method1427(arg2, arg1, arg3.anInt445, arg3.anInt459, local57, local67, local48, Static273.anInt4130 + 256, (GlSprite) arg3.method489(false)); } else { @@ -42,65 +42,65 @@ public final class Static54 { @Pc(200) int local200; @Pc(239) int local239; @Pc(271) int local271; - if (Static235.mapFunctionGroup != null) { - for (@Pc(117) int local117 = 0; local117 < Static235.mapFunctionGroup.anInt5074; local117++) { - if (Static235.mapFunctionGroup.method3892(local117)) { - local146 = (Static235.mapFunctionGroup.aShortArray73[local117] - Static225.originX) * 4 + 2 - Static173.self.xFine / 32; + if (Static235.mapElementList != null) { + for (@Pc(117) int local117 = 0; local117 < Static235.mapElementList.anInt5074; local117++) { + if (Static235.mapElementList.method3892(local117)) { + local146 = (Static235.mapElementList.aShortArray73[local117] - Static225.originX) * 4 + 2 - PlayerList.self.xFine / 32; local150 = MathUtils.sin[local48]; local154 = MathUtils.cos[local48]; - @Pc(156) Font local156 = Static114.aClass3_Sub2_Sub9_42; + @Pc(156) Font local156 = Fonts.p11Full; @Pc(164) int local164 = local150 * 256 / (Static273.anInt4130 + 256); - local181 = (Static235.mapFunctionGroup.aShortArray72[local117] - Static142.originZ) * 4 + 2 - Static173.self.zFine / 32; + local181 = (Static235.mapElementList.aShortArray72[local117] - Static142.originZ) * 4 + 2 - PlayerList.self.zFine / 32; @Pc(189) int local189 = local154 * 256 / (Static273.anInt4130 + 256); local200 = local181 * local189 - local146 * local164 >> 16; - if (Static235.mapFunctionGroup.method3894(local117) == 1) { - local156 = Static215.aClass3_Sub2_Sub9_32; + if (Static235.mapElementList.method3894(local117) == 1) { + local156 = Fonts.p12Full; } - if (Static235.mapFunctionGroup.method3894(local117) == 2) { - local156 = Static280.aClass3_Sub2_Sub9_43; + if (Static235.mapElementList.method3894(local117) == 2) { + local156 = Fonts.b12Full; } local231 = local164 * local181 + local189 * local146 >> 16; - local239 = local156.method2856(Static235.mapFunctionGroup.aClass100Array153[local117], 100); + local239 = local156.method2856(Static235.mapElementList.aClass100Array153[local117], 100); @Pc(245) int local245 = local231 - local239 / 2; if (local245 >= -arg3.anInt445 && local245 <= arg3.anInt445 && local200 >= -arg3.anInt459 && local200 <= arg3.anInt459) { local271 = 16777215; - if (Static235.mapFunctionGroup.anIntArray444[local117] != -1) { - local271 = Static235.mapFunctionGroup.anIntArray444[local117]; + if (Static235.mapElementList.anIntArray444[local117] != -1) { + local271 = Static235.mapElementList.anIntArray444[local117]; } if (GlRenderer.enabled) { Static46.method1188((GlSprite) arg3.method489(false)); } else { - Static129.method2486(arg3.anIntArray37, arg3.anIntArray45); + SoftwareRaster.method2486(arg3.anIntArray37, arg3.anIntArray45); } - local156.renderParagraphAlpha(Static235.mapFunctionGroup.aClass100Array153[local117], arg2 + local245 + arg3.anInt445 / 2, arg1 + arg3.anInt459 / 2 + -local200, local239, 50, local271, 0, 1, 0, 0); + local156.renderParagraphAlpha(Static235.mapElementList.aClass100Array153[local117], arg2 + local245 + arg3.anInt445 / 2, arg1 + arg3.anInt459 / 2 + -local200, local239, 50, local271, 0, 1, 0, 0); if (GlRenderer.enabled) { Static46.method1173(); } else { - Static129.method2482(); + SoftwareRaster.method2482(); } } } } } for (local146 = 0; local146 < Static251.anInt5454; local146++) { - local181 = Static145.anIntArray331[local146] * 4 + 2 - Static173.self.xFine / 32; - local150 = Static93.anIntArray219[local146] * 4 + 2 - Static173.self.zFine / 32; + local181 = Static145.anIntArray331[local146] * 4 + 2 - PlayerList.self.xFine / 32; + local150 = Static93.anIntArray219[local146] * 4 + 2 - PlayerList.self.zFine / 32; @Pc(382) LocType local382 = Static271.get(Static199.anIntArray417[local146]); if (local382.multiLocs != null) { local382 = local382.getMultiLoc(); - if (local382 == null || local382.anInt4400 == -1) { + if (local382 == null || local382.mapElement == -1) { continue; } } - Static60.method1446(arg3, Static67.aClass3_Sub2_Sub1Array4[local382.anInt4400], local150, local181, arg1, arg2); + Static60.method1446(arg3, Static67.mapfuncs[local382.mapElement], local150, local181, arg1, arg2); } for (local146 = 0; local146 < 104; local146++) { for (local181 = 0; local181 < 104; local181++) { @Pc(439) LinkedList local439 = Static159.aClass69ArrayArrayArray1[Static55.level][local146][local181]; if (local439 != null) { - local154 = local146 * 4 + 2 - Static173.self.xFine / 32; - local231 = local181 * 4 + 2 - Static173.self.zFine / 32; - Static60.method1446(arg3, Static139.aClass3_Sub2_Sub1Array6[0], local231, local154, arg1, arg2); + local154 = local146 * 4 + 2 - PlayerList.self.xFine / 32; + local231 = local181 * 4 + 2 - PlayerList.self.zFine / 32; + Static60.method1446(arg3, Sprites.mapdots[0], local231, local154, arg1, arg2); } } } @@ -112,12 +112,12 @@ public final class Static54 { local507 = local507.getMultiNpc(); } if (local507 != null && local507.aBoolean184 && local507.aBoolean183) { - local154 = local498.xFine / 32 - Static173.self.xFine / 32; - local231 = local498.zFine / 32 - Static173.self.zFine / 32; + local154 = local498.xFine / 32 - PlayerList.self.xFine / 32; + local231 = local498.zFine / 32 - PlayerList.self.zFine / 32; if (local507.anInt3739 == -1) { - Static60.method1446(arg3, Static139.aClass3_Sub2_Sub1Array6[1], local231, local154, arg1, arg2); + Static60.method1446(arg3, Sprites.mapdots[1], local231, local154, arg1, arg2); } else { - Static60.method1446(arg3, Static67.aClass3_Sub2_Sub1Array4[local507.anInt3739], local231, local154, arg1, arg2); + Static60.method1446(arg3, Static67.mapfuncs[local507.anInt3739], local231, local154, arg1, arg2); } } } @@ -125,8 +125,8 @@ public final class Static54 { for (local146 = 0; local146 < Static267.anInt5774; local146++) { @Pc(591) Player local591 = Static159.players[Static105.anIntArray256[local146]]; if (local591 != null && local591.method2682()) { - local154 = local591.zFine / 32 - Static173.self.zFine / 32; - local150 = local591.xFine / 32 - Static173.self.xFine / 32; + local154 = local591.zFine / 32 - PlayerList.self.zFine / 32; + local150 = local591.xFine / 32 - PlayerList.self.xFine / 32; @Pc(624) long local624 = local591.aClass100_364.encode37(); @Pc(626) boolean local626 = false; for (local239 = 0; local239 < Static9.anInt178; local239++) { @@ -143,17 +143,17 @@ public final class Static54 { } } @Pc(682) boolean local682 = false; - if (Static173.self.anInt1650 != 0 && local591.anInt1650 != 0 && local591.anInt1650 == Static173.self.anInt1650) { + if (PlayerList.self.anInt1650 != 0 && local591.anInt1650 != 0 && local591.anInt1650 == PlayerList.self.anInt1650) { local682 = true; } if (local626) { - Static60.method1446(arg3, Static139.aClass3_Sub2_Sub1Array6[3], local154, local150, arg1, arg2); + Static60.method1446(arg3, Sprites.mapdots[3], local154, local150, arg1, arg2); } else if (local660) { - Static60.method1446(arg3, Static139.aClass3_Sub2_Sub1Array6[5], local154, local150, arg1, arg2); + Static60.method1446(arg3, Sprites.mapdots[5], local154, local150, arg1, arg2); } else if (local682) { - Static60.method1446(arg3, Static139.aClass3_Sub2_Sub1Array6[4], local154, local150, arg1, arg2); + Static60.method1446(arg3, Sprites.mapdots[4], local154, local150, arg1, arg2); } else { - Static60.method1446(arg3, Static139.aClass3_Sub2_Sub1Array6[2], local154, local150, arg1, arg2); + Static60.method1446(arg3, Sprites.mapdots[2], local154, local150, arg1, arg2); } } } @@ -164,35 +164,35 @@ public final class Static54 { if (local770.anInt4058 == 1 && local770.anInt4057 >= 0 && local770.anInt4057 < Static175.npcs.length) { @Pc(804) Npc local804 = Static175.npcs[local770.anInt4057]; if (local804 != null) { - local231 = local804.xFine / 32 - Static173.self.xFine / 32; - local200 = local804.zFine / 32 - Static173.self.zFine / 32; + local231 = local804.xFine / 32 - PlayerList.self.xFine / 32; + local200 = local804.zFine / 32 - PlayerList.self.zFine / 32; Static97.method1960(local770.anInt4048, arg1, arg2, local231, local200, arg3); } } if (local770.anInt4058 == 2) { - local154 = (local770.anInt4053 - Static225.originX) * 4 + 2 - Static173.self.xFine / 32; - local231 = (-Static142.originZ + local770.anInt4046) * 4 + 2 - Static173.self.zFine / 32; + local154 = (local770.anInt4053 - Static225.originX) * 4 + 2 - PlayerList.self.xFine / 32; + local231 = (-Static142.originZ + local770.anInt4046) * 4 + 2 - PlayerList.self.zFine / 32; Static97.method1960(local770.anInt4048, arg1, arg2, local154, local231, arg3); } if (local770.anInt4058 == 10 && local770.anInt4057 >= 0 && Static159.players.length > local770.anInt4057) { @Pc(905) Player local905 = Static159.players[local770.anInt4057]; if (local905 != null) { - local200 = local905.zFine / 32 - Static173.self.zFine / 32; - local231 = local905.xFine / 32 - Static173.self.xFine / 32; + local200 = local905.zFine / 32 - PlayerList.self.zFine / 32; + local231 = local905.xFine / 32 - PlayerList.self.xFine / 32; Static97.method1960(local770.anInt4048, arg1, arg2, local231, local200, arg3); } } } } if (Static115.anInt2939 != 0) { - local146 = Static115.anInt2939 * 4 + 2 - Static173.self.xFine / 32; - local181 = Static84.anInt2255 * 4 + 2 - Static173.self.zFine / 32; - Static60.method1446(arg3, Static84.aClass3_Sub2_Sub1_4, local181, local146, arg1, arg2); + local146 = Static115.anInt2939 * 4 + 2 - PlayerList.self.xFine / 32; + local181 = Static84.anInt2255 * 4 + 2 - PlayerList.self.zFine / 32; + Static60.method1446(arg3, Sprites.mapflags, local181, local146, arg1, arg2); } if (GlRenderer.enabled) { Static46.method1186(arg2 + arg3.anInt445 / 2 - 1, arg1 + -1 - -(arg3.anInt459 / 2), 3, 3, 16777215); } else { - Static129.method2495(arg3.anInt445 / 2 + arg2 - 1, arg3.anInt459 / 2 + -1 + arg1, 3, 3, 16777215); + SoftwareRaster.fillRect(arg3.anInt445 / 2 + arg2 - 1, arg3.anInt459 / 2 + -1 + arg1, 3, 3, 16777215); } } else if (GlRenderer.enabled) { @Pc(1041) Sprite local1041 = arg3.method489(false); @@ -200,9 +200,9 @@ public final class Static54 { local1041.method1423(arg2, arg1); } } else { - Static129.method2504(arg2, arg1, arg3.anIntArray37, arg3.anIntArray45); + SoftwareRaster.method2504(arg2, arg1, arg3.anIntArray37, arg3.anIntArray45); } - Static31.rectangleRedraw[arg0] = true; + InterfaceList.rectangleRedraw[arg0] = true; } @OriginalMember(owner = "client!ed", name = "a", descriptor = "(ZIIII)V") @@ -276,7 +276,7 @@ public final class Static54 { if (Static164.anIntArray362[local5] >= -10) { @Pc(79) SynthSound local79 = Static173.aClass138Array1[local5]; if (local79 == null) { - local79 = Static292.method3988(Static248.js5Archive4, Static200.anIntArray421[local5], 0); + local79 = SynthSound.create(Static248.js5Archive4, Static200.anIntArray421[local5], 0); if (local79 == null) { continue; } @@ -286,16 +286,16 @@ public final class Static54 { if (Static164.anIntArray362[local5] < 0) { @Pc(209) int local209; if (Static26.anIntArray68[local5] == 0) { - local209 = Static125.soundEffectVolume; + local209 = Preferences.soundEffectVolume; } else { @Pc(125) int local125 = (Static26.anIntArray68[local5] & 0xFF) * 128; @Pc(133) int local133 = Static26.anIntArray68[local5] >> 8 & 0xFF; @Pc(141) int local141 = Static26.anIntArray68[local5] >> 16 & 0xFF; - @Pc(151) int local151 = local133 * 128 + 64 - Static173.self.zFine; + @Pc(151) int local151 = local133 * 128 + 64 - PlayerList.self.zFine; if (local151 < 0) { local151 = -local151; } - @Pc(167) int local167 = local141 * 128 + 64 - Static173.self.xFine; + @Pc(167) int local167 = local141 * 128 + 64 - PlayerList.self.xFine; if (local167 < 0) { local167 = -local167; } @@ -307,7 +307,7 @@ public final class Static54 { if (local180 < 0) { local180 = 0; } - local209 = Static30.ambientSoundsVolume * (local125 - local180) / local125; + local209 = Preferences.ambientSoundsVolume * (local125 - local180) / local125; } if (local209 > 0) { @Pc(223) PcmSound local223 = local79.method3989().method2648(Static56.resampler); @@ -329,12 +329,12 @@ public final class Static54 { local5--; } } - if (Static144.aBoolean173 && !Static136.method2655()) { - if (Static12.musicVolume != 0 && Static221.anInt4363 != -1) { - Static122.method2410(Static130.js5Archive6, Static221.anInt4363, Static12.musicVolume); + if (MidiPlayer.jingle && !Static136.method2655()) { + if (Preferences.musicVolume != 0 && Static221.anInt4363 != -1) { + Static122.method2410(Static130.js5Archive6, Static221.anInt4363, Preferences.musicVolume); } - Static144.aBoolean173 = false; - } else if (Static12.musicVolume != 0 && Static221.anInt4363 != -1 && !Static136.method2655()) { + MidiPlayer.jingle = false; + } else if (Preferences.musicVolume != 0 && Static221.anInt4363 != -1 && !Static136.method2655()) { Static6.outboundBuffer.p1isaac(137); Static6.outboundBuffer.p4(Static221.anInt4363); Static221.anInt4363 = -1; diff --git a/client/src/main/java/Static55.java b/client/src/main/java/Static55.java index 6e572b9..52c7d56 100644 --- a/client/src/main/java/Static55.java +++ b/client/src/main/java/Static55.java @@ -14,10 +14,7 @@ public final class Static55 { @OriginalMember(owner = "client!ee", name = "a", descriptor = "Lclient!na;") public static final JagString aClass100_376 = Static28.parse(" GMT"); - @OriginalMember(owner = "client!ee", name = "e", descriptor = "Lclient!na;") - public static final JagString aClass100_377 = Static28.parse("p12_full"); - - @OriginalMember(owner = "client!ee", name = "f", descriptor = "S") + @OriginalMember(owner = "client!ee", name = "f", descriptor = "S") public static short aShort12 = 1; @OriginalMember(owner = "client!ee", name = "j", descriptor = "[I") diff --git a/client/src/main/java/Static58.java b/client/src/main/java/Static58.java index 93d2616..5f0aec1 100644 --- a/client/src/main/java/Static58.java +++ b/client/src/main/java/Static58.java @@ -7,10 +7,7 @@ public final class Static58 { @OriginalMember(owner = "client!eh", name = "f", descriptor = "Lclient!ve;") public static Js5 aClass153_28; - @OriginalMember(owner = "client!eh", name = "g", descriptor = "[[[I") - public static int[][][] anIntArrayArrayArray5; - - @OriginalMember(owner = "client!eh", name = "j", descriptor = "I") + @OriginalMember(owner = "client!eh", name = "j", descriptor = "I") public static int wheelRotation = 0; @OriginalMember(owner = "client!eh", name = "a", descriptor = "(I)V") diff --git a/client/src/main/java/Static59.java b/client/src/main/java/Static59.java index f12978b..8d480dd 100644 --- a/client/src/main/java/Static59.java +++ b/client/src/main/java/Static59.java @@ -18,9 +18,9 @@ public final class Static59 { @OriginalMember(owner = "client!ej", name = "h", descriptor = "(I)V") public static void method1372() { - if (Static162.anInt3953 == 2) { + if (Static226.anInt3953 == 2) { if (Static155.anInt3751 == Static277.anInt5850 && Static60.anInt1892 == Static280.anInt5895) { - Static162.anInt3953 = 0; + Static226.anInt3953 = 0; if (Static172.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && Static231.anInt5204 > 2) { Static103.method2232(Static231.anInt5204 - 2); } else { @@ -28,7 +28,7 @@ public final class Static59 { } } } else if (Static155.anInt3751 == Static7.clickX && Static60.anInt1892 == Static60.clickY) { - Static162.anInt3953 = 0; + Static226.anInt3953 = 0; if (Static172.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && Static231.anInt5204 > 2) { Static103.method2232(Static231.anInt5204 - 2); } else { @@ -36,7 +36,7 @@ public final class Static59 { } } else { Static280.anInt5895 = Static60.clickY; - Static162.anInt3953 = 2; + Static226.anInt3953 = 2; Static277.anInt5850 = Static7.clickX; } } @@ -47,7 +47,7 @@ public final class Static59 { Static6.outboundBuffer.p1(Static144.getWindowMode()); Static6.outboundBuffer.p2(GameShell.canvasWidth); Static6.outboundBuffer.p2(GameShell.canvasHeight); - Static6.outboundBuffer.p1(Static186.antiAliasingMode); + Static6.outboundBuffer.p1(Preferences.antiAliasingMode); } @OriginalMember(owner = "client!ej", name = "a", descriptor = "(Lclient!ve;ILclient!ve;Lclient!of;)V") diff --git a/client/src/main/java/Static6.java b/client/src/main/java/Static6.java index d49a73e..97f6109 100644 --- a/client/src/main/java/Static6.java +++ b/client/src/main/java/Static6.java @@ -16,17 +16,7 @@ public final class Static6 { @OriginalMember(owner = "client!ag", name = "cb", descriptor = "[Lclient!cl;") public static final AnimFrameset[] aClass3_Sub2_Sub7Array1 = new AnimFrameset[14]; - @OriginalMember(owner = "client!ag", name = "h", descriptor = "(I)V") - public static void quit() { - if (Keyboard.instance != null) { - @Pc(4) Keyboard local4 = Keyboard.instance; - synchronized (Keyboard.instance) { - Keyboard.instance = null; - } - } - } - - @OriginalMember(owner = "client!ag", name = "j", descriptor = "(I)V") + @OriginalMember(owner = "client!ag", name = "j", descriptor = "(I)V") public static void method84() { Static65.method1500(); for (@Pc(9) int local9 = 0; local9 < 4; local9++) { diff --git a/client/src/main/java/Static61.java b/client/src/main/java/Static61.java index 390941f..7a77d5b 100644 --- a/client/src/main/java/Static61.java +++ b/client/src/main/java/Static61.java @@ -24,7 +24,7 @@ public final class Static61 { @OriginalMember(owner = "client!en", name = "a", descriptor = "(IIIB)V") public static void teleport(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { - @Pc(66) JagString local66 = Static34.concatenate(new JagString[] { Static96.aClass100_521, Static123.parseInt(arg2), Static159.aClass100_760, Static123.parseInt(arg0 >> 6), Static159.aClass100_760, Static123.parseInt(arg1 >> 6), Static159.aClass100_760, Static123.parseInt(arg0 & 0x3F), Static159.aClass100_760, Static123.parseInt(arg1 & 0x3F) }); + @Pc(66) JagString local66 = JagString.concatenate(new JagString[] { Static96.aClass100_521, Static123.parseInt(arg2), Static159.aClass100_760, Static123.parseInt(arg0 >> 6), Static159.aClass100_760, Static123.parseInt(arg1 >> 6), Static159.aClass100_760, Static123.parseInt(arg0 & 0x3F), Static159.aClass100_760, Static123.parseInt(arg1 & 0x3F) }); local66.method3129(); Static127.method2470(local66); } diff --git a/client/src/main/java/Static63.java b/client/src/main/java/Static63.java index 6c80393..81f8dc9 100644 --- a/client/src/main/java/Static63.java +++ b/client/src/main/java/Static63.java @@ -40,7 +40,7 @@ public final class Static63 { if (arg2 == contextId) { @Pc(8) IntNode local8 = new IntNode(arg1); local8.key = arg0; - aClass69_50.method2282(local8); + aClass69_50.addTail(local8); } } @@ -49,7 +49,7 @@ public final class Static63 { if (arg1 == contextId) { @Pc(7) IntNode local7 = new IntNode(); local7.key = arg0; - aClass69_51.method2282(local7); + aClass69_51.addTail(local7); } } @@ -70,7 +70,7 @@ public final class Static63 { if (arg2 == contextId) { @Pc(8) IntNode local8 = new IntNode(arg1); local8.key = arg0; - aClass69_48.method2282(local8); + aClass69_48.addTail(local8); } } @@ -137,7 +137,7 @@ public final class Static63 { if (arg2 == contextId) { @Pc(8) IntNode local8 = new IntNode(arg1); local8.key = arg0; - aClass69_49.method2282(local8); + aClass69_49.addTail(local8); } } } diff --git a/client/src/main/java/Static64.java b/client/src/main/java/Static64.java index c72fc8e..1a5fe30 100644 --- a/client/src/main/java/Static64.java +++ b/client/src/main/java/Static64.java @@ -7,19 +7,13 @@ public final class Static64 { @OriginalMember(owner = "client!fb", name = "h", descriptor = "[I") public static int[] anIntArray153; - @OriginalMember(owner = "client!fb", name = "n", descriptor = "[[B") - public static byte[][] aByteArrayArray9; - @OriginalMember(owner = "client!fb", name = "i", descriptor = "Lclient!na;") public static final JagString aClass100_431 = Static28.parse("; Max)2Age="); @OriginalMember(owner = "client!fb", name = "l", descriptor = "[Lclient!na;") public static final JagString[] aClass100Array62 = new JagString[100]; - @OriginalMember(owner = "client!fb", name = "m", descriptor = "Z") - public static boolean cursorsEnabled = true; - - @OriginalMember(owner = "client!fb", name = "p", descriptor = "Lclient!na;") + @OriginalMember(owner = "client!fb", name = "p", descriptor = "Lclient!na;") public static final JagString aClass100_433 = Static28.parse(""); @OriginalMember(owner = "client!fb", name = "q", descriptor = "[I") @@ -59,31 +53,31 @@ public final class Static64 { return; } if (Static9.anInt178 >= 100 && !Static202.aBoolean233 || Static9.anInt178 >= 200) { - Static103.method2231(Static186.EMPTY, 0, LocalizedText.FRIENDLISTFULL); + Static103.method2231(JagString.EMPTY, 0, LocalizedText.FRIENDLISTFULL); return; } @Pc(35) JagString local35 = Static79.decode37(arg0).method3125(); @Pc(42) int local42; for (local42 = 0; local42 < Static9.anInt178; local42++) { if (Static92.aLongArray3[local42] == arg0) { - Static103.method2231(Static186.EMPTY, 0, Static34.concatenate(new JagString[] { local35, LocalizedText.FRIENDLISTDUPE})); + Static103.method2231(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { local35, LocalizedText.FRIENDLISTDUPE})); return; } } for (local42 = 0; local42 < Static35.anInt1093; local42++) { if (arg0 == Static190.aLongArray6[local42]) { - Static103.method2231(Static186.EMPTY, 0, Static34.concatenate(new JagString[] { LocalizedText.REMOVESOCIAL1, local35, LocalizedText.REMOVEIGNORE})); + Static103.method2231(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { LocalizedText.REMOVESOCIAL1, local35, LocalizedText.REMOVEIGNORE})); return; } } - if (local35.strEquals(Static173.self.aClass100_364)) { - Static103.method2231(Static186.EMPTY, 0, LocalizedText.FRIENDCANTADDSELF); + if (local35.strEquals(PlayerList.self.aClass100_364)) { + Static103.method2231(JagString.EMPTY, 0, LocalizedText.FRIENDCANTADDSELF); return; } Static122.aClass100Array92[Static9.anInt178] = local35; Static92.aLongArray3[Static9.anInt178] = arg0; Static104.anIntArray255[Static9.anInt178] = 0; - Static214.aClass100Array170[Static9.anInt178] = Static186.EMPTY; + Static214.aClass100Array170[Static9.anInt178] = JagString.EMPTY; Static106.anIntArray258[Static9.anInt178] = 0; Static3.aBooleanArray135[Static9.anInt178] = false; Static9.anInt178++; diff --git a/client/src/main/java/Static67.java b/client/src/main/java/Static67.java index 667bb91..d7bb969 100644 --- a/client/src/main/java/Static67.java +++ b/client/src/main/java/Static67.java @@ -6,7 +6,7 @@ public final class Static67 { public static int anInt3356; @OriginalMember(owner = "client!fe", name = "lc", descriptor = "[Lclient!qf;") - public static Sprite[] aClass3_Sub2_Sub1Array4; + public static Sprite[] mapfuncs; @OriginalMember(owner = "client!fe", name = "I", descriptor = "Lclient!na;") public static final JagString aClass100_639 = Static28.parse(" "); diff --git a/client/src/main/java/Static7.java b/client/src/main/java/Static7.java index 4111b4c..ef1df7b 100644 --- a/client/src/main/java/Static7.java +++ b/client/src/main/java/Static7.java @@ -5,10 +5,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static7 { - @OriginalMember(owner = "client!ah", name = "l", descriptor = "[[B") - public static byte[][] aByteArrayArray5; - - @OriginalMember(owner = "client!ah", name = "t", descriptor = "I") + @OriginalMember(owner = "client!ah", name = "t", descriptor = "I") public static int anInt986; @OriginalMember(owner = "client!ah", name = "i", descriptor = "Lclient!n;") @@ -29,7 +26,7 @@ public final class Static7 { @OriginalMember(owner = "client!ah", name = "a", descriptor = "(BZ)V") public static void ping(@OriginalArg(1) boolean arg0) { Static107.loop(); - if (Static244.gameState != 30 && Static244.gameState != 25) { + if (client.gameState != 30 && client.gameState != 25) { return; } Static131.anInt3251++; @@ -37,10 +34,10 @@ public final class Static7 { return; } Static131.anInt3251 = 0; - if (!Static224.aBoolean247 && Static124.socket != null) { + if (!Static224.aBoolean247 && Protocol.socket != null) { Static6.outboundBuffer.p1isaac(93); try { - Static124.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); + Protocol.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); Static6.outboundBuffer.offset = 0; } catch (@Pc(53) IOException local53) { Static224.aBoolean247 = true; @@ -83,10 +80,10 @@ public final class Static7 { if (local20 == 1 && (Static116.anInt2952 == 1 && Static231.anInt5204 > 2 || Static277.method4640(Static231.anInt5204 - 1))) { local20 = 2; } - if (local20 == 2 && Static231.anInt5204 > 0 || Static162.anInt3953 == 1) { + if (local20 == 2 && Static231.anInt5204 > 0 || Static226.anInt3953 == 1) { Static226.method3901(); } - if (local20 == 1 && Static231.anInt5204 > 0 || Static162.anInt3953 == 2) { + if (local20 == 1 && Static231.anInt5204 > 0 || Static226.anInt3953 == 2) { Static59.method1372(); } return; diff --git a/client/src/main/java/Static70.java b/client/src/main/java/Static70.java index 216f064..32abc26 100644 --- a/client/src/main/java/Static70.java +++ b/client/src/main/java/Static70.java @@ -7,42 +7,30 @@ public final class Static70 { @OriginalMember(owner = "client!fi", name = "j", descriptor = "Lclient!qf;") public static Sprite aClass3_Sub2_Sub1_2; - @OriginalMember(owner = "client!fi", name = "m", descriptor = "[[[B") - public static byte[][][] aByteArrayArrayArray7; - @OriginalMember(owner = "client!fi", name = "k", descriptor = "I") public static int type = 0; @OriginalMember(owner = "client!fi", name = "n", descriptor = "I") public static int updatedVarpsWriterIndex = 0; - @OriginalMember(owner = "client!fi", name = "a", descriptor = "(B)Lclient!s;") - public static Timer create() { - try { - return (Timer) Class.forName("NanoTimer").getDeclaredConstructor().newInstance(); - } catch (@Pc(15) Throwable local15) { - return new MillisTimer(); - } - } - @OriginalMember(owner = "client!fi", name = "a", descriptor = "(BI)Lclient!na;") public static JagString method1548(@OriginalArg(1) int arg0) { @Pc(9) JagString local9 = Static123.parseInt(arg0); for (@Pc(21) int local21 = local9.length() - 3; local21 > 0; local21 -= 3) { - local9 = Static34.concatenate(new JagString[] { local9.substring(local21, 0), Static159.aClass100_760, local9.substring(local21) }); + local9 = JagString.concatenate(new JagString[] { local9.substring(local21, 0), Static159.aClass100_760, local9.substring(local21) }); } if (local9.length() > 9) { - return Static34.concatenate(new JagString[] { Static250.aClass100_1043, local9.substring(local9.length() - 8, 0), LocalizedText.MILLION_SHORT, Static123.aClass100_593, local9, Static116.aClass100_583 }); + return JagString.concatenate(new JagString[] { Static250.aClass100_1043, local9.substring(local9.length() - 8, 0), LocalizedText.MILLION_SHORT, Static123.aClass100_593, local9, Static116.aClass100_583 }); } else if (local9.length() > 6) { - return Static34.concatenate(new JagString[] { Static119.aClass100_589, local9.substring(local9.length() - 4, 0), LocalizedText.THOUSAND_SHORT, Static123.aClass100_593, local9, Static116.aClass100_583 }); + return JagString.concatenate(new JagString[] { Static119.aClass100_589, local9.substring(local9.length() - 4, 0), LocalizedText.THOUSAND_SHORT, Static123.aClass100_593, local9, Static116.aClass100_583 }); } else { - return Static34.concatenate(new JagString[] { Static278.aClass100_1101, local9, Static230.aClass100_978 }); + return JagString.concatenate(new JagString[] { Static278.aClass100_1101, local9, Static230.aClass100_978 }); } } @OriginalMember(owner = "client!fi", name = "a", descriptor = "(III)V") - public static void method1549(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - for (@Pc(11) int local11 = 0; local11 < Static98.anInt2510; local11++) { + public static void loadOverlayColors(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { + for (@Pc(11) int local11 = 0; local11 < FloTypeList.capacity; local11++) { @Pc(18) FloType local18 = Static256.method4395(local11); if (local18 != null) { @Pc(24) int local24 = local18.texture; @@ -78,7 +66,7 @@ public final class Static70 { local95 = local72 + (local66 & 0x380) + (local66 + arg1 & 0xFC00); local53 = Rasteriser.palette[Static230.method3949(local95, 96)]; } - Static145.anIntArray330[local11 + 1] = local53; + WorldMap.overlayColors[local11 + 1] = local53; } } } diff --git a/client/src/main/java/Static71.java b/client/src/main/java/Static71.java index f64f7f1..a10f23d 100644 --- a/client/src/main/java/Static71.java +++ b/client/src/main/java/Static71.java @@ -10,13 +10,7 @@ public final class Static71 { @OriginalMember(owner = "client!fk", name = "j", descriptor = "[[I") public static int[][] anIntArrayArray10; - @OriginalMember(owner = "client!fk", name = "q", descriptor = "Lclient!uc;") - public static MouseWheel mouseWheel; - - @OriginalMember(owner = "client!fk", name = "g", descriptor = "Z") - public static boolean fogEnabled = true; - - @OriginalMember(owner = "client!fk", name = "k", descriptor = "[I") + @OriginalMember(owner = "client!fk", name = "k", descriptor = "[I") public static final int[] anIntArray147 = new int[14]; @OriginalMember(owner = "client!fk", name = "a", descriptor = "(IB)Lclient!h;") diff --git a/client/src/main/java/Static73.java b/client/src/main/java/Static73.java index 169ccf3..c6b4b65 100644 --- a/client/src/main/java/Static73.java +++ b/client/src/main/java/Static73.java @@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static73 { - @OriginalMember(owner = "client!fm", name = "V", descriptor = "I") - public static int anInt2077; - @OriginalMember(owner = "client!fm", name = "S", descriptor = "Lclient!n;") public static final SoftLruHashTable aClass99_10 = new SoftLruHashTable(4); @@ -16,37 +13,31 @@ public final class Static73 { @OriginalMember(owner = "client!fm", name = "db", descriptor = "Lclient!gn;") public static final LruHashTable aClass54_7 = new LruHashTable(64); - @OriginalMember(owner = "client!fm", name = "eb", descriptor = "Lclient!na;") - public static final JagString aClass100_454 = Static28.parse("b12_full"); - @OriginalMember(owner = "client!fm", name = "fb", descriptor = "[I") public static final int[] anIntArray183 = new int[14]; - @OriginalMember(owner = "client!fm", name = "gb", descriptor = "Lclient!na;") - public static final JagString aClass100_455 = Static28.parse("overlay2"); - @OriginalMember(owner = "client!fm", name = "a", descriptor = "(ZI)V") public static void method1596(@OriginalArg(0) boolean arg0) { if (arg0) { - if (Static154.topLevelInterface != -1) { - Static109.method2275(Static154.topLevelInterface); + if (InterfaceList.topLevelInterface != -1) { + Static109.method2275(InterfaceList.topLevelInterface); } for (@Pc(18) Class3_Sub31 local18 = (Class3_Sub31) Static119.aClass133_9.head(); local18 != null; local18 = (Class3_Sub31) Static119.aClass133_9.next()) { Static132.method2605(true, local18); } - Static154.topLevelInterface = -1; + InterfaceList.topLevelInterface = -1; Static119.aClass133_9 = new HashTable(8); Static52.method1287(); - Static154.topLevelInterface = Static156.loginScreenId; + InterfaceList.topLevelInterface = Static156.loginScreenId; Static210.method3712(false); Static87.method1807(); - Static74.method1626(Static154.topLevelInterface); + Static74.method1626(InterfaceList.topLevelInterface); } Static35.anInt1092 = -1; Static81.method1750(Static270.anInt5794); - Static173.self = new Player(); - Static173.self.zFine = 3000; - Static173.self.xFine = 3000; + PlayerList.self = new Player(); + PlayerList.self.zFine = 3000; + PlayerList.self.xFine = 3000; if (!GlRenderer.enabled) { Static145.method2743(Static209.js5Archive8); Static196.setGameState(10); diff --git a/client/src/main/java/Static74.java b/client/src/main/java/Static74.java index b41207a..8b500af 100644 --- a/client/src/main/java/Static74.java +++ b/client/src/main/java/Static74.java @@ -24,24 +24,24 @@ public final class Static74 { @OriginalMember(owner = "client!fn", name = "a", descriptor = "(BIIIII)V") public static void method1624(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { - Static241.aClass36Array16[0].renderTransparent(arg2, arg3); - Static241.aClass36Array16[1].renderTransparent(arg2, arg4 + arg3 - 16); + Sprites.scrollbars[0].renderTransparent(arg2, arg3); + Sprites.scrollbars[1].renderTransparent(arg2, arg4 + arg3 - 16); @Pc(35) int local35 = arg4 * (arg4 - 32) / arg1; if (local35 < 8) { local35 = 8; } @Pc(54) int local54 = arg0 * (arg4 - local35 - 32) / (arg1 - arg4); if (!GlRenderer.enabled) { - Static129.method2495(arg2, arg3 + 16, 16, arg4 - 32, Static182.anInt4306); - Static129.method2495(arg2, local54 + arg3 + 16, 16, local35, Static53.anInt1704); - Static129.method2490(arg2, local54 + arg3 + 16, local35, Static219.anInt4938); - Static129.method2490(arg2 + 1, local54 + 16 + arg3, local35, Static219.anInt4938); - Static129.method2489(arg2, arg3 + local54 + 16, 16, Static219.anInt4938); - Static129.method2489(arg2, arg3 + local54 + 17, 16, Static219.anInt4938); - Static129.method2490(arg2 + 15, local54 + 16 + arg3, local35, Static20.anInt671); - Static129.method2490(arg2 + 14, arg3 - -17 - -local54, local35 - 1, Static20.anInt671); - Static129.method2489(arg2, local35 + arg3 + local54 + 15, 16, Static20.anInt671); - Static129.method2489(arg2 + 1, local35 + arg3 - (-local54 + -14), 15, Static20.anInt671); + SoftwareRaster.fillRect(arg2, arg3 + 16, 16, arg4 - 32, Static182.anInt4306); + SoftwareRaster.fillRect(arg2, local54 + arg3 + 16, 16, local35, Static53.anInt1704); + SoftwareRaster.drawVerticalLine(arg2, local54 + arg3 + 16, local35, Static219.anInt4938); + SoftwareRaster.drawVerticalLine(arg2 + 1, local54 + 16 + arg3, local35, Static219.anInt4938); + SoftwareRaster.drawHorizontalLine(arg2, arg3 + local54 + 16, 16, Static219.anInt4938); + SoftwareRaster.drawHorizontalLine(arg2, arg3 + local54 + 17, 16, Static219.anInt4938); + SoftwareRaster.drawVerticalLine(arg2 + 15, local54 + 16 + arg3, local35, Static20.anInt671); + SoftwareRaster.drawVerticalLine(arg2 + 14, arg3 - -17 - -local54, local35 - 1, Static20.anInt671); + SoftwareRaster.drawHorizontalLine(arg2, local35 + arg3 + local54 + 15, 16, Static20.anInt671); + SoftwareRaster.drawHorizontalLine(arg2 + 1, local35 + arg3 - (-local54 + -14), 15, Static20.anInt671); return; } Static46.method1186(arg2, arg3 + 16, 16, arg4 - 32, Static182.anInt4306); @@ -89,27 +89,4 @@ public final class Static74 { } } - @OriginalMember(owner = "client!fn", name = "a", descriptor = "(Lclient!ve;Lclient!ve;Z)I") - public static int getReady(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1) { - @Pc(5) int local5 = 0; - if (arg0.isFileReady(Static166.anInt4049)) { - local5++; - } - if (arg0.isFileReady(Static130.anInt3161)) { - local5++; - } - if (arg0.isFileReady(Static73.anInt2077)) { - local5++; - } - if (arg1.isFileReady(Static166.anInt4049)) { - local5++; - } - if (arg1.isFileReady(Static130.anInt3161)) { - local5++; - } - if (arg1.isFileReady(Static73.anInt2077)) { - local5++; - } - return local5; - } } diff --git a/client/src/main/java/Static75.java b/client/src/main/java/Static75.java index ebece21..7f635f0 100644 --- a/client/src/main/java/Static75.java +++ b/client/src/main/java/Static75.java @@ -62,10 +62,10 @@ public final class Static75 { Static35.underWaterLocationsMapFileIds[local20] = -1; } else { Static238.regionBitPacked[local20] = local169; - Static36.mapFileIds[local20] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); - Static172.locationsMapFileIds[local20] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); - Static99.underWaterMapFileIds[local20] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static165.aClass100_772, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); - Static35.underWaterLocationsMapFileIds[local20] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static278.aClass100_1103, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); + Static36.mapFileIds[local20] = Static26.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); + Static172.locationsMapFileIds[local20] = Static26.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); + Static99.underWaterMapFileIds[local20] = Static26.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); + Static35.underWaterLocationsMapFileIds[local20] = Static26.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); } local20++; } @@ -131,10 +131,10 @@ public final class Static75 { Static238.regionBitPacked[local60] = local571; @Pc(609) int local609 = local571 & 0xFF; local573 = local571 >> 8 & 0xFF; - Static36.mapFileIds[local60] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); - Static172.locationsMapFileIds[local60] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); - Static99.underWaterMapFileIds[local60] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static165.aClass100_772, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); - Static35.underWaterLocationsMapFileIds[local60] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static278.aClass100_1103, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); + Static36.mapFileIds[local60] = Static26.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); + Static172.locationsMapFileIds[local60] = Static26.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); + Static99.underWaterMapFileIds[local60] = Static26.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); + Static35.underWaterLocationsMapFileIds[local60] = Static26.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); local60++; } } @@ -144,16 +144,6 @@ public final class Static75 { Static127.method2463(local26, local64, local20, local31, false, local13); } - @OriginalMember(owner = "client!g", name = "a", descriptor = "(B)V") - public static void method1631() { - Static254.anIntArray488 = null; - Static269.anIntArray252 = null; - Static26.anIntArray66 = null; - Static7.aByteArrayArray5 = null; - Static274.anIntArray440 = null; - Static259.anIntArray513 = null; - } - @OriginalMember(owner = "client!g", name = "b", descriptor = "(I)V") public static void setDefaultChunksAtmosphere() { @Pc(9) Environment local9 = new Environment(); @@ -209,7 +199,7 @@ public final class Static75 { if (Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27] == null) { Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27] = new LinkedList(); } - Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27].method2282(new ObjStackNode(local122)); + Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27].addTail(new ObjStackNode(local122)); Static220.spawnGroundObject(local27, local19); } } else { @@ -244,7 +234,7 @@ public final class Static75 { local23 = local23 * 64; local317 = new ProjAnim(local45, Static55.level, local23, local19, Static207.method3685(Static55.level, local23, local19) - local218, Static83.loop + local228, local232 + Static83.loop, local236, local247, local39, local224); local317.method3705(local31, Static83.loop + local228, -local224 + Static207.method3685(Static55.level, local27, local31), local27); - Static217.aClass69_116.method2282(new ProjAnimNode(local317)); + Static217.aClass69_116.addTail(new ProjAnimNode(local317)); } } else if (Static164.anInt3985 == 17) { local15 = Static57.aClass3_Sub15_Sub1_3.g1(); @@ -257,7 +247,7 @@ public final class Static75 { local23 = local23 * 128 + 64; local19 = local19 * 128 + 64; @Pc(427) SpotAnim local427 = new SpotAnim(local27, Static55.level, local23, local19, Static207.method3685(Static55.level, local23, local19) - local31, local39, Static83.loop); - Static99.aClass69_64.method2282(new SpotAnimNode(local427)); + Static99.aClass69_64.addTail(new SpotAnimNode(local427)); } } else if (Static164.anInt3985 == 179) { local15 = Static57.aClass3_Sub15_Sub1_3.g1add(); @@ -339,7 +329,7 @@ public final class Static75 { if (Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27] == null) { Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27] = new LinkedList(); } - Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27].method2282(new ObjStackNode(local812)); + Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27].addTail(new ObjStackNode(local812)); Static220.spawnGroundObject(local27, local19); } } else if (Static164.anInt3985 == 16) { @@ -366,7 +356,7 @@ public final class Static75 { local27 = local27 * 128 + 64; local317 = new ProjAnim(local45, Static55.level, local23, local19, Static207.method3685(Static55.level, local23, local19) - local218, local228 + Static83.loop, local232 + Static83.loop, local236, local247, local39, local224); local317.method3705(local31, Static83.loop + local228, Static207.method3685(Static55.level, local27, local31) - local224, local27); - Static217.aClass69_116.method2282(new ProjAnimNode(local317)); + Static217.aClass69_116.addTail(new ProjAnimNode(local317)); } } else if (Static164.anInt3985 == 104) { local15 = Static57.aClass3_Sub15_Sub1_3.g1(); @@ -406,7 +396,7 @@ public final class Static75 { local1194 = local1184 >> 11 & 0xF; local1188 = local1184 & 0x7FF; if (Static16.anInt549 == local1188) { - local1198 = Static173.self; + local1198 = PlayerList.self; } else { local1198 = Static159.players[local1188]; } @@ -428,7 +418,7 @@ public final class Static75 { } @Pc(1331) ProjAnim local1331 = new ProjAnim(local218, Static55.level, local23, local19, Static207.method3685(Static55.level, local23, local19) - local224, local232 + Static83.loop, local236 + Static83.loop, local247, local633, local45, local228); local1331.method3705(local31, local232 + Static83.loop, -local228 + Static207.method3685(Static55.level, local27, local31), local27); - Static217.aClass69_116.method2282(new ProjAnimNode(local1331)); + Static217.aClass69_116.addTail(new ProjAnimNode(local1331)); } } else if (Static164.anInt3985 == 97) { local15 = Static57.aClass3_Sub15_Sub1_3.g1(); @@ -444,7 +434,7 @@ public final class Static75 { local45 = local31 & 0x7; if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) { local224 = local39 + 1; - if (Static173.self.movementQueueX[0] >= local23 - local224 && local224 + local23 >= Static173.self.movementQueueX[0] && Static173.self.movementQueueZ[0] >= local19 - local224 && Static173.self.movementQueueZ[0] <= local224 + local19 && Static30.ambientSoundsVolume != 0 && local45 > 0 && Static189.anInt4451 < 50 && local27 != -1) { + if (PlayerList.self.movementQueueX[0] >= local23 - local224 && local224 + local23 >= PlayerList.self.movementQueueX[0] && PlayerList.self.movementQueueZ[0] >= local19 - local224 && PlayerList.self.movementQueueZ[0] <= local224 + local19 && Preferences.ambientSoundsVolume != 0 && local45 > 0 && Static189.anInt4451 < 50 && local27 != -1) { Static200.anIntArray421[Static189.anInt4451] = local27; Static276.anIntArray563[Static189.anInt4451] = local45; Static164.anIntArray362[Static189.anInt4451] = local218; @@ -478,25 +468,4 @@ public final class Static75 { } } - @OriginalMember(owner = "client!g", name = "a", descriptor = "(ILclient!ve;)V") - public static void init(@OriginalArg(1) Js5 arg0) { - Static166.anInt4049 = arg0.getGroupId(Static18.aClass100_106); - Static130.anInt3161 = arg0.getGroupId(Static55.aClass100_377); - Static73.anInt2077 = arg0.getGroupId(Static73.aClass100_454); - Static280.anInt5900 = arg0.getGroupId(Static17.aClass100_102); - Static131.anInt3261 = arg0.getGroupId(Static219.aClass100_920); - Static36.anInt1165 = arg0.getGroupId(Static260.aClass100_944); - Static214.anInt5579 = arg0.getGroupId(Static123.aClass100_592); - Static34.anInt1049 = arg0.getGroupId(Static228.aClass100_968); - Static202.anInt4741 = arg0.getGroupId(Static98.aClass100_524); - Static149.anInt3551 = arg0.getGroupId(Static189.aClass100_835); - Static19.anInt647 = arg0.getGroupId(Static259.aClass100_1075); - Static32.anInt1016 = arg0.getGroupId(Static86.aClass100_490); - Static78.anInt2147 = arg0.getGroupId(Static189.aClass100_837); - Static124.anInt3083 = arg0.getGroupId(Static250.aClass100_1041); - Static224.anInt5057 = arg0.getGroupId(Static27.aClass100_167); - Static84.anInt2257 = arg0.getGroupId(Static18.aClass100_107); - Static163.anInt3962 = arg0.getGroupId(Static280.aClass100_1108); - Static128.anInt3143 = arg0.getGroupId(Static5.aClass100_9); - } } diff --git a/client/src/main/java/Static76.java b/client/src/main/java/Static76.java index 37239d7..a19a358 100644 --- a/client/src/main/java/Static76.java +++ b/client/src/main/java/Static76.java @@ -1,14 +1,10 @@ import java.nio.FloatBuffer; import com.jogamp.opengl.*; -import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; public final class Static76 { - @OriginalMember(owner = "client!ga", name = "e", descriptor = "I") - private static int anInt2126 = 2; - @OriginalMember(owner = "client!ga", name = "a", descriptor = "()V") public static void method1642() { @Pc(1) GL2 local1 = GlRenderer.gl; @@ -32,13 +28,4 @@ public final class Static76 { public static void method1643() { } - @OriginalMember(owner = "client!ga", name = "c", descriptor = "()I") - public static int getParticleSetting() { - return anInt2126; - } - - @OriginalMember(owner = "client!ga", name = "b", descriptor = "(I)V") - public static void setParticles(@OriginalArg(0) int arg0) { - anInt2126 = arg0; - } } diff --git a/client/src/main/java/Static78.java b/client/src/main/java/Static78.java index 0890631..67d8ff9 100644 --- a/client/src/main/java/Static78.java +++ b/client/src/main/java/Static78.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static78 { - @OriginalMember(owner = "client!gd", name = "l", descriptor = "I") - public static int anInt2147; - - @OriginalMember(owner = "client!gd", name = "m", descriptor = "Lclient!ve;") + @OriginalMember(owner = "client!gd", name = "m", descriptor = "Lclient!ve;") public static Js5 aClass153_32; @OriginalMember(owner = "client!gd", name = "n", descriptor = "Lclient!qf;") @@ -48,11 +45,6 @@ public final class Static78 { Static223.anInt5034 = -3; } - @OriginalMember(owner = "client!gd", name = "a", descriptor = "(ILclient!ve;II)Lclient!mm;") - public static SoftwareSprite method1693(@OriginalArg(0) int arg0, @OriginalArg(1) Js5 arg1, @OriginalArg(3) int arg2) { - return Static234.method4016(arg1, arg0, arg2) ? Static196.method3537() : null; - } - @OriginalMember(owner = "client!gd", name = "a", descriptor = "(I)V") public static void method1694() { Static125.aClass99_19.method3103(); @@ -111,11 +103,11 @@ public final class Static78 { } } - if (Static235.mapFunctionGroup == null) { - if (Static158.aClass3_Sub2_Sub4_3 == null || !Static227.js5Archive23.method4497(Static34.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.aClass100_138, Static50.aClass100_363 }))) { - Static235.mapFunctionGroup = new MapFunctionGroup(0); - } else if (Static227.js5Archive23.allFilesComplete(Static34.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.aClass100_138, Static50.aClass100_363 }))) { - Static235.mapFunctionGroup = Static140.createMapFunctionGroup(Static34.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.aClass100_138, Static50.aClass100_363 }), Static227.js5Archive23); + if (Static235.mapElementList == null) { + if (Static158.aClass3_Sub2_Sub4_3 == null || !client.js5Archive23.isGroupNameValid(JagString.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.group, Static50.aClass100_363 }))) { + Static235.mapElementList = new MapElementList(0); + } else if (client.js5Archive23.allFilesComplete(JagString.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.group, Static50.aClass100_363 }))) { + Static235.mapElementList = MapElementList.create(JagString.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.group, Static50.aClass100_363 }), client.js5Archive23); } else { fileExists = false; Static175.mapFilesMissingCount++; @@ -161,14 +153,14 @@ public final class Static78 { } if (Static233.loadingScreenState != 0) { - Static114.drawTextOnScreen(true, Static34.concatenate(new JagString[] { LocalizedText.LOADING, Static18.COMPLETE_PERCENT})); + Static114.drawTextOnScreen(true, JagString.concatenate(new JagString[] { LocalizedText.LOADING, Static18.COMPLETE_PERCENT})); } Static107.loop(); Static217.method3768(); @Pc(420) boolean hasUnderWaterMap = false; @Pc(427) int i; - if (GlRenderer.enabled && Static220.highWaterDetail) { + if (GlRenderer.enabled && Preferences.highWaterDetail) { for (i = 0; i < Static273.mapFilesBuffer.length; i++) { if (Static19.underWaterLocationsMapFilesBuffer[i] != null || Static186.underWaterMapFilesBuffer[i] != null) { hasUnderWaterMap = true; @@ -210,8 +202,8 @@ public final class Static78 { Static87.method1805(false); Static7.ping(true); if (GlRenderer.enabled) { - i = Static173.self.movementQueueX[0] >> 3; - chunkX = Static173.self.movementQueueZ[0] >> 3; + i = PlayerList.self.movementQueueX[0] >> 3; + chunkX = PlayerList.self.movementQueueZ[0] >> 3; Static73.setLightPosition(chunkX, i); } Static26.method743(false); @@ -223,8 +215,8 @@ public final class Static78 { Static89.method1835(false); Static7.ping(true); if (GlRenderer.enabled) { - i = Static173.self.movementQueueX[0] >> 3; - chunkX = Static173.self.movementQueueZ[0] >> 3; + i = PlayerList.self.movementQueueX[0] >> 3; + chunkX = PlayerList.self.movementQueueZ[0] >> 3; Static73.setLightPosition(chunkX, i); } Static233.method4002(false); @@ -242,7 +234,7 @@ public final class Static78 { } if (i < Static55.level - 1) { } - if (Static138.allLevelsAreVisible()) { + if (SceneGraph.allLevelsAreVisible()) { Static146.method2750(0); } else { Static146.method2750(Static146.anInt3508); @@ -285,7 +277,7 @@ public final class Static78 { Static219.method3796(); Static217.method3768(); Static231.aBoolean252 = false; - if (GameShell.frame != null && Static124.socket != null && Static244.gameState == 25) { + if (GameShell.frame != null && Protocol.socket != null && client.gameState == 25) { Static6.outboundBuffer.p1isaac(20); Static6.outboundBuffer.p4(1057001181); } @@ -297,22 +289,22 @@ public final class Static78 { for (@Pc(837) int local837 = chunkX - 1; local837 <= chunkZ + 1; local837++) { for (@Pc(850) int local850 = local821 - 1; local850 <= local815 + 1; local850++) { if (local837 < chunkX || local837 > chunkZ || local850 < local821 || local850 > local815) { - Static26.js5Archive5.method4486(Static34.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local837), Static86.aClass100_488, Static123.parseInt(local850) })); - Static26.js5Archive5.method4486(Static34.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local837), Static86.aClass100_488, Static123.parseInt(local850) })); + Static26.js5Archive5.method4486(JagString.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local837), Static86.aClass100_488, Static123.parseInt(local850) })); + Static26.js5Archive5.method4486(JagString.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local837), Static86.aClass100_488, Static123.parseInt(local850) })); } } } } - if (Static244.gameState == 28) { + if (client.gameState == 28) { Static196.setGameState(10); } else { Static196.setGameState(30); - if (Static124.socket != null) { + if (Protocol.socket != null) { Static6.outboundBuffer.p1isaac(110); } } Static141.method2720(); Static107.loop(); - Static234.resetTimer(); + GameShell.resetTimer(); } } diff --git a/client/src/main/java/Static79.java b/client/src/main/java/Static79.java index 7d802fc..eee3bf9 100644 --- a/client/src/main/java/Static79.java +++ b/client/src/main/java/Static79.java @@ -45,7 +45,7 @@ public final class Static79 { return; } @Pc(39) int local39; - if (!Static138.allLevelsAreVisible() && (Static12.tileSettings[0][arg1][arg4] & 0x2) == 0) { + if (!SceneGraph.allLevelsAreVisible() && (Static12.tileSettings[0][arg1][arg4] & 0x2) == 0) { local39 = arg2; if ((Static12.tileSettings[arg2][arg1][arg4] & 0x8) != 0) { local39 = 0; @@ -60,10 +60,10 @@ public final class Static79 { } Static43.method1144(arg4, arg1, arg2, arg6, local39, Static148.collisionMaps[arg2]); if (arg0 >= 0) { - @Pc(92) boolean local92 = Static250.showGroundDecorations; - Static250.showGroundDecorations = true; + @Pc(92) boolean local92 = Preferences.showGroundDecorations; + Preferences.showGroundDecorations = true; Static185.method3397(local39, false, arg2, false, Static148.collisionMaps[arg2], arg0, arg5, arg1, arg4, arg3); - Static250.showGroundDecorations = local92; + Preferences.showGroundDecorations = local92; } } diff --git a/client/src/main/java/Static80.java b/client/src/main/java/Static80.java index 7d693b2..466e60a 100644 --- a/client/src/main/java/Static80.java +++ b/client/src/main/java/Static80.java @@ -1,4 +1,3 @@ -import java.io.IOException; import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @@ -23,99 +22,33 @@ public final class Static80 { @OriginalMember(owner = "client!gf", name = "I", descriptor = "Lclient!na;") public static final JagString aClass100_886 = Static28.parse(")3runescape)3com)4l="); - @OriginalMember(owner = "client!gf", name = "N", descriptor = "Z") - public static boolean removeRoofsSelectively = true; - @OriginalMember(owner = "client!gf", name = "S", descriptor = "[I") public static final int[] anIntArray419 = new int[] { 0, 2, 2, 2, 1, 1, 2, 2, 1, 3, 1, 1 }; @OriginalMember(owner = "client!gf", name = "a", descriptor = "(Lclient!ve;IIB)Lclient!mm;") public static SoftwareSprite loadSoftwareAlphaSprite(@OriginalArg(0) Js5 arg0, @OriginalArg(2) int arg1) { - return Static234.method4016(arg0, 0, arg1) ? Static102.method2071() : null; - } - - @OriginalMember(owner = "client!gf", name = "a", descriptor = "(Lsignlink!ll;I)V") - public static void read(@OriginalArg(0) SignLink arg0) { - Static113.brightness = 3; - Static53.setAllVisibleLevels(true); - removeRoofsSelectively = true; - Static99.stereo = true; - Static220.highWaterDetail = true; - Static102.windowMode = 0; - Static22.anInt729 = 0; - Static250.showGroundDecorations = true; - Static11.flickeringEffectsOn = true; - Static15.manyIdleAnimations = true; - Static30.ambientSoundsVolume = 127; - Static71.fogEnabled = true; - Static209.characterShadowsOn = true; - Static114.anInt5831 = 0; - Static139.sceneryShadowsType = 2; - Static159.manyGroundTextures = true; - Static178.highDetailLighting = true; - Static12.musicVolume = 255; - Static53.highDetailTextures = true; - Static186.antiAliasingMode = 0; - @Pc(48) FileOnDisk local48 = null; - Static125.soundEffectVolume = 127; - if (GameShell.maxMemory >= 96) { - Static76.setParticles(2); - } else { - Static76.setParticles(0); - } - Static164.lastWorldId = 0; - Static141.buildArea = 0; - Static33.aBoolean63 = false; - Static64.cursorsEnabled = true; - Static164.safeMode = false; - Static127.aBoolean159 = false; - Static214.windowMode = 0; - try { - @Pc(78) PrivilegedRequest local78 = arg0.openPreferences("runescape"); - while (local78.status == 0) { - Static231.sleep(1L); - } - if (local78.status == 1) { - local48 = (FileOnDisk) local78.result; - @Pc(106) byte[] local106 = new byte[(int) local48.length()]; - @Pc(128) int local128; - for (@Pc(108) int local108 = 0; local108 < local106.length; local108 += local128) { - local128 = local48.read(local108, local106.length - local108, local106); - if (local128 == -1) { - throw new IOException("EOF"); - } - } - Static136.method2654(new Buffer(local106)); - } - } catch (@Pc(151) Exception local151) { - } - try { - if (local48 != null) { - local48.close(); - } - } catch (@Pc(158) Exception local158) { - } + return SpriteLoader.decode(arg0, 0, arg1) ? Static102.method2071() : null; } @OriginalMember(owner = "client!gf", name = "a", descriptor = "(BII)V") public static void method3616(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - Static142.anInt3482 = arg0 - Static158.anInt3846; - @Pc(24) int local24 = Static142.anInt3482 - (int) ((float) Static24.component.anInt445 / Static83.aFloat3); - @Pc(33) int local33 = Static142.anInt3482 + (int) ((float) Static24.component.anInt445 / Static83.aFloat3); + WorldMap.anInt3482 = arg0 - WorldMap.originX; + @Pc(24) int local24 = WorldMap.anInt3482 - (int) ((float) Static24.component.anInt445 / WorldMap.zoom); + @Pc(33) int local33 = WorldMap.anInt3482 + (int) ((float) Static24.component.anInt445 / WorldMap.zoom); if (local24 < 0) { - Static142.anInt3482 = (int) ((float) Static24.component.anInt445 / Static83.aFloat3); + WorldMap.anInt3482 = (int) ((float) Static24.component.anInt445 / WorldMap.zoom); } - Static217.anInt4901 = Static181.anInt4296 + Static2.anInt13 - arg1 - 1; - @Pc(61) int local61 = (int) ((float) Static24.component.anInt459 / Static83.aFloat3) + Static217.anInt4901; - @Pc(70) int local70 = Static217.anInt4901 - (int) ((float) Static24.component.anInt459 / Static83.aFloat3); - if (local33 > Static48.anInt1449) { - Static142.anInt3482 = Static48.anInt1449 - (int) ((float) Static24.component.anInt445 / Static83.aFloat3); + WorldMap.anInt4901 = WorldMap.length + WorldMap.originZ - arg1 - 1; + @Pc(61) int local61 = (int) ((float) Static24.component.anInt459 / WorldMap.zoom) + WorldMap.anInt4901; + @Pc(70) int local70 = WorldMap.anInt4901 - (int) ((float) Static24.component.anInt459 / WorldMap.zoom); + if (local33 > WorldMap.width) { + WorldMap.anInt3482 = WorldMap.width - (int) ((float) Static24.component.anInt445 / WorldMap.zoom); } if (local70 < 0) { - Static217.anInt4901 = (int) ((float) Static24.component.anInt459 / Static83.aFloat3); + WorldMap.anInt4901 = (int) ((float) Static24.component.anInt459 / WorldMap.zoom); } - if (Static181.anInt4296 < local61) { - Static217.anInt4901 = Static181.anInt4296 - (int) ((float) Static24.component.anInt459 / Static83.aFloat3); + if (WorldMap.length < local61) { + WorldMap.anInt4901 = WorldMap.length - (int) ((float) Static24.component.anInt459 / WorldMap.zoom); } } diff --git a/client/src/main/java/Static81.java b/client/src/main/java/Static81.java index 0109657..ed020e3 100644 --- a/client/src/main/java/Static81.java +++ b/client/src/main/java/Static81.java @@ -15,10 +15,7 @@ public final class Static81 { @OriginalMember(owner = "client!gg", name = "bb", descriptor = "I") public static int cameraX; - @OriginalMember(owner = "client!gg", name = "U", descriptor = "I") - public static int modeWhat = 0; - - @OriginalMember(owner = "client!gg", name = "W", descriptor = "Lclient!na;") + @OriginalMember(owner = "client!gg", name = "W", descriptor = "Lclient!na;") public static final JagString aClass100_475 = Static28.parse("null"); @OriginalMember(owner = "client!gg", name = "Y", descriptor = "Lclient!na;") @@ -29,7 +26,7 @@ public final class Static81 { @OriginalMember(owner = "client!gg", name = "c", descriptor = "(II)V") public static void method1750(@OriginalArg(0) int arg0) { - if (!Static64.cursorsEnabled) { + if (!Preferences.cursorsEnabled) { arg0 = -1; } if (arg0 == Static115.anInt2941) { @@ -109,11 +106,11 @@ public final class Static81 { } for (@Pc(34) int i = 0; i < 100 && Static10.readPacket(); i++) { } - if (Static244.gameState != 30) { + if (client.gameState != 30) { return; } Static233.loop(Static6.outboundBuffer); // ReflectionCheck - @Pc(60) Object mouseRecorder = Static178.instance.lock; + @Pc(60) Object mouseRecorder = MouseRecorder.instance.lock; @Pc(86) int offset; @Pc(79) int samples; @Pc(88) int i; @@ -123,16 +120,16 @@ public final class Static81 { @Pc(189) int dy; synchronized (mouseRecorder) { if (!Static245.enabled) { - Static178.instance.samples = 0; - } else if (Static150.clickButton != 0 || Static178.instance.samples >= 40) { + MouseRecorder.instance.samples = 0; + } else if (Static150.clickButton != 0 || MouseRecorder.instance.samples >= 40) { Static6.outboundBuffer.p1isaac(123); samples = 0; Static6.outboundBuffer.p1(0); offset = Static6.outboundBuffer.offset; - for (i = 0; Static178.instance.samples > i && Static6.outboundBuffer.offset - offset < 240; i++) { + for (i = 0; MouseRecorder.instance.samples > i && Static6.outboundBuffer.offset - offset < 240; i++) { samples++; - y = Static178.instance.y[i]; - x = Static178.instance.x[i]; + y = MouseRecorder.instance.y[i]; + x = MouseRecorder.instance.x[i]; if (y < 0) { y = 0; } else if (y > 65534) { @@ -144,7 +141,7 @@ public final class Static81 { x = 65534; } @Pc(142) boolean outsideWindow = false; - if (Static178.instance.y[i] == -1 && Static178.instance.x[i] == -1) { + if (MouseRecorder.instance.y[i] == -1 && MouseRecorder.instance.x[i] == -1) { outsideWindow = true; y = -1; x = -1; @@ -187,14 +184,14 @@ public final class Static81 { } } Static6.outboundBuffer.p1len(Static6.outboundBuffer.offset - offset); - if (Static178.instance.samples > samples) { - Static178.instance.samples -= samples; - for (i = 0; i < Static178.instance.samples; i++) { - Static178.instance.x[i] = Static178.instance.x[samples + i]; - Static178.instance.y[i] = Static178.instance.y[samples + i]; + if (MouseRecorder.instance.samples > samples) { + MouseRecorder.instance.samples -= samples; + for (i = 0; i < MouseRecorder.instance.samples; i++) { + MouseRecorder.instance.x[i] = MouseRecorder.instance.x[samples + i]; + MouseRecorder.instance.y[i] = MouseRecorder.instance.y[samples + i]; } } else { - Static178.instance.samples = 0; + MouseRecorder.instance.samples = 0; } } } @@ -228,7 +225,7 @@ public final class Static81 { if (Static16.anInt551 > 0) { Static16.anInt551--; } - if (Static33.aBoolean63) { + if (Preferences.aBoolean63) { for (i = 0; i < Static182.keyQueueSize; i++) { offset = Static227.keyCodes[i]; if (offset == 98 || offset == 99 || offset == 96 || offset == 97) { @@ -262,7 +259,7 @@ public final class Static81 { Static18.serverUpdatedPreferences = true; } Static31.method846(); - if (Static244.gameState != 30) { + if (client.gameState != 30) { return; } Static251.loop(); // ChangeLocRequest @@ -488,8 +485,8 @@ public final class Static81 { } // WorldMap.component Static24.component = null; - if (Static154.topLevelInterface != -1) { - Static57.method1320(0, 0, 0, GameShell.canvasWidth, Static154.topLevelInterface, 0, GameShell.canvasHeight); + if (InterfaceList.topLevelInterface != -1) { + Static57.method1320(0, 0, 0, GameShell.canvasWidth, InterfaceList.topLevelInterface, 0, GameShell.canvasHeight); } Static119.transmitTimer++; while (true) { @@ -505,7 +502,7 @@ public final class Static81 { if (priorityRequest == null) { while (true) { do { - priorityRequest = (HookRequest) Static185.lowPriorityRequests.removeHead(); + priorityRequest = (HookRequest) InterfaceList.lowPriorityRequests.removeHead(); if (priorityRequest == null) { if (Static24.component == null) { Static137.anInt3337 = 0; @@ -521,7 +518,7 @@ public final class Static81 { y = 3; } // Cheat - Static61.teleport(Static173.self.movementQueueX[0] + Static225.originX, Static173.self.movementQueueZ[0] + Static142.originZ, y); + Static61.teleport(PlayerList.self.movementQueueX[0] + Static225.originX, PlayerList.self.movementQueueZ[0] + Static142.originZ, y); } if (Static191.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) { if (Static56.anInt1742 != -1) { @@ -554,7 +551,7 @@ public final class Static81 { } Static187.anInt4422 = 0; } else if (Static56.anInt1742 != -1 && Static125.anInt3096 == 0 && Static187.anInt4422 == 0) { - @Pc(1871) boolean local1871 = Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, true, 0, Static56.anInt1742, 0, 0, 0, Static116.anInt2954, Static173.self.movementQueueX[0]); + @Pc(1871) boolean local1871 = Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 0, true, 0, Static56.anInt1742, 0, 0, 0, Static116.anInt2954, PlayerList.self.movementQueueX[0]); if (local1871) { Static25.y = Static60.clickY; Static17.milliseconds = 0; @@ -679,8 +676,8 @@ public final class Static81 { Static34.verifyIdChanged = false; } try { - if (Static124.socket != null && Static6.outboundBuffer.offset > 0) { - Static124.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); + if (Protocol.socket != null && Static6.outboundBuffer.offset > 0) { + Protocol.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); Static131.anInt3251 = 0; Static6.outboundBuffer.offset = 0; } diff --git a/client/src/main/java/Static82.java b/client/src/main/java/Static82.java index e60b10a..501c906 100644 --- a/client/src/main/java/Static82.java +++ b/client/src/main/java/Static82.java @@ -1,6 +1,5 @@ import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; public final class Static82 { @@ -19,25 +18,7 @@ public final class Static82 { } } - @OriginalMember(owner = "client!gi", name = "b", descriptor = "(I)Lclient!qf;") - public static Sprite method1764() { - @Pc(9) byte[] local9 = Static7.aByteArrayArray5[0]; - @Pc(17) int local17 = Static254.anIntArray488[0] * Static26.anIntArray66[0]; - @Pc(20) int[] local20 = new int[local17]; - for (@Pc(28) int local28 = 0; local28 < local17; local28++) { - local20[local28] = Static259.anIntArray513[local9[local28] & 0xFF]; - } - @Pc(69) Sprite local69; - if (GlRenderer.enabled) { - local69 = new GlSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], local20); - } else { - local69 = new SoftwareSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], local20); - } - Static75.method1631(); - return local69; - } - - @OriginalMember(owner = "client!gi", name = "a", descriptor = "(ILclient!jl;)V") + @OriginalMember(owner = "client!gi", name = "a", descriptor = "(ILclient!jl;)V") public static void method1767(@OriginalArg(1) HookRequest arg0) { Static88.method1818(200000, arg0); } diff --git a/client/src/main/java/Static83.java b/client/src/main/java/Static83.java index 37f057f..0f0cd37 100644 --- a/client/src/main/java/Static83.java +++ b/client/src/main/java/Static83.java @@ -4,19 +4,10 @@ import org.openrs2.deob.annotation.Pc; public final class Static83 { - @OriginalMember(owner = "client!gj", name = "i", descriptor = "[[[I") - public static int[][][] anIntArrayArrayArray3; - - @OriginalMember(owner = "client!gj", name = "m", descriptor = "[[[I") + @OriginalMember(owner = "client!gj", name = "m", descriptor = "[[[I") public static int[][][] activeTileHeightMap; - @OriginalMember(owner = "client!gj", name = "r", descriptor = "F") - public static float aFloat3; - - @OriginalMember(owner = "client!gj", name = "b", descriptor = "I") - public static int modeWhere = 0; - - @OriginalMember(owner = "client!gj", name = "d", descriptor = "I") + @OriginalMember(owner = "client!gj", name = "d", descriptor = "I") public static int loop = 0; @OriginalMember(owner = "client!gj", name = "p", descriptor = "Lclient!n;") diff --git a/client/src/main/java/Static84.java b/client/src/main/java/Static84.java index bbede20..560b9a8 100644 --- a/client/src/main/java/Static84.java +++ b/client/src/main/java/Static84.java @@ -10,12 +10,6 @@ public final class Static84 { @OriginalMember(owner = "client!gk", name = "e", descriptor = "Lclient!ve;") public static Js5 aClass153_35; - @OriginalMember(owner = "client!gk", name = "j", descriptor = "I") - public static int anInt2257; - - @OriginalMember(owner = "client!gk", name = "l", descriptor = "Lclient!qf;") - public static Sprite aClass3_Sub2_Sub1_4; - @OriginalMember(owner = "client!gk", name = "c", descriptor = "[I") public static final int[] anIntArray209 = new int[4096]; @@ -39,7 +33,7 @@ public final class Static84 { @Pc(21) int local21 = Static57.aClass3_Sub15_Sub1_3.g1(); local24 = Static57.aClass3_Sub15_Sub1_3.offset; @Pc(35) boolean local35 = (local13 & 0x8000) != 0; - if (arg2.aClass100_364 != null && arg2.aClass59_1 != null) { + if (arg2.aClass100_364 != null && arg2.appearance != null) { @Pc(48) long local48 = arg2.aClass100_364.encode37(); @Pc(50) boolean local50 = false; if (local17 <= 1) { @@ -73,9 +67,9 @@ public final class Static84 { arg2.anInt3408 = 150; arg2.anInt3429 = local13 >> 8; if (local17 == 2) { - Static154.method2928(local106, local35 ? 17 : 1, local127, null, Static34.concatenate(new JagString[] { Static44.aClass100_336, arg2.method1264() })); + Static154.method2928(local106, local35 ? 17 : 1, local127, null, JagString.concatenate(new JagString[] { Static44.aClass100_336, arg2.method1264() })); } else if (local17 == 1) { - Static154.method2928(local106, local35 ? 17 : 1, local127, null, Static34.concatenate(new JagString[] { Static65.aClass100_435, arg2.method1264() })); + Static154.method2928(local106, local35 ? 17 : 1, local127, null, JagString.concatenate(new JagString[] { Static65.aClass100_435, arg2.method1264() })); } else { Static154.method2928(local106, local35 ? 17 : 2, local127, null, arg2.method1264()); } @@ -96,7 +90,7 @@ public final class Static84 { local13 = -1; } local17 = Static57.aClass3_Sub15_Sub1_3.g1(); - Static186.method3415(local17, local13, arg2); + Player.animate(local17, local13, arg2); } if ((arg0 & 0x4) != 0) { local13 = Static57.aClass3_Sub15_Sub1_3.g1add(); @@ -128,7 +122,7 @@ public final class Static84 { if (arg2.aClass100_640.charAt(0) == 126) { arg2.aClass100_640 = arg2.aClass100_640.substring(1); Static103.method2231(arg2.method1264(), 2, arg2.aClass100_640); - } else if (arg2 == Static173.self) { + } else if (arg2 == PlayerList.self) { Static103.method2231(arg2.method1264(), 2, arg2.aClass100_640); } arg2.anInt3352 = 0; @@ -181,7 +175,7 @@ public final class Static84 { if (local24 != -1) { @Pc(663) SeqType local663 = Static36.get(local24); if (local663 != null && local663.frames != null) { - Static152.method2836(arg2.zFine, local663, arg2.xFine, arg2 == Static173.self, 0); + SoundPlayer.playSeqSound(arg2.zFine, local663, arg2.xFine, arg2 == PlayerList.self, 0); } } } @@ -193,95 +187,6 @@ public final class Static84 { } } - @OriginalMember(owner = "client!gk", name = "a", descriptor = "([BI)V") - public static void method1770(@OriginalArg(0) byte[] arg0) { - @Pc(4) Buffer local4 = new Buffer(arg0); - local4.offset = arg0.length - 2; - Static165.anInt4038 = local4.g2(); - Static26.anIntArray66 = new int[Static165.anInt4038]; - Static254.anIntArray488 = new int[Static165.anInt4038]; - Static274.anIntArray440 = new int[Static165.anInt4038]; - Static159.aBooleanArray87 = new boolean[Static165.anInt4038]; - Static64.aByteArrayArray9 = new byte[Static165.anInt4038][]; - Static269.anIntArray252 = new int[Static165.anInt4038]; - Static7.aByteArrayArray5 = new byte[Static165.anInt4038][]; - local4.offset = arg0.length - Static165.anInt4038 * 8 - 7; - Static124.anInt3080 = local4.g2(); - Static227.anInt5091 = local4.g2(); - @Pc(66) int local66 = (local4.g1() & 0xFF) + 1; - @Pc(68) int local68; - for (local68 = 0; local68 < Static165.anInt4038; local68++) { - Static274.anIntArray440[local68] = local4.g2(); - } - for (local68 = 0; local68 < Static165.anInt4038; local68++) { - Static269.anIntArray252[local68] = local4.g2(); - } - for (local68 = 0; local68 < Static165.anInt4038; local68++) { - Static254.anIntArray488[local68] = local4.g2(); - } - for (local68 = 0; local68 < Static165.anInt4038; local68++) { - Static26.anIntArray66[local68] = local4.g2(); - } - local4.offset = arg0.length + 3 - Static165.anInt4038 * 8 - local66 * 3 - 7; - Static259.anIntArray513 = new int[local66]; - for (local68 = 1; local68 < local66; local68++) { - Static259.anIntArray513[local68] = local4.g3(); - if (Static259.anIntArray513[local68] == 0) { - Static259.anIntArray513[local68] = 1; - } - } - local4.offset = 0; - for (local68 = 0; local68 < Static165.anInt4038; local68++) { - @Pc(195) int local195 = Static254.anIntArray488[local68]; - @Pc(199) int local199 = Static26.anIntArray66[local68]; - @Pc(203) int local203 = local195 * local199; - @Pc(206) byte[] local206 = new byte[local203]; - @Pc(208) boolean local208 = false; - Static7.aByteArrayArray5[local68] = local206; - @Pc(215) byte[] local215 = new byte[local203]; - Static64.aByteArrayArray9[local68] = local215; - @Pc(223) int local223 = local4.g1(); - @Pc(232) int local232; - if ((local223 & 0x1) == 0) { - for (local232 = 0; local232 < local203; local232++) { - local206[local232] = local4.g1s(); - } - if ((local223 & 0x2) != 0) { - for (local232 = 0; local232 < local203; local232++) { - @Pc(343) byte local343 = local215[local232] = local4.g1s(); - local208 |= local343 != -1; - } - } - } else { - local232 = 0; - label88: while (true) { - @Pc(241) int local241; - if (local232 >= local195) { - if ((local223 & 0x2) == 0) { - break; - } - local232 = 0; - while (true) { - if (local232 >= local195) { - break label88; - } - for (local241 = 0; local241 < local199; local241++) { - @Pc(291) byte local291 = local215[local195 * local241 + local232] = local4.g1s(); - local208 |= local291 != -1; - } - local232++; - } - } - for (local241 = 0; local241 < local199; local241++) { - local206[local232 + local241 * local195] = local4.g1s(); - } - local232++; - } - } - Static159.aBooleanArray87[local68] = local208; - } - } - @OriginalMember(owner = "client!gk", name = "b", descriptor = "(B)V") public static void method1771() { Static62.anIntArray150 = Static206.method3679(0.4F); diff --git a/client/src/main/java/Static86.java b/client/src/main/java/Static86.java index df76ce8..546c11a 100644 --- a/client/src/main/java/Static86.java +++ b/client/src/main/java/Static86.java @@ -3,10 +3,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static86 { - @OriginalMember(owner = "client!gm", name = "T", descriptor = "Lclient!k;") - public static Js5CacheQueue js5CacheQueue; - - @OriginalMember(owner = "client!gm", name = "ib", descriptor = "Lclient!ve;") + @OriginalMember(owner = "client!gm", name = "ib", descriptor = "Lclient!ve;") public static Js5 modelsArchive; @OriginalMember(owner = "client!gm", name = "R", descriptor = "I") @@ -18,10 +15,7 @@ public final class Static86 { @OriginalMember(owner = "client!gm", name = "bb", descriptor = "Z") public static boolean aBoolean129 = false; - @OriginalMember(owner = "client!gm", name = "db", descriptor = "Lclient!na;") - public static final JagString aClass100_490 = Static28.parse("cross"); - - @OriginalMember(owner = "client!gm", name = "gb", descriptor = "[I") + @OriginalMember(owner = "client!gm", name = "gb", descriptor = "[I") public static final int[] anIntArray211 = new int[] { 0, 4, 4, 8, 0, 0, 8, 0, 0 }; @OriginalMember(owner = "client!gm", name = "f", descriptor = "(B)V") diff --git a/client/src/main/java/Static87.java b/client/src/main/java/Static87.java index c28a31f..d6a449b 100644 --- a/client/src/main/java/Static87.java +++ b/client/src/main/java/Static87.java @@ -18,7 +18,7 @@ public final class Static87 { @OriginalMember(owner = "client!gn", name = "a", descriptor = "(Z)Z") public static boolean showVideoAd() { - if (Static150.objectTag) { + if (client.objectTag) { try { Static9.aClass100_35.method3157(GameShell.signLink.applet); return true; @@ -112,7 +112,7 @@ public final class Static87 { if (GlRenderer.enabled) { Static46.method1187(arg0, arg6, arg4, arg7); } else { - Static129.method2496(arg0, arg6, arg4, arg7); + SoftwareRaster.method2496(arg0, arg6, arg4, arg7); Rasteriser.prepare(); } for (@Pc(18) int local18 = 0; local18 < arg3.length; local18++) { @@ -120,11 +120,11 @@ public final class Static87 { if (local30 != null && (local30.layer == arg5 || arg5 == -1412584499 && local30 == Static105.aClass13_14)) { @Pc(57) int local57; if (arg8 == -1) { - Static264.anIntArray410[Static24.anInt766] = arg2 + local30.x; - Static50.anIntArray133[Static24.anInt766] = local30.y + arg1; - Static224.anIntArray443[Static24.anInt766] = local30.anInt445; - Static67.anIntArray320[Static24.anInt766] = local30.anInt459; - local57 = Static24.anInt766++; + Static264.anIntArray410[InterfaceList.anInt766] = arg2 + local30.x; + Static50.anIntArray133[InterfaceList.anInt766] = local30.y + arg1; + Static224.anIntArray443[InterfaceList.anInt766] = local30.anInt445; + Static67.anIntArray320[InterfaceList.anInt766] = local30.anInt459; + local57 = InterfaceList.anInt766++; } else { local57 = arg8; } @@ -212,7 +212,7 @@ public final class Static87 { if (GlRenderer.enabled) { Static46.method1187(arg0, arg6, arg4, arg7); } else { - Static129.method2496(arg0, arg6, arg4, arg7); + SoftwareRaster.method2496(arg0, arg6, arg4, arg7); } continue; } @@ -224,7 +224,7 @@ public final class Static87 { if (GlRenderer.enabled) { Static46.method1187(arg0, arg6, arg4, arg7); } else { - Static129.method2496(arg0, arg6, arg4, arg7); + SoftwareRaster.method2496(arg0, arg6, arg4, arg7); } if (Static270.anInt5795 != 0 && Static270.anInt5795 != 3 || Static60.aBoolean108 || local166 > Static155.anInt3751 || Static60.anInt1892 < local164 || Static155.anInt3751 >= local302 || local291 <= Static60.anInt1892) { continue; @@ -244,8 +244,8 @@ public final class Static87 { local518 = (Static273.anInt4130 + 256) * local518 >> 8; local545 = local518 * local276 - local514 * local270 >> 11; local556 = local276 * local514 + local270 * local518 >> 11; - local563 = Static173.self.xFine + local556 >> 7; - local571 = Static173.self.zFine - local545 >> 7; + local563 = PlayerList.self.xFine + local556 >> 7; + local571 = PlayerList.self.zFine - local545 >> 7; if (Static241.aBoolean302 && (Static274.anInt4999 & 0x40) != 0) { @Pc(583) Component local583 = Static201.method1418(Static98.anInt2512, Static15.anInt506); if (local583 == null) { @@ -255,10 +255,10 @@ public final class Static87 { } continue; } - if (Static266.game == 1) { - Static98.method1966(-1, 1L, Static186.EMPTY, local563, (short) 36, LocalizedText.FACEHERE, local571); + if (client.game == 1) { + Static98.method1966(-1, 1L, JagString.EMPTY, local563, (short) 36, LocalizedText.FACEHERE, local571); } - Static98.method1966(-1, 1L, Static186.EMPTY, local563, (short) 60, Static195.aClass100_859, local571); + Static98.method1966(-1, 1L, JagString.EMPTY, local563, (short) 60, Static195.aClass100_859, local571); continue; } if (local30.anInt453 == 1339) { @@ -267,7 +267,7 @@ public final class Static87 { if (GlRenderer.enabled) { Static46.method1187(arg0, arg6, arg4, arg7); } else { - Static129.method2496(arg0, arg6, arg4, arg7); + SoftwareRaster.method2496(arg0, arg6, arg4, arg7); } } continue; @@ -275,22 +275,22 @@ public final class Static87 { if (local30.anInt453 == 1400) { Static269.method2225(local123, local114, local30.anInt459, local30.anInt445); Static186.aBooleanArray100[local57] = true; - Static31.rectangleRedraw[local57] = true; + InterfaceList.rectangleRedraw[local57] = true; if (GlRenderer.enabled) { Static46.method1187(arg0, arg6, arg4, arg7); } else { - Static129.method2496(arg0, arg6, arg4, arg7); + SoftwareRaster.method2496(arg0, arg6, arg4, arg7); } continue; } if (local30.anInt453 == 1401) { Static1.method4(local123, local30.anInt459, local30.anInt445, local114); Static186.aBooleanArray100[local57] = true; - Static31.rectangleRedraw[local57] = true; + InterfaceList.rectangleRedraw[local57] = true; if (GlRenderer.enabled) { Static46.method1187(arg0, arg6, arg4, arg7); } else { - Static129.method2496(arg0, arg6, arg4, arg7); + SoftwareRaster.method2496(arg0, arg6, arg4, arg7); } continue; } @@ -298,17 +298,17 @@ public final class Static87 { if (!GlRenderer.enabled) { Static221.method3392(local123, local114); Static186.aBooleanArray100[local57] = true; - Static31.rectangleRedraw[local57] = true; + InterfaceList.rectangleRedraw[local57] = true; } continue; } if (local30.anInt453 == 1405) { - if (!Static43.displayFps) { + if (!Cheat.displayFps) { continue; } local270 = local30.anInt445 + local123; local276 = local114 + 15; - Static215.aClass3_Sub2_Sub9_32.renderRight(Static34.concatenate(new JagString[] { Static101.aClass100_539, Static123.parseInt(GameShell.framesPerSecond) }), local270, local276, 16776960, -1); + Fonts.p12Full.renderRight(JagString.concatenate(new JagString[] { Static101.aClass100_539, Static123.parseInt(GameShell.framesPerSecond) }), local270, local276, 16776960, -1); local276 += 15; @Pc(795) Runtime local795 = Runtime.getRuntime(); local503 = (int) ((local795.totalMemory() - local795.freeMemory()) / 1024L); @@ -316,7 +316,7 @@ public final class Static87 { if (local503 > 65536) { local514 = 16711680; } - Static215.aClass3_Sub2_Sub9_32.renderRight(Static34.concatenate(new JagString[] { Static25.aClass100_154, Static123.parseInt(local503), Static17.aClass100_101 }), local270, local276, local514, -1); + Fonts.p12Full.renderRight(JagString.concatenate(new JagString[] { Static25.aClass100_154, Static123.parseInt(local503), Static17.aClass100_101 }), local270, local276, local514, -1); local276 += 15; if (GlRenderer.enabled) { local514 = 16776960; @@ -324,7 +324,7 @@ public final class Static87 { if (local518 > 65536) { local514 = 16711680; } - Static215.aClass3_Sub2_Sub9_32.renderRight(Static34.concatenate(new JagString[] { Static198.aClass100_264, Static123.parseInt(local518), Static17.aClass100_101 }), local270, local276, local514, -1); + Fonts.p12Full.renderRight(JagString.concatenate(new JagString[] { Static198.aClass100_264, Static123.parseInt(local518), Static17.aClass100_101 }), local270, local276, local514, -1); local276 += 15; } local518 = 0; @@ -337,11 +337,11 @@ public final class Static87 { } local571 = local556 * 10000 / local518; local563 = local545 * 100 / local518; - @Pc(968) JagString local968 = Static34.concatenate(new JagString[] { Static43.aClass100_334, Static182.valueToBase10String(0, true, 2, (long) local571), Static147.aClass100_672, Static123.parseInt(local563), Static14.aClass100_80 }); - Static114.aClass3_Sub2_Sub9_42.renderRight(local968, local270, local276, 16776960, -1); + @Pc(968) JagString local968 = JagString.concatenate(new JagString[] { Cheat.aClass100_334, Static182.valueToBase10String(0, true, 2, (long) local571), Static147.aClass100_672, Static123.parseInt(local563), Static14.aClass100_80 }); + Fonts.p11Full.renderRight(local968, local270, local276, 16776960, -1); local276 += 12; Static186.aBooleanArray100[local57] = true; - Static31.rectangleRedraw[local57] = true; + InterfaceList.rectangleRedraw[local57] = true; continue; } if (local30.anInt453 == 1406) { @@ -356,7 +356,7 @@ public final class Static87 { Static231.anInt5204 = 1; Static190.anIntArray382[0] = Static35.anInt1092; Static254.aClass100Array168[0] = LocalizedText.CANCEL; - Static233.aClass100Array160[0] = Static186.EMPTY; + Static233.aClass100Array160[0] = JagString.EMPTY; Static39.aShortArray6[0] = 1005; } if (local166 <= Static155.anInt3751 && local164 <= Static60.anInt1892 && local302 > Static155.anInt3751 && local291 > Static60.anInt1892) { @@ -386,14 +386,14 @@ public final class Static87 { Static231.anInt5204 = 1; Static190.anIntArray382[0] = Static35.anInt1092; Static39.aShortArray6[0] = 1005; - Static233.aClass100Array160[0] = Static186.EMPTY; + Static233.aClass100Array160[0] = JagString.EMPTY; } Static6.method86(local1186.anInt5878, local166, local302, local123, local57, local291, local164, local114); } if (GlRenderer.enabled) { Static46.method1187(arg0, arg6, arg4, arg7); } else { - Static129.method2496(arg0, arg6, arg4, arg7); + SoftwareRaster.method2496(arg0, arg6, arg4, arg7); Rasteriser.prepare(); } } @@ -448,8 +448,8 @@ public final class Static87 { local1575 = Static46.anInt1441; local1577 = Static46.clipY; } else { - local1577 = Static129.clipTop; - local1575 = Static129.clipBottom; + local1577 = SoftwareRaster.clipTop; + local1575 = SoftwareRaster.clipBottom; } @Pc(1611) int local1611; if (local1577 > local556 + local514 && local1571.scrollY > 0) { @@ -511,28 +511,28 @@ public final class Static87 { if (GlRenderer.enabled) { Static46.method1186(local123, local114, local30.anInt445, local30.anInt459, local270); } else { - Static129.method2495(local123, local114, local30.anInt445, local30.anInt459, local270); + SoftwareRaster.fillRect(local123, local114, local30.anInt445, local30.anInt459, local270); } } else if (GlRenderer.enabled) { Static46.method1179(local123, local114, local30.anInt445, local30.anInt459, local270); } else { - Static129.method2483(local123, local114, local30.anInt445, local30.anInt459, local270); + SoftwareRaster.drawRect(local123, local114, local30.anInt445, local30.anInt459, local270); } } else if (local30.aBoolean30) { if (GlRenderer.enabled) { Static46.method1182(local123, local114, local30.anInt445, local30.anInt459, local270, 256 - (local117 & 0xFF)); } else { - Static129.method2484(local123, local114, local30.anInt445, local30.anInt459, local270, 256 - (local117 & 0xFF)); + SoftwareRaster.method2484(local123, local114, local30.anInt445, local30.anInt459, local270, 256 - (local117 & 0xFF)); } } else if (GlRenderer.enabled) { Static46.method1180(local123, local114, local30.anInt445, local30.anInt459, local270, 256 - (local117 & 0xFF)); } else { - Static129.method2487(local123, local114, local30.anInt445, local30.anInt459, local270, 256 - (local117 & 0xFF)); + SoftwareRaster.method2487(local123, local114, local30.anInt445, local30.anInt459, local270, 256 - (local117 & 0xFF)); } } else { @Pc(1921) Font local1921; if (local30.type == 4) { - local1921 = local30.method491(Static159.aClass36Array12); + local1921 = local30.method491(Sprites.nameIcons); if (local1921 != null) { @Pc(1934) JagString local1934 = local30.aClass100_84; if (Static154.method2926(local30)) { @@ -556,7 +556,7 @@ public final class Static87 { local1934 = Static92.aClass100_510; } if ((local1989.stackable == 1 || local30.objCount != 1) && local30.objCount != -1) { - local1934 = Static34.concatenate(new JagString[] { Static8.aClass100_32, local1934, Static54.aClass100_375, Static70.method1548(local30.objCount) }); + local1934 = JagString.concatenate(new JagString[] { Static8.aClass100_32, local1934, Static54.aClass100_375, Static70.method1548(local30.objCount) }); } } if (Static39.aClass13_10 == local30) { @@ -624,7 +624,7 @@ public final class Static87 { } Static46.method1187(arg0, arg6, arg4, arg7); } else { - Static129.method2498(local123, local114, local123 + local30.anInt445, local114 - -local30.anInt459); + SoftwareRaster.method2498(local123, local114, local123 + local30.anInt445, local114 - -local30.anInt459); for (local518 = 0; local518 < local503; local518++) { for (local556 = 0; local556 < local514; local556++) { if (local30.anInt521 != 0) { @@ -636,7 +636,7 @@ public final class Static87 { } } } - Static129.method2496(arg0, arg6, arg4, arg7); + SoftwareRaster.method2496(arg0, arg6, arg4, arg7); } } else { local503 = local30.anInt445 * 4096 / local276; @@ -695,17 +695,17 @@ public final class Static87 { @Pc(2751) Player local2751 = Static159.players[local514]; @Pc(2760) SeqType local2760 = local276 == -1 ? null : Static36.get(local276); if (local2751 != null && (int) local2751.aClass100_364.encode37() << 11 == (local30.modelId & 0xFFFFF800)) { - local2589 = local2751.aClass59_1.method1954(null, -1, null, local2760, 0, -1, 0, local30.anInt510, 0); + local2589 = local2751.appearance.method1954(null, -1, null, local2760, 0, -1, 0, local30.anInt510, 0); } } } else if (local276 == -1) { - local2589 = local30.method488(-1, null, -1, 0, local2587, Static173.self.aClass59_1); + local2589 = local30.method488(-1, null, -1, 0, local2587, PlayerList.self.appearance); if (local2589 == null && Static211.aBoolean72) { Static43.redraw(local30); } } else { @Pc(2689) SeqType local2689 = Static36.get(local276); - local2589 = local30.method488(local30.anInt496, local2689, local30.anInt510, local30.anInt500, local2587, Static173.self.aClass59_1); + local2589 = local30.method488(local30.anInt496, local2689, local30.anInt510, local30.anInt500, local2587, PlayerList.self.appearance); if (local2589 == null && Static211.aBoolean72) { Static43.redraw(local30); } @@ -733,7 +733,7 @@ public final class Static87 { GlRenderer.method4173(); GlRenderer.setDepthTestEnabled(true); GlRenderer.setFogEnabled(false); - Static229.method3935(Static113.brightness); + Static229.method3935(Preferences.brightness); if (Static263.aBoolean299) { Static46.method1177(); GlRenderer.clearDepthBuffer(); @@ -769,7 +769,7 @@ public final class Static87 { } } else { if (local30.type == 7) { - local1921 = local30.method491(Static159.aClass36Array12); + local1921 = local30.method491(Sprites.nameIcons); if (local1921 == null) { if (Static211.aBoolean72) { Static43.redraw(local30); @@ -783,9 +783,9 @@ public final class Static87 { local2611 = Static71.get(local30.objTypes[local276] - 1); @Pc(3159) JagString local3159; if (local2611.stackable != 1 && local30.objCounts[local276] == 1) { - local3159 = Static34.concatenate(new JagString[] { Static8.aClass100_32, local2611.name, Static230.aClass100_978 }); + local3159 = JagString.concatenate(new JagString[] { Static8.aClass100_32, local2611.name, Static230.aClass100_978 }); } else { - local3159 = Static34.concatenate(new JagString[] { Static8.aClass100_32, local2611.name, Static54.aClass100_375, Static70.method1548(local30.objCounts[local276]) }); + local3159 = JagString.concatenate(new JagString[] { Static8.aClass100_32, local2611.name, Static54.aClass100_375, Static70.method1548(local30.objCounts[local276]) }); } local556 = local123 + local503 * (local30.anInt512 + 115); local545 = (local30.anInt516 + 12) * local468 + local114; @@ -805,14 +805,14 @@ public final class Static87 { local276 = 0; local270 = 0; @Pc(3297) JagString local3297 = local30.aClass100_84; - @Pc(3299) Font local3299 = Static215.aClass3_Sub2_Sub9_32; + @Pc(3299) Font local3299 = Fonts.p12Full; local3297 = Static127.method2465(local30, local3297); @Pc(3325) JagString local3325; while (local3297.length() > 0) { local518 = local3297.indexOf(Static269.aClass100_556); if (local518 == -1) { local3325 = local3297; - local3297 = Static186.EMPTY; + local3297 = JagString.EMPTY; } else { local3325 = local3297.substring(local518, 0); local3297 = local3297.substring(local518 + 4); @@ -840,8 +840,8 @@ public final class Static87 { Static46.method1186(local518, local556, local270, local276, 16777120); Static46.method1179(local518, local556, local270, local276, 0); } else { - Static129.method2495(local518, local556, local270, local276, 16777120); - Static129.method2483(local518, local556, local270, local276, 0); + SoftwareRaster.fillRect(local518, local556, local270, local276, 16777120); + SoftwareRaster.drawRect(local518, local556, local270, local276, 0); } local3297 = local30.aClass100_84; local545 = local556 + local3299.lineHeight + 2; @@ -850,7 +850,7 @@ public final class Static87 { local563 = local3297.indexOf(Static269.aClass100_556); if (local563 == -1) { local3325 = local3297; - local3297 = Static186.EMPTY; + local3297 = JagString.EMPTY; } else { local3325 = local3297.substring(local563, 0); local3297 = local3297.substring(local563 + 4); @@ -873,12 +873,12 @@ public final class Static87 { if (GlRenderer.enabled) { Static46.method1185(local123, local276, local468, local503, local30.anInt474); } else { - Static129.method2500(local123, local276, local468, local503, local30.anInt474); + SoftwareRaster.method2500(local123, local276, local468, local503, local30.anInt474); } } else if (GlRenderer.enabled) { Static46.method1181(local123, local276, local468, local503, local30.anInt474, local30.anInt490); } else { - Static129.method2494(local123, local276, local468, local503, local30.anInt474, local30.anInt490); + SoftwareRaster.method2494(local123, local276, local468, local503, local30.anInt474, local30.anInt490); } } } diff --git a/client/src/main/java/Static88.java b/client/src/main/java/Static88.java index 44fe513..e7d4d01 100644 --- a/client/src/main/java/Static88.java +++ b/client/src/main/java/Static88.java @@ -200,7 +200,7 @@ public final class Static88 { if (opcode == 37) { id = intOperands[pc]; ssp -= id; - string = Static118.method2355(ssp, id, Static3.stringStack); + string = JagString.method2355(ssp, id, Static3.stringStack); Static3.stringStack[ssp++] = string; continue; } @@ -431,7 +431,7 @@ public final class Static88 { type = Static254.intStack[isp]; for (local1052 = 0; local1052 < Static204.anIntArray425.length; local1052++) { if (type == Static204.anIntArray425[local1052]) { - Static173.self.aClass59_1.method1953(local1052, local803); + PlayerList.self.appearance.method1953(local1052, local803); continue nextOp; } } @@ -441,7 +441,7 @@ public final class Static88 { continue nextOp; } if (type == Static153.anIntArray351[local1052]) { - Static173.self.aClass59_1.method1953(local1052, local803); + PlayerList.self.appearance.method1953(local1052, local803); continue nextOp; } local1052++; @@ -451,13 +451,13 @@ public final class Static88 { isp -= 2; type = Static254.intStack[isp]; local803 = Static254.intStack[isp + 1]; - Static173.self.aClass59_1.method1951(type, local803); + PlayerList.self.appearance.method1951(type, local803); continue; } if (opcode == 410) { isp--; local12388 = Static254.intStack[isp] != 0; - Static173.self.aClass59_1.method1948(local12388); + PlayerList.self.appearance.method1948(local12388); continue; } } else { @@ -729,7 +729,7 @@ public final class Static88 { } if (opcode == 1202) { component.modelType = 3; - component.modelId = Static173.self.aClass59_1.method1952(); + component.modelId = PlayerList.self.appearance.method1952(); if (component.createdComponentId == -1) { Static271.method4600(component.id); } @@ -1231,7 +1231,7 @@ public final class Static88 { } if (opcode == 3101) { isp -= 2; - Static186.method3415(Static254.intStack[isp + 1], Static254.intStack[isp], Static173.self); + Player.animate(Static254.intStack[isp + 1], Static254.intStack[isp], PlayerList.self); continue; } if (opcode == 3103) { @@ -1364,8 +1364,8 @@ public final class Static88 { } if (opcode == 3308) { type = Static55.level; - local803 = Static225.originX + (Static173.self.xFine >> 7); - local1052 = (Static173.self.zFine >> 7) + Static142.originZ; + local803 = Static225.originX + (PlayerList.self.xFine >> 7); + local1052 = (PlayerList.self.zFine >> 7) + Static142.originZ; Static254.intStack[isp++] = (type << 28) - (-(local803 << 14) - local1052); continue; } @@ -1457,11 +1457,11 @@ public final class Static88 { continue; } if (opcode == 3326) { - Static254.intStack[isp++] = Static173.self.anInt1652; + Static254.intStack[isp++] = PlayerList.self.anInt1652; continue; } if (opcode == 3327) { - Static254.intStack[isp++] = Static173.self.aClass59_1.aBoolean141 ? 1 : 0; + Static254.intStack[isp++] = PlayerList.self.appearance.aBoolean141 ? 1 : 0; continue; } if (opcode == 3328) { @@ -1497,7 +1497,7 @@ public final class Static88 { continue; } if (opcode == 3335) { - Static254.intStack[isp++] = Static141.language; + Static254.intStack[isp++] = client.language; continue; } if (opcode == 3336) { @@ -1513,7 +1513,7 @@ public final class Static88 { continue; } if (opcode == 3337) { - Static254.intStack[isp++] = Static204.affiliate; + Static254.intStack[isp++] = client.affiliate; continue; } } else if (opcode < 3500) { @@ -1774,7 +1774,7 @@ public final class Static88 { if (opcode == 3624) { isp--; type = Static254.intStack[isp]; - if (Static199.aClass3_Sub22Array1 != null && Static214.anInt5577 > type && Static199.aClass3_Sub22Array1[type].aClass100_636.equalsIgnoreCase(Static173.self.aClass100_364)) { + if (Static199.aClass3_Sub22Array1 != null && Static214.anInt5577 > type && Static199.aClass3_Sub22Array1[type].aClass100_636.equalsIgnoreCase(PlayerList.self.aClass100_364)) { Static254.intStack[isp++] = 1; continue; } @@ -1819,7 +1819,7 @@ public final class Static88 { continue; } if (opcode == 3629) { - Static254.intStack[isp++] = Static279.country; + Static254.intStack[isp++] = client.country; continue; } } else if (opcode < 4000) { @@ -2258,7 +2258,7 @@ public final class Static88 { } else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL11)) { string = string.substring(LocalizedText.STABLE_CHATCOL11.length()); local5555 = 11; - } else if (Static141.language != 0) { + } else if (client.language != 0) { if (local2522.startsWith(LocalizedText.CHATCOL0)) { local5555 = 0; string = string.substring(LocalizedText.CHATCOL0.length()); @@ -2314,7 +2314,7 @@ public final class Static88 { } else if (local2522.startsWith(LocalizedText.STABLE_CHATEFFECTC5)) { local5943 = 5; string = string.substring(LocalizedText.STABLE_CHATEFFECTC5.length()); - } else if (Static141.language != 0) { + } else if (client.language != 0) { if (local2522.startsWith(LocalizedText.CHATEFFECT1)) { string = string.substring(LocalizedText.CHATEFFECT1.length()); local5943 = 1; @@ -2395,10 +2395,10 @@ public final class Static88 { continue; } if (opcode == 5015) { - if (Static173.self == null || Static173.self.aClass100_364 == null) { - string = Static186.username; + if (PlayerList.self == null || PlayerList.self.aClass100_364 == null) { + string = Player.username; } else { - string = Static173.self.method1264(); + string = PlayerList.self.method1264(); } Static3.stringStack[ssp++] = string; continue; @@ -2680,7 +2680,7 @@ public final class Static88 { if (local7264 == null) { Static3.stringStack[ssp++] = Static72.EMPTY_STRING; } else { - Static3.stringStack[ssp++] = local7264.aClass100_138; + Static3.stringStack[ssp++] = local7264.group; } continue; } @@ -2701,8 +2701,8 @@ public final class Static88 { continue; } if (opcode == 5209) { - Static254.intStack[isp++] = Static158.anInt3846 + Static13.anInt435; - Static254.intStack[isp++] = Static2.anInt13 + Static181.anInt4296 - Static28.anInt919 - 1; + Static254.intStack[isp++] = WorldMap.originX + WorldMap.anInt435; + Static254.intStack[isp++] = WorldMap.originZ + WorldMap.length - WorldMap.anInt919 - 1; continue; } if (opcode == 5210) { @@ -2733,8 +2733,8 @@ public final class Static88 { if (type == -1) { local2522 = Static72.EMPTY_STRING; } else { - local2522 = Static203.aClass134_1.aClass100Array153[type]; - local1052 = Static203.aClass134_1.method3894(type); + local2522 = WorldMap.labels.aClass100Array153[type]; + local1052 = WorldMap.labels.method3894(type); } local2522 = local2522.method3140(Static67.aClass100_639, Static5.aClass100_10); Static3.stringStack[ssp++] = local2522; @@ -2747,8 +2747,8 @@ public final class Static88 { if (type == -1) { local2522 = Static72.EMPTY_STRING; } else { - local2522 = Static203.aClass134_1.aClass100Array153[type]; - local1052 = Static203.aClass134_1.method3894(type); + local2522 = WorldMap.labels.aClass100Array153[type]; + local1052 = WorldMap.labels.method3894(type); } local2522 = local2522.method3140(Static67.aClass100_639, Static5.aClass100_10); Static3.stringStack[ssp++] = local2522; @@ -2769,7 +2769,7 @@ public final class Static88 { local7566 = false; @Pc(7577) SecondaryLinkedList local7577 = Static183.method3333(type >> 14 & 0x3FFF, type & 0x3FFF); for (@Pc(7582) Map local7582 = (Map) local7577.method795(); local7582 != null; local7582 = (Map) local7577.method797()) { - if (local7582.aClass100_138.equalsIgnoreCase(local2522)) { + if (local7582.group.equalsIgnoreCase(local2522)) { local7566 = true; break; } @@ -2802,7 +2802,7 @@ public final class Static88 { if (local7293 == null) { Static254.intStack[isp++] = -1; } else { - Static254.intStack[isp++] = local7293.anInt772; + Static254.intStack[isp++] = local7293.defaultZoom; } continue; } @@ -2812,7 +2812,7 @@ public final class Static88 { continue; } if (opcode == 5220) { - Static254.intStack[isp++] = Static41.anInt1309 == 100 ? 1 : 0; + Static254.intStack[isp++] = WorldMap.loadPercentage == 100 ? 1 : 0; continue; } } else if (opcode < 5400) { @@ -2826,7 +2826,7 @@ public final class Static88 { } if (opcode == 5301) { if (GameShell.fullScreenFrame != null) { - Static241.setWindowMode(false, Static214.windowMode, -1, -1); + Static241.setWindowMode(false, Preferences.favoriteWorlds, -1, -1); } continue; } @@ -2844,8 +2844,8 @@ public final class Static88 { continue; } if (opcode == 5305) { - local803 = Static22.anInt729; - type = Static114.anInt5831; + local803 = Preferences.fullScreenHeight; + type = Preferences.fullScreenWidth; local1052 = -1; @Pc(7833) Class114[] local7833 = Static3.method4660(); for (c = 0; c < local7833.length; c++) { @@ -2872,7 +2872,7 @@ public final class Static88 { continue; } if (opcode == 5308) { - Static254.intStack[isp++] = Static214.windowMode; + Static254.intStack[isp++] = Preferences.favoriteWorlds; continue; } if (opcode == 5309) { @@ -2881,8 +2881,8 @@ public final class Static88 { if (type < 0 || type > 2) { type = 0; } - Static214.windowMode = type; - Static203.savePreferences(GameShell.signLink); + Preferences.favoriteWorlds = type; + Preferences.write(GameShell.signLink); continue; } } else if (opcode < 5500) { @@ -2941,7 +2941,7 @@ public final class Static88 { } if (opcode == 5411) { if (GameShell.fullScreenFrame != null) { - Static241.setWindowMode(false, Static214.windowMode, -1, -1); + Static241.setWindowMode(false, Preferences.favoriteWorlds, -1, -1); } if (GameShell.frame == null) { Static169.openUrl(Static15.method479(), false); @@ -2971,14 +2971,14 @@ public final class Static88 { } if (opcode == 5421) { if (GameShell.fullScreenFrame != null) { - Static241.setWindowMode(false, Static214.windowMode, -1, -1); + Static241.setWindowMode(false, Preferences.favoriteWorlds, -1, -1); } isp--; local1552 = Static254.intStack[isp] == 1; ssp--; string = Static3.stringStack[ssp]; - @Pc(8356) JagString local8356 = Static34.concatenate(new JagString[] { Static15.method479(), string }); - if (GameShell.frame != null || local1552 && SignLink.anInt5928 != 3 && SignLink.osName.startsWith("win") && !Static178.haveIe6) { + @Pc(8356) JagString local8356 = JagString.concatenate(new JagString[] { Static15.method479(), string }); + if (GameShell.frame != null || local1552 && SignLink.anInt5928 != 3 && SignLink.osName.startsWith("win") && !client.haveIe6) { Static164.newTab = local1552; Static175.url = local8356; Static33.openUrlRequest = GameShell.signLink.openUrl(new String(local8356.method3148(), "ISO-8859-1")); @@ -2995,13 +2995,13 @@ public final class Static88 { string = Static3.stringStack[ssp]; if (string.length() > 0) { if (Static103.aClass100Array88 == null) { - Static103.aClass100Array88 = new JagString[Static132.anIntArray309[Static266.game]]; + Static103.aClass100Array88 = new JagString[Static132.anIntArray309[client.game]]; } Static103.aClass100Array88[local1052] = string; } if (local2522.length() > 0) { if (Static263.aClass100Array174 == null) { - Static263.aClass100Array174 = new JagString[Static132.anIntArray309[Static266.game]]; + Static263.aClass100Array174 = new JagString[Static132.anIntArray309[client.game]]; } Static263.aClass100Array174[local1052] = local2522; } @@ -3126,7 +3126,7 @@ public final class Static88 { local2522 = Static3.stringStack[ssp + 1]; isp--; local1052 = Static254.intStack[isp]; - if (Static244.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0 && Static82.anInt2231 == 0) { + if (client.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0 && Static82.anInt2231 == 0) { Static225.method3896(string, local2522, local1052); } continue; @@ -3143,14 +3143,14 @@ public final class Static88 { } if (opcode == 5603) { isp -= 4; - if (Static244.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0 && Static82.anInt2231 == 0) { + if (client.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0 && Static82.anInt2231 == 0) { Static125.method2448(Static254.intStack[isp + 2], Static254.intStack[isp + 3], Static254.intStack[isp], Static254.intStack[isp + 1]); } continue; } if (opcode == 5604) { ssp--; - if (Static244.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0 && Static82.anInt2231 == 0) { + if (client.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0 && Static82.anInt2231 == 0) { Static78.method1691(Static3.stringStack[ssp].encode37()); } continue; @@ -3158,7 +3158,7 @@ public final class Static88 { if (opcode == 5605) { isp -= 4; ssp -= 2; - if (Static244.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0 && Static82.anInt2231 == 0) { + if (client.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0 && Static82.anInt2231 == 0) { Static40.method1016(Static254.intStack[isp], Static254.intStack[isp + 3], Static254.intStack[isp + 1], Static3.stringStack[ssp + 1], Static3.stringStack[ssp].encode37(), Static254.intStack[isp + 2]); } continue; @@ -3202,91 +3202,91 @@ public final class Static88 { if (type > 4) { type = 4; } - Static113.brightness = type; - if (!GlRenderer.enabled || !Static178.highDetailLighting) { - if (Static113.brightness == 1) { + Preferences.brightness = type; + if (!GlRenderer.enabled || !Preferences.highDetailLighting) { + if (Preferences.brightness == 1) { Rasteriser.setBrightness(0.9F); } - if (Static113.brightness == 2) { + if (Preferences.brightness == 2) { Rasteriser.setBrightness(0.8F); } - if (Static113.brightness == 3) { + if (Preferences.brightness == 3) { Rasteriser.setBrightness(0.7F); } - if (Static113.brightness == 4) { + if (Preferences.brightness == 4) { Rasteriser.setBrightness(0.6F); } } if (GlRenderer.enabled) { Static86.setInstantFade(); - if (!Static178.highDetailLighting) { + if (!Preferences.highDetailLighting) { Static145.method2742(); } } Static269.clearObjectSpriteCache(); - Static203.savePreferences(GameShell.signLink); + Preferences.write(GameShell.signLink); Static18.serverUpdatedPreferences = false; continue; } if (opcode == 6002) { isp--; - Static53.setAllVisibleLevels(Static254.intStack[isp] == 1); + Preferences.setAllVisibleLevels(Static254.intStack[isp] == 1); Static90.clearLocCache(); Static145.method2742(); Static269.method2218(); - Static203.savePreferences(GameShell.signLink); + Preferences.write(GameShell.signLink); Static18.serverUpdatedPreferences = false; continue; } if (opcode == 6003) { isp--; - Static80.removeRoofsSelectively = Static254.intStack[isp] == 1; + Preferences.removeRoofsSelectively = Static254.intStack[isp] == 1; Static269.method2218(); - Static203.savePreferences(GameShell.signLink); + Preferences.write(GameShell.signLink); Static18.serverUpdatedPreferences = false; continue; } if (opcode == 6005) { isp--; - Static250.showGroundDecorations = Static254.intStack[isp] == 1; + Preferences.showGroundDecorations = Static254.intStack[isp] == 1; Static145.method2742(); - Static203.savePreferences(GameShell.signLink); + Preferences.write(GameShell.signLink); Static18.serverUpdatedPreferences = false; continue; } if (opcode == 6006) { isp--; - Static53.highDetailTextures = Static254.intStack[isp] == 1; - ((Js5GlTextureProvider) Rasteriser.textureProvider).method3245(!Static53.highDetailTextures); - Static203.savePreferences(GameShell.signLink); + Preferences.highDetailTextures = Static254.intStack[isp] == 1; + ((Js5GlTextureProvider) Rasteriser.textureProvider).method3245(!Preferences.highDetailTextures); + Preferences.write(GameShell.signLink); Static18.serverUpdatedPreferences = false; continue; } if (opcode == 6007) { isp--; - Static15.manyIdleAnimations = Static254.intStack[isp] == 1; - Static203.savePreferences(GameShell.signLink); + Preferences.manyIdleAnimations = Static254.intStack[isp] == 1; + Preferences.write(GameShell.signLink); Static18.serverUpdatedPreferences = false; continue; } if (opcode == 6008) { isp--; - Static11.flickeringEffectsOn = Static254.intStack[isp] == 1; - Static203.savePreferences(GameShell.signLink); + Preferences.flickeringEffectsOn = Static254.intStack[isp] == 1; + Preferences.write(GameShell.signLink); Static18.serverUpdatedPreferences = false; continue; } if (opcode == 6009) { isp--; - Static159.manyGroundTextures = Static254.intStack[isp] == 1; - Static203.savePreferences(GameShell.signLink); + Preferences.manyGroundTextures = Static254.intStack[isp] == 1; + Preferences.write(GameShell.signLink); Static18.serverUpdatedPreferences = false; continue; } if (opcode == 6010) { isp--; - Static209.characterShadowsOn = Static254.intStack[isp] == 1; - Static203.savePreferences(GameShell.signLink); + Preferences.characterShadowsOn = Static254.intStack[isp] == 1; + Preferences.write(GameShell.signLink); Static18.serverUpdatedPreferences = false; continue; } @@ -3296,8 +3296,8 @@ public final class Static88 { if (type < 0 || type > 2) { type = 0; } - Static139.sceneryShadowsType = type; - Static203.savePreferences(GameShell.signLink); + Preferences.sceneryShadowsType = type; + Preferences.write(GameShell.signLink); Static18.serverUpdatedPreferences = false; continue; } @@ -3306,45 +3306,45 @@ public final class Static88 { Static27.setMaterial(0, 0); } isp--; - Static178.highDetailLighting = Static254.intStack[isp] == 1; - if (GlRenderer.enabled && Static178.highDetailLighting) { + Preferences.highDetailLighting = Static254.intStack[isp] == 1; + if (GlRenderer.enabled && Preferences.highDetailLighting) { Rasteriser.setBrightness(0.7F); } else { - if (Static113.brightness == 1) { + if (Preferences.brightness == 1) { Rasteriser.setBrightness(0.9F); } - if (Static113.brightness == 2) { + if (Preferences.brightness == 2) { Rasteriser.setBrightness(0.8F); } - if (Static113.brightness == 3) { + if (Preferences.brightness == 3) { Rasteriser.setBrightness(0.7F); } - if (Static113.brightness == 4) { + if (Preferences.brightness == 4) { Rasteriser.setBrightness(0.6F); } } Static145.method2742(); - Static203.savePreferences(GameShell.signLink); + Preferences.write(GameShell.signLink); Static18.serverUpdatedPreferences = false; continue; } if (opcode == 6014) { isp--; - Static220.highWaterDetail = Static254.intStack[isp] == 1; + Preferences.highWaterDetail = Static254.intStack[isp] == 1; if (GlRenderer.enabled) { Static145.method2742(); } - Static203.savePreferences(GameShell.signLink); + Preferences.write(GameShell.signLink); Static18.serverUpdatedPreferences = false; continue; } if (opcode == 6015) { isp--; - Static71.fogEnabled = Static254.intStack[isp] == 1; + Preferences.fogEnabled = Static254.intStack[isp] == 1; if (GlRenderer.enabled) { Static86.setInstantFade(); } - Static203.savePreferences(GameShell.signLink); + Preferences.write(GameShell.signLink); Static18.serverUpdatedPreferences = false; continue; } @@ -3357,14 +3357,14 @@ public final class Static88 { if (type < 0 || type > 2) { type = 0; } - Static186.antiAliasingMode = type; + Preferences.antiAliasingMode = type; continue; } if (opcode == 6017) { isp--; - Static99.stereo = Static254.intStack[isp] == 1; + Preferences.stereo = Static254.intStack[isp] == 1; Static211.method930(); - Static203.savePreferences(GameShell.signLink); + Preferences.write(GameShell.signLink); Static18.serverUpdatedPreferences = false; continue; } @@ -3377,8 +3377,8 @@ public final class Static88 { if (type > 127) { type = 127; } - Static125.soundEffectVolume = type; - Static203.savePreferences(GameShell.signLink); + Preferences.soundEffectVolume = type; + Preferences.write(GameShell.signLink); Static18.serverUpdatedPreferences = false; continue; } @@ -3391,19 +3391,19 @@ public final class Static88 { if (type > 255) { type = 255; } - if (type != Static12.musicVolume) { - if (Static12.musicVolume == 0 && Static221.anInt4363 != -1) { + if (type != Preferences.musicVolume) { + if (Preferences.musicVolume == 0 && Static221.anInt4363 != -1) { Static122.method2410(Static130.js5Archive6, Static221.anInt4363, type); - Static144.aBoolean173 = false; + MidiPlayer.jingle = false; } else if (type == 0) { Static241.method4548(); - Static144.aBoolean173 = false; + MidiPlayer.jingle = false; } else { Static230.method3956(type); } - Static12.musicVolume = type; + Preferences.musicVolume = type; } - Static203.savePreferences(GameShell.signLink); + Preferences.write(GameShell.signLink); Static18.serverUpdatedPreferences = false; continue; } @@ -3416,8 +3416,8 @@ public final class Static88 { if (type > 127) { type = 127; } - Static30.ambientSoundsVolume = type; - Static203.savePreferences(GameShell.signLink); + Preferences.ambientSoundsVolume = type; + Preferences.write(GameShell.signLink); Static18.serverUpdatedPreferences = false; continue; } @@ -3441,8 +3441,8 @@ public final class Static88 { local1552 = true; type = 0; } - Static76.setParticles(type); - Static203.savePreferences(GameShell.signLink); + Preferences.setParticles(type); + Preferences.write(GameShell.signLink); Static18.serverUpdatedPreferences = false; Static254.intStack[isp++] = local1552 ? 0 : 1; continue; @@ -3453,87 +3453,87 @@ public final class Static88 { if (type < 0 || type > 2) { type = 0; } - Static102.windowMode = type; - Static203.savePreferences(GameShell.signLink); + Preferences.windowMode = type; + Preferences.write(GameShell.signLink); continue; } if (opcode == 6028) { isp--; - Static64.cursorsEnabled = Static254.intStack[isp] != 0; - Static203.savePreferences(GameShell.signLink); + Preferences.cursorsEnabled = Static254.intStack[isp] != 0; + Preferences.write(GameShell.signLink); continue; } } else if (opcode < 6200) { if (opcode == 6101) { - Static254.intStack[isp++] = Static113.brightness; + Static254.intStack[isp++] = Preferences.brightness; continue; } if (opcode == 6102) { - Static254.intStack[isp++] = Static138.allLevelsAreVisible() ? 1 : 0; + Static254.intStack[isp++] = SceneGraph.allLevelsAreVisible() ? 1 : 0; continue; } if (opcode == 6103) { - Static254.intStack[isp++] = Static80.removeRoofsSelectively ? 1 : 0; + Static254.intStack[isp++] = Preferences.removeRoofsSelectively ? 1 : 0; continue; } if (opcode == 6105) { - Static254.intStack[isp++] = Static250.showGroundDecorations ? 1 : 0; + Static254.intStack[isp++] = Preferences.showGroundDecorations ? 1 : 0; continue; } if (opcode == 6106) { - Static254.intStack[isp++] = Static53.highDetailTextures ? 1 : 0; + Static254.intStack[isp++] = Preferences.highDetailTextures ? 1 : 0; continue; } if (opcode == 6107) { - Static254.intStack[isp++] = Static15.manyIdleAnimations ? 1 : 0; + Static254.intStack[isp++] = Preferences.manyIdleAnimations ? 1 : 0; continue; } if (opcode == 6108) { - Static254.intStack[isp++] = Static11.flickeringEffectsOn ? 1 : 0; + Static254.intStack[isp++] = Preferences.flickeringEffectsOn ? 1 : 0; continue; } if (opcode == 6109) { - Static254.intStack[isp++] = Static159.manyGroundTextures ? 1 : 0; + Static254.intStack[isp++] = Preferences.manyGroundTextures ? 1 : 0; continue; } if (opcode == 6110) { - Static254.intStack[isp++] = Static209.characterShadowsOn ? 1 : 0; + Static254.intStack[isp++] = Preferences.characterShadowsOn ? 1 : 0; continue; } if (opcode == 6111) { - Static254.intStack[isp++] = Static139.sceneryShadowsType; + Static254.intStack[isp++] = Preferences.sceneryShadowsType; continue; } if (opcode == 6112) { - Static254.intStack[isp++] = Static178.highDetailLighting ? 1 : 0; + Static254.intStack[isp++] = Preferences.highDetailLighting ? 1 : 0; continue; } if (opcode == 6114) { - Static254.intStack[isp++] = Static220.highWaterDetail ? 1 : 0; + Static254.intStack[isp++] = Preferences.highWaterDetail ? 1 : 0; continue; } if (opcode == 6115) { - Static254.intStack[isp++] = Static71.fogEnabled ? 1 : 0; + Static254.intStack[isp++] = Preferences.fogEnabled ? 1 : 0; continue; } if (opcode == 6116) { - Static254.intStack[isp++] = Static186.antiAliasingMode; + Static254.intStack[isp++] = Preferences.antiAliasingMode; continue; } if (opcode == 6117) { - Static254.intStack[isp++] = Static99.stereo ? 1 : 0; + Static254.intStack[isp++] = Preferences.stereo ? 1 : 0; continue; } if (opcode == 6118) { - Static254.intStack[isp++] = Static125.soundEffectVolume; + Static254.intStack[isp++] = Preferences.soundEffectVolume; continue; } if (opcode == 6119) { - Static254.intStack[isp++] = Static12.musicVolume; + Static254.intStack[isp++] = Preferences.musicVolume; continue; } if (opcode == 6120) { - Static254.intStack[isp++] = Static30.ambientSoundsVolume; + Static254.intStack[isp++] = Preferences.ambientSoundsVolume; continue; } if (opcode == 6121) { @@ -3545,15 +3545,15 @@ public final class Static88 { continue; } if (opcode == 6123) { - Static254.intStack[isp++] = Static76.getParticleSetting(); + Static254.intStack[isp++] = Preferences.getParticleSetting(); continue; } if (opcode == 6124) { - Static254.intStack[isp++] = Static102.windowMode; + Static254.intStack[isp++] = Preferences.windowMode; continue; } if (opcode == 6128) { - Static254.intStack[isp++] = Static64.cursorsEnabled ? 1 : 0; + Static254.intStack[isp++] = Preferences.cursorsEnabled ? 1 : 0; continue; } } else if (opcode < 6300) { @@ -3676,7 +3676,7 @@ public final class Static88 { } } else if (opcode < 6600) { if (opcode == 6500) { - if (Static244.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0) { + if (client.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0) { Static254.intStack[isp++] = Static207.fetch() == -1 ? 0 : 1; continue; } @@ -3728,7 +3728,7 @@ public final class Static88 { if (opcode == 6503) { isp--; type = Static254.intStack[isp]; - if (Static244.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0) { + if (client.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0) { Static254.intStack[isp++] = Static176.hopWorld(type) ? 1 : 0; continue; } @@ -3737,12 +3737,12 @@ public final class Static88 { } if (opcode == 6504) { isp--; - Static164.lastWorldId = Static254.intStack[isp]; - Static203.savePreferences(GameShell.signLink); + Preferences.lastWorldId = Static254.intStack[isp]; + Preferences.write(GameShell.signLink); continue; } if (opcode == 6505) { - Static254.intStack[isp++] = Static164.lastWorldId; + Static254.intStack[isp++] = Preferences.lastWorldId; continue; } if (opcode == 6506) { @@ -3777,12 +3777,12 @@ public final class Static88 { } else if (opcode < 6700) { if (opcode == 6600) { isp--; - Static33.aBoolean63 = Static254.intStack[isp] == 1; - Static203.savePreferences(GameShell.signLink); + Preferences.aBoolean63 = Static254.intStack[isp] == 1; + Preferences.write(GameShell.signLink); continue; } if (opcode == 6601) { - Static254.intStack[isp++] = Static33.aBoolean63 ? 1 : 0; + Static254.intStack[isp++] = Preferences.aBoolean63 ? 1 : 0; continue; } } @@ -3793,9 +3793,9 @@ public final class Static88 { local803 = Static254.intStack[isp + 1]; local5294 = Static110.method2277(local803); if (local5294.isString()) { - Static3.stringStack[ssp++] = Static123.method2417(type).method2802(local5294.defaultString, local803); + Static3.stringStack[ssp++] = Static123.method2417(type).getParam(local5294.defaultString, local803); } else { - Static254.intStack[isp++] = Static123.method2417(type).method2798(local803, local5294.defaultInt); + Static254.intStack[isp++] = Static123.method2417(type).getParam(local803, local5294.defaultInt); } continue; } @@ -3817,14 +3817,14 @@ public final class Static88 { string = Static3.stringStack[ssp]; isp--; local803 = Static254.intStack[isp]; - Static3.stringStack[ssp++] = Static34.concatenate(new JagString[] { string, Static123.parseInt(local803) }); + Static3.stringStack[ssp++] = JagString.concatenate(new JagString[] { string, Static123.parseInt(local803) }); continue; } if (opcode == 4101) { ssp -= 2; local2522 = Static3.stringStack[ssp + 1]; string = Static3.stringStack[ssp]; - Static3.stringStack[ssp++] = Static34.concatenate(new JagString[] { string, local2522 }); + Static3.stringStack[ssp++] = JagString.concatenate(new JagString[] { string, local2522 }); continue; } if (opcode == 4102) { @@ -3832,7 +3832,7 @@ public final class Static88 { string = Static3.stringStack[ssp]; isp--; local803 = Static254.intStack[isp]; - Static3.stringStack[ssp++] = Static34.concatenate(new JagString[] { string, Static110.method2285(local803) }); + Static3.stringStack[ssp++] = JagString.concatenate(new JagString[] { string, Static110.method2285(local803) }); continue; } if (opcode == 4103) { @@ -3849,14 +3849,14 @@ public final class Static88 { local652 = Static102.aCalendar2.get(5); c = Static102.aCalendar2.get(2); local1087 = Static102.aCalendar2.get(1); - Static3.stringStack[ssp++] = Static34.concatenate(new JagString[] { Static123.parseInt(local652), Static163.aClass100_767, Static34.aClass100Array40[c], Static163.aClass100_767, Static123.parseInt(local1087) }); + Static3.stringStack[ssp++] = JagString.concatenate(new JagString[] { Static123.parseInt(local652), Static163.aClass100_767, Static34.aClass100Array40[c], Static163.aClass100_767, Static123.parseInt(local1087) }); continue; } if (opcode == 4105) { ssp -= 2; local2522 = Static3.stringStack[ssp + 1]; string = Static3.stringStack[ssp]; - if (Static173.self.aClass59_1 != null && Static173.self.aClass59_1.aBoolean141) { + if (PlayerList.self.appearance != null && PlayerList.self.appearance.aBoolean141) { Static3.stringStack[ssp++] = local2522; continue; } @@ -4018,7 +4018,7 @@ public final class Static88 { local12388 = Static254.intStack[isp] != 0; isp--; local803 = Static254.intStack[isp]; - Static3.stringStack[ssp++] = Static182.valueToBase10String(Static141.language, local12388, 0, (long) local803); + Static3.stringStack[ssp++] = Static182.valueToBase10String(client.language, local12388, 0, (long) local803); continue; } } @@ -4118,10 +4118,10 @@ public final class Static88 { } } catch (@Pc(14378) Exception ex) { if (script.name == null) { - if (Static83.modeWhere != 0) { + if (client.modeWhere != 0) { Static103.method2231(Static72.EMPTY_STRING, 0, Static136.CS_ERROR); } - Static89.report("CS2 - scr:" + script.key + " op:" + op, ex); + TracingException.report("CS2 - scr:" + script.key + " op:" + op, ex); } else { @Pc(14385) JagString str = Static87.allocate(30); str.method3113(Static219.aClass100_928).method3113(script.name); @@ -4132,10 +4132,10 @@ public final class Static88 { cycles = intOperands[pc]; str.method3113(Static176.aClass100_802).method3113(Static123.parseInt(cycles)); } - if (Static83.modeWhere != 0) { - Static103.method2231(Static72.EMPTY_STRING, 0, Static34.concatenate(new JagString[] { Static167.aClass100_780, script.name})); + if (client.modeWhere != 0) { + Static103.method2231(Static72.EMPTY_STRING, 0, JagString.concatenate(new JagString[] { Static167.aClass100_780, script.name})); } - Static89.report("CS2 - scr:" + script.key + " op:" + op + new String(str.method3148()), ex); + TracingException.report("CS2 - scr:" + script.key + " op:" + op + new String(str.method3148()), ex); } } } diff --git a/client/src/main/java/Static89.java b/client/src/main/java/Static89.java index d7b28e7..f64e6db 100644 --- a/client/src/main/java/Static89.java +++ b/client/src/main/java/Static89.java @@ -1,5 +1,3 @@ -import java.io.DataInputStream; -import java.net.URL; import java.util.Random; import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; @@ -109,41 +107,7 @@ public final class Static89 { return Static154.method2929(arg1); } - @OriginalMember(owner = "client!ha", name = "a", descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;B)V") - public static void report(@OriginalArg(0) String arg0, @OriginalArg(1) Throwable arg1) { - try { - @Pc(13) String local13 = ""; - if (arg1 != null) { - local13 = Static97.method1961(arg1); - } - if (arg0 != null) { - if (arg1 != null) { - local13 = local13 + " | "; - } - local13 = local13 + arg0; - } - Static5.method31(local13); - local13 = Static40.method1014(":", "%3a", local13); - local13 = Static40.method1014("@", "%40", local13); - local13 = Static40.method1014("&", "%26", local13); - local13 = Static40.method1014("#", "%23", local13); - if (Static69.signLink.applet == null) { - return; - } - @Pc(109) PrivilegedRequest local109 = Static69.signLink.openUrlStream(new URL(Static69.signLink.applet.getCodeBase(), "clienterror.ws?c=" + GameShell.anInt3252 + "&u=" + Static101.aLong98 + "&v1=" + SignLink.javaVendor + "&v2=" + SignLink.javaVersion + "&e=" + local13)); - while (local109.status == 0) { - Static231.sleep(1L); - } - if (local109.status == 1) { - @Pc(128) DataInputStream local128 = (DataInputStream) local109.result; - local128.read(); - local128.close(); - } - } catch (@Pc(135) Exception local135) { - } - } - - @OriginalMember(owner = "client!ha", name = "b", descriptor = "(II)V") + @OriginalMember(owner = "client!ha", name = "b", descriptor = "(II)V") public static void method1840(@OriginalArg(1) int arg0) { @Pc(8) DelayedStateChange local8 = Static238.method4143(2, arg0); local8.pushClient(); @@ -152,7 +116,7 @@ public final class Static89 { @OriginalMember(owner = "client!ha", name = "a", descriptor = "(I)V") public static void method1841() { if (!Static60.aBoolean108) { - if (Static162.anInt3953 != 0) { + if (Static226.anInt3953 != 0) { Static155.anInt3751 = Static277.anInt5850; Static60.anInt1892 = Static280.anInt5895; } else if (Static150.clickButton == 0) { @@ -164,17 +128,17 @@ public final class Static89 { } Static231.anInt5204 = 1; Static254.aClass100Array168[0] = LocalizedText.CANCEL; - Static233.aClass100Array160[0] = Static186.EMPTY; + Static233.aClass100Array160[0] = JagString.EMPTY; Static39.aShortArray6[0] = 1005; Static190.anIntArray382[0] = Static35.anInt1092; } - if (Static154.topLevelInterface != -1) { - Static96.method1949(Static154.topLevelInterface); + if (InterfaceList.topLevelInterface != -1) { + Static96.method1949(InterfaceList.topLevelInterface); } @Pc(60) int local60; - for (local60 = 0; local60 < Static24.anInt766; local60++) { + for (local60 = 0; local60 < InterfaceList.anInt766; local60++) { if (Static186.aBooleanArray100[local60]) { - Static31.rectangleRedraw[local60] = true; + InterfaceList.rectangleRedraw[local60] = true; } Static223.aBooleanArray116[local60] = Static186.aBooleanArray100[local60]; Static186.aBooleanArray100[local60] = false; @@ -187,14 +151,14 @@ public final class Static89 { Static263.aBoolean299 = true; } Static182.anInt4311 = Static83.loop; - if (Static154.topLevelInterface != -1) { - Static24.anInt766 = 0; + if (InterfaceList.topLevelInterface != -1) { + InterfaceList.anInt766 = 0; Static9.method182(); } if (GlRenderer.enabled) { Static46.method1177(); } else { - Static129.method2503(); + SoftwareRaster.method2503(); } Static280.method4673(); if (Static60.aBoolean108) { @@ -220,23 +184,23 @@ public final class Static89 { Static187.anInt4422 = 2; } if (Static199.rectDebug == 3) { - for (@Pc(189) int local189 = 0; local189 < Static24.anInt766; local189++) { + for (@Pc(189) int local189 = 0; local189 < InterfaceList.anInt766; local189++) { if (Static223.aBooleanArray116[local189]) { if (GlRenderer.enabled) { Static46.method1182(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711935, 128); } else { - Static129.method2484(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711935, 128); + SoftwareRaster.method2484(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711935, 128); } - } else if (Static31.rectangleRedraw[local189]) { + } else if (InterfaceList.rectangleRedraw[local189]) { if (GlRenderer.enabled) { Static46.method1182(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711680, 128); } else { - Static129.method2484(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711680, 128); + SoftwareRaster.method2484(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711680, 128); } } } } - Static110.method2281(Static178.anInt4247, Static173.self.xFine, Static173.self.zFine, Static55.level); + Static110.method2281(Static178.anInt4247, PlayerList.self.xFine, PlayerList.self.zFine, Static55.level); Static178.anInt4247 = 0; } diff --git a/client/src/main/java/Static9.java b/client/src/main/java/Static9.java index eb2d692..4063270 100644 --- a/client/src/main/java/Static9.java +++ b/client/src/main/java/Static9.java @@ -67,7 +67,7 @@ public final class Static9 { @OriginalMember(owner = "client!al", name = "a", descriptor = "(Z)V") public static void method182() { Static241.aClass13Array13 = null; - Static6.method86(Static154.topLevelInterface, 0, GameShell.canvasWidth, 0, -1, GameShell.canvasHeight, 0, 0); + Static6.method86(InterfaceList.topLevelInterface, 0, GameShell.canvasWidth, 0, -1, GameShell.canvasHeight, 0, 0); if (Static241.aClass13Array13 != null) { Static87.method1809(0, Static127.anInt3126, Static80.anInt4696, Static241.aClass13Array13, GameShell.canvasWidth, -1412584499, 0, GameShell.canvasHeight, Static4.aClass13_1.anInt517); Static241.aClass13Array13 = null; @@ -77,8 +77,8 @@ public final class Static9 { @OriginalMember(owner = "client!al", name = "a", descriptor = "(ZZZIZ)Lclient!ve;") public static Js5 createJs5(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) int arg3) { @Pc(7) Cache local7 = null; - if (Static172.cacheData != null) { - local7 = new Cache(arg3, Static172.cacheData, Static47.cacheIndexes[arg3], 1000000); + if (client.cacheData != null) { + local7 = new Cache(arg3, client.cacheData, client.cacheIndexes[arg3], 1000000); } Static269.js5Providers[arg3] = Static257.js5MasterIndex.method180(arg3, Static148.masterCache, local7); if (arg1) { diff --git a/client/src/main/java/Static90.java b/client/src/main/java/Static90.java index 1bb8b37..50e3fb0 100644 --- a/client/src/main/java/Static90.java +++ b/client/src/main/java/Static90.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static90 { - @OriginalMember(owner = "client!hb", name = "v", descriptor = "[[[B") - public static byte[][][] aByteArrayArrayArray8; - - @OriginalMember(owner = "client!hb", name = "t", descriptor = "[I") + @OriginalMember(owner = "client!hb", name = "t", descriptor = "[I") public static final int[] anIntArray215 = new int[] { 160, 192, 80, 96, 0, 144, 80, 48, 160 }; @OriginalMember(owner = "client!hb", name = "b", descriptor = "(Lclient!na;I)V") diff --git a/client/src/main/java/Static91.java b/client/src/main/java/Static91.java index a83c865..7da54f2 100644 --- a/client/src/main/java/Static91.java +++ b/client/src/main/java/Static91.java @@ -12,13 +12,13 @@ public final class Static91 { @OriginalMember(owner = "client!hc", name = "d", descriptor = "(I)I") public static int method1874() { - if ((double) Static138.aFloat14 == 3.0D) { + if ((double) WorldMap.targetZoom == 3.0D) { return 37; - } else if ((double) Static138.aFloat14 == 4.0D) { + } else if ((double) WorldMap.targetZoom == 4.0D) { return 50; - } else if ((double) Static138.aFloat14 == 6.0D) { + } else if ((double) WorldMap.targetZoom == 6.0D) { return 75; - } else if ((double) Static138.aFloat14 == 8.0D) { + } else if ((double) WorldMap.targetZoom == 8.0D) { return 100; } else { return 200; @@ -104,11 +104,11 @@ public final class Static91 { @OriginalMember(owner = "client!hc", name = "a", descriptor = "(Lclient!na;Z)I") public static int method1879(@OriginalArg(0) JagString arg0) { - if (Static203.aClass134_1 == null || arg0.length() == 0) { + if (WorldMap.labels == null || arg0.length() == 0) { return -1; } - for (@Pc(20) int local20 = 0; local20 < Static203.aClass134_1.anInt5074; local20++) { - if (Static203.aClass134_1.aClass100Array153[local20].method3140(Static101.aClass100_538, Static197.aClass100_872).strEquals(arg0)) { + for (@Pc(20) int local20 = 0; local20 < WorldMap.labels.anInt5074; local20++) { + if (WorldMap.labels.aClass100Array153[local20].method3140(Static101.aClass100_538, Static197.aClass100_872).strEquals(arg0)) { return local20; } } diff --git a/client/src/main/java/Static97.java b/client/src/main/java/Static97.java index f70667d..38b43ee 100644 --- a/client/src/main/java/Static97.java +++ b/client/src/main/java/Static97.java @@ -31,7 +31,7 @@ public final class Static97 { } @Pc(30) int local30 = Math.min(arg5.anInt445 / 2, arg5.anInt459 / 2); if (local30 * local30 >= local13) { - Static60.method1446(arg5, Static149.aClass3_Sub2_Sub1Array7[arg0], arg4, arg3, arg1, arg2); + Static60.method1446(arg5, Sprites.mapmarkhints[arg0], arg4, arg3, arg1, arg2); return; } local30 -= 10; @@ -46,9 +46,9 @@ public final class Static97 { @Pc(117) int local117 = (int) (Math.sin(local110) * (double) local30); @Pc(124) int local124 = (int) (Math.cos(local110) * (double) local30); if (GlRenderer.enabled) { - ((GlSprite) Static277.aClass3_Sub2_Sub1Array12[arg0]).method1428((arg5.anInt445 / 2 + arg2 + local117) * 16, (arg5.anInt459 / 2 + arg1 - local124) * 16, (int) (local110 * 10430.378D)); + ((GlSprite) Static277.hintMapEdge[arg0]).method1428((arg5.anInt445 / 2 + arg2 + local117) * 16, (arg5.anInt459 / 2 + arg1 - local124) * 16, (int) (local110 * 10430.378D)); } else { - ((SoftwareSprite) Static277.aClass3_Sub2_Sub1Array12[arg0]).method306(local117 + arg5.anInt445 / 2 + arg2 - 10, arg5.anInt459 / 2 + -10 + arg1 + -local124, local110); + ((SoftwareSprite) Static277.hintMapEdge[arg0]).method306(local117 + arg5.anInt445 / 2 + arg2 - 10, arg5.anInt459 / 2 + -10 + arg1 + -local124, local110); } } diff --git a/client/src/main/java/Static98.java b/client/src/main/java/Static98.java index f76fe64..2d5564b 100644 --- a/client/src/main/java/Static98.java +++ b/client/src/main/java/Static98.java @@ -4,24 +4,18 @@ import org.openrs2.deob.annotation.Pc; public final class Static98 { - @OriginalMember(owner = "client!hj", name = "a", descriptor = "I") - public static int anInt2510; - @OriginalMember(owner = "client!hj", name = "e", descriptor = "I") public static int anInt2512; @OriginalMember(owner = "client!hj", name = "m", descriptor = "Lclient!ve;") public static Js5 aClass153_42; - @OriginalMember(owner = "client!hj", name = "d", descriptor = "Lclient!na;") - public static final JagString aClass100_524 = Static28.parse("hint_headicons"); - @OriginalMember(owner = "client!hj", name = "a", descriptor = "(II)V") public static void method1964(@OriginalArg(0) int arg0) { - Static217.anInt4901 = -1; - Static142.anInt3482 = -1; - Static13.anInt435 = arg0; - Static38.method965(); + WorldMap.anInt4901 = -1; + WorldMap.anInt3482 = -1; + WorldMap.anInt435 = arg0; + WorldMap.method965(); } @OriginalMember(owner = "client!hj", name = "a", descriptor = "(Lclient!na;B)Z") @@ -34,7 +28,7 @@ public final class Static98 { return true; } } - if (arg0.equalsIgnoreCase(Static173.self.aClass100_364)) { + if (arg0.equalsIgnoreCase(PlayerList.self.aClass100_364)) { return true; } else { return false; diff --git a/client/src/main/java/Static99.java b/client/src/main/java/Static99.java index 2e724b1..0410b8c 100644 --- a/client/src/main/java/Static99.java +++ b/client/src/main/java/Static99.java @@ -14,9 +14,6 @@ public final class Static99 { @OriginalMember(owner = "client!hk", name = "db", descriptor = "Lclient!na;") public static final JagString aClass100_529 = Static28.parse("::wm3"); - @OriginalMember(owner = "client!hk", name = "eb", descriptor = "Z") - public static boolean stereo = true; - - @OriginalMember(owner = "client!hk", name = "fb", descriptor = "[I") + @OriginalMember(owner = "client!hk", name = "fb", descriptor = "[I") public static final int[] anIntArray240 = new int[25]; } diff --git a/client/src/main/java/StructType.java b/client/src/main/java/StructType.java index a8a49a2..e9d8520 100644 --- a/client/src/main/java/StructType.java +++ b/client/src/main/java/StructType.java @@ -7,28 +7,28 @@ import org.openrs2.deob.annotation.Pc; public final class StructType extends SecondaryNode { @OriginalMember(owner = "client!lk", name = "I", descriptor = "Lclient!sc;") - private HashTable aClass133_14; + private HashTable params; @OriginalMember(owner = "client!lk", name = "a", descriptor = "(IIB)I") - public final int method2798(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { - if (this.aClass133_14 == null) { + public final int getParam(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { + if (this.params == null) { return arg1; } else { - @Pc(29) IntNode local29 = (IntNode) this.aClass133_14.get((long) arg0); + @Pc(29) IntNode local29 = (IntNode) this.params.get((long) arg0); return local29 == null ? arg1 : local29.value; } } @OriginalMember(owner = "client!lk", name = "a", descriptor = "(Lclient!wa;IB)V") - private void method2799(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int arg1) { + private void decode(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int arg1) { if (arg1 != 249) { return; } @Pc(17) int local17 = arg0.g1(); @Pc(25) int local25; - if (this.aClass133_14 == null) { + if (this.params == null) { local25 = Static165.clp2(local17); - this.aClass133_14 = new HashTable(local25); + this.params = new HashTable(local25); } for (local25 = 0; local25 < local17; local25++) { @Pc(45) boolean local45 = arg0.g1() == 1; @@ -39,28 +39,28 @@ public final class StructType extends SecondaryNode { } else { local58 = new IntNode(arg0.g4()); } - this.aClass133_14.put(local58, (long) local49); + this.params.put(local58, (long) local49); } } @OriginalMember(owner = "client!lk", name = "a", descriptor = "(Lclient!na;BI)Lclient!na;") - public final JagString method2802(@OriginalArg(0) JagString arg0, @OriginalArg(2) int arg1) { - if (this.aClass133_14 == null) { + public final JagString getParam(@OriginalArg(0) JagString arg0, @OriginalArg(2) int arg1) { + if (this.params == null) { return arg0; } else { - @Pc(16) StringNode local16 = (StringNode) this.aClass133_14.get((long) arg1); + @Pc(16) StringNode local16 = (StringNode) this.params.get((long) arg1); return local16 == null ? arg0 : local16.value; } } @OriginalMember(owner = "client!lk", name = "a", descriptor = "(ILclient!wa;)V") - public final void method2806(@OriginalArg(1) Buffer arg0) { + public final void decode(@OriginalArg(1) Buffer arg0) { while (true) { @Pc(5) int local5 = arg0.g1(); if (local5 == 0) { return; } - this.method2799(arg0, local5); + this.decode(arg0, local5); } } } diff --git a/client/src/main/java/SubScript.java b/client/src/main/java/SubScript.java new file mode 100644 index 0000000..0472e49 --- /dev/null +++ b/client/src/main/java/SubScript.java @@ -0,0 +1,6 @@ +import org.openrs2.deob.annotation.OriginalMember; + +public class SubScript { + @OriginalMember(owner = "client!dg", name = "c", descriptor = "[[S") + public static final short[][] aShortArrayArray5 = new short[][] { { 6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002 }, { 9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019 }, new short[0], new short[0], new short[0] }; +} diff --git a/client/src/main/java/SynthSound.java b/client/src/main/java/SynthSound.java index 8a9ae25..e4e93f2 100644 --- a/client/src/main/java/SynthSound.java +++ b/client/src/main/java/SynthSound.java @@ -29,7 +29,13 @@ public final class SynthSound { this.anInt5206 = arg0.g2(); } - @OriginalMember(owner = "client!sl", name = "a", descriptor = "()[B") + @OriginalMember(owner = "client!sl", name = "a", descriptor = "(Lclient!ve;II)Lclient!sl;") + public static SynthSound create(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { + @Pc(5) byte[] local5 = arg0.getFile(arg1, arg2); + return local5 == null ? null : new SynthSound(new Buffer(local5)); + } + + @OriginalMember(owner = "client!sl", name = "a", descriptor = "()[B") private byte[] method3987() { @Pc(1) int local1 = 0; @Pc(3) int local3; diff --git a/client/src/main/java/TextureOp29.java b/client/src/main/java/TextureOp29.java index 57b15b9..e0679a4 100644 --- a/client/src/main/java/TextureOp29.java +++ b/client/src/main/java/TextureOp29.java @@ -59,7 +59,7 @@ public final class TextureOp29 extends TextureOp { if (local24 == 0) { this.aClass18Array1[local11] = Static9.method184(arg1); } else if (local24 == 1) { - this.aClass18Array1[local11] = Static21.method620(arg1); + this.aClass18Array1[local11] = TextureOp29SubOp3.create(arg1); } else if (local24 == 2) { this.aClass18Array1[local11] = Static156.method2960(arg1); } else if (local24 == 3) { diff --git a/client/src/main/java/TextureOp29SubOp3.java b/client/src/main/java/TextureOp29SubOp3.java index 53a16de..d6aca38 100644 --- a/client/src/main/java/TextureOp29SubOp3.java +++ b/client/src/main/java/TextureOp29SubOp3.java @@ -43,7 +43,12 @@ public final class TextureOp29SubOp3 extends TextureOp29SubOp { this.anInt4854 = arg2; } - @OriginalMember(owner = "client!re", name = "a", descriptor = "(IZI)V") + @OriginalMember(owner = "client!bk", name = "a", descriptor = "(BLclient!wa;)Lclient!re;") + public static TextureOp29SubOp3 create(@OriginalArg(1) Buffer arg0) { + return new TextureOp29SubOp3(arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g3(), arg0.g1()); + } + + @OriginalMember(owner = "client!re", name = "a", descriptor = "(IZI)V") @Override public final void method4009(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { @Pc(6) int local6 = arg1 * this.anInt4846 >> 12; diff --git a/client/src/main/java/TextureOpSprite.java b/client/src/main/java/TextureOpSprite.java index 212d3fe..6306c8f 100644 --- a/client/src/main/java/TextureOpSprite.java +++ b/client/src/main/java/TextureOpSprite.java @@ -30,8 +30,8 @@ public class TextureOpSprite extends TextureOp { } else if (this.anInt3235 < 0) { return false; } else { - @Pc(43) SoftwareSprite local43 = Static215.anInt4868 < 0 ? Static164.method3117(Static176.aClass153_76, this.anInt3235) : Static78.method1693(this.anInt3235, Static176.aClass153_76, Static215.anInt4868); - local43.method311(); + @Pc(43) SoftwareSprite local43 = Static215.anInt4868 < 0 ? Static164.method3117(Static176.aClass153_76, this.anInt3235) : SpriteLoader.loadSoftwareSprite(this.anInt3235, Static176.aClass153_76, Static215.anInt4868); + local43.trim(); this.anInt3240 = local43.anInt1859; this.anInt3239 = local43.anInt1867; this.anIntArray305 = local43.anIntArray20; diff --git a/client/src/main/java/ThreadUtils.java b/client/src/main/java/ThreadUtils.java new file mode 100644 index 0000000..fff74bf --- /dev/null +++ b/client/src/main/java/ThreadUtils.java @@ -0,0 +1,26 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class ThreadUtils { + @OriginalMember(owner = "client!sk", name = "a", descriptor = "(JI)V") + public static void sleep(@OriginalArg(0) long arg0) { + if (arg0 <= 0L) { + return; + } + if (arg0 % 10L == 0L) { + sleepUninterruptibly(arg0 - 1L); + sleepUninterruptibly(1L); + } else { + sleepUninterruptibly(arg0); + } + } + + @OriginalMember(owner = "client!rm", name = "a", descriptor = "(JB)V") + public static void sleepUninterruptibly(@OriginalArg(0) long arg0) { + try { + Thread.sleep(arg0); + } catch (@Pc(11) InterruptedException local11) { + } + } +} diff --git a/client/src/main/java/Timer.java b/client/src/main/java/Timer.java index c920563..570460d 100644 --- a/client/src/main/java/Timer.java +++ b/client/src/main/java/Timer.java @@ -1,13 +1,23 @@ import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; @OriginalClass("client!s") public abstract class Timer { + @OriginalMember(owner = "client!fi", name = "a", descriptor = "(B)Lclient!s;") + public static Timer create() { + try { + return (Timer) Class.forName("NanoTimer").getDeclaredConstructor().newInstance(); + } catch (@Pc(15) Throwable ex) { + return new MillisTimer(); + } + } + @OriginalMember(owner = "client!s", name = "a", descriptor = "(III)I") public abstract int sleep(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1); @OriginalMember(owner = "client!s", name = "b", descriptor = "(I)V") - public abstract void method3394(); + public abstract void reset(); } diff --git a/client/src/main/java/TracingException.java b/client/src/main/java/TracingException.java index 43fd1d0..b69ef58 100644 --- a/client/src/main/java/TracingException.java +++ b/client/src/main/java/TracingException.java @@ -1,5 +1,10 @@ +import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +import java.io.DataInputStream; +import java.net.URL; @OriginalClass("client!ld") public final class TracingException extends RuntimeException { @@ -9,4 +14,38 @@ public final class TracingException extends RuntimeException { @OriginalMember(owner = "client!ld", name = "f", descriptor = "Ljava/lang/Throwable;") public Throwable aThrowable1; + + @OriginalMember(owner = "client!ha", name = "a", descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;B)V") + public static void report(@OriginalArg(0) String arg0, @OriginalArg(1) Throwable arg1) { + try { + @Pc(13) String local13 = ""; + if (arg1 != null) { + local13 = Static97.method1961(arg1); + } + if (arg0 != null) { + if (arg1 != null) { + local13 = local13 + " | "; + } + local13 = local13 + arg0; + } + Static5.method31(local13); + local13 = Static40.method1014(":", "%3a", local13); + local13 = Static40.method1014("@", "%40", local13); + local13 = Static40.method1014("&", "%26", local13); + local13 = Static40.method1014("#", "%23", local13); + if (Static69.signLink.applet == null) { + return; + } + @Pc(109) PrivilegedRequest local109 = Static69.signLink.openUrlStream(new URL(Static69.signLink.applet.getCodeBase(), "clienterror.ws?c=" + GameShell.anInt3252 + "&u=" + Static101.aLong98 + "&v1=" + SignLink.javaVendor + "&v2=" + SignLink.javaVersion + "&e=" + local13)); + while (local109.status == 0) { + ThreadUtils.sleep(1L); + } + if (local109.status == 1) { + @Pc(128) DataInputStream local128 = (DataInputStream) local109.result; + local128.read(); + local128.close(); + } + } catch (@Pc(135) Exception local135) { + } + } } diff --git a/client/src/main/java/UnderwaterMaterialRenderer.java b/client/src/main/java/UnderwaterMaterialRenderer.java index e6c1738..910d459 100644 --- a/client/src/main/java/UnderwaterMaterialRenderer.java +++ b/client/src/main/java/UnderwaterMaterialRenderer.java @@ -152,7 +152,7 @@ public final class UnderwaterMaterialRenderer implements MaterialRenderer { local1.glTexGenfv(GL2.GL_R, GL2.GL_EYE_PLANE, this.aFloatArray29, 0); local1.glActiveTexture(GL2.GL_TEXTURE2); } - local1.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, Static123.method2422(), 0); + local1.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, WaterMaterialRenderer.method2422(), 0); if (arg0 >= 0) { this.aFloatArray29[0] = 0.0F; this.aFloatArray29[1] = 1.0F / (float) Static170.anInt3241; diff --git a/client/src/main/java/UnlitMaterialRenderer.java b/client/src/main/java/UnlitMaterialRenderer.java index ccbae1c..c21da12 100644 --- a/client/src/main/java/UnlitMaterialRenderer.java +++ b/client/src/main/java/UnlitMaterialRenderer.java @@ -8,7 +8,7 @@ public final class UnlitMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!ue", name = "b", descriptor = "()V") @Override public final void method4603() { - if (Static178.highDetailLighting) { + if (Preferences.highDetailLighting) { GlRenderer.setLightingEnabled(false); } } @@ -27,7 +27,7 @@ public final class UnlitMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!ue", name = "a", descriptor = "()V") @Override public final void method4602() { - if (Static178.highDetailLighting) { + if (Preferences.highDetailLighting) { GlRenderer.setLightingEnabled(true); } } diff --git a/client/src/main/java/VorbisCodebook.java b/client/src/main/java/VorbisCodebook.java index 2ca4351..23cff84 100644 --- a/client/src/main/java/VorbisCodebook.java +++ b/client/src/main/java/VorbisCodebook.java @@ -1,3 +1,4 @@ +import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @@ -62,7 +63,7 @@ public final class VorbisCodebook { @Pc(118) boolean local118 = Static117.method2346() != 0; @Pc(127) int local127; if (local27 == 1) { - local127 = Static288.method2416(this.anInt3056, this.anInt3055); + local127 = lookup1Values(this.anInt3056, this.anInt3055); } else { local127 = this.anInt3056 * this.anInt3055; } @@ -106,7 +107,15 @@ public final class VorbisCodebook { } } - @OriginalMember(owner = "client!ji", name = "a", descriptor = "()[F") + @OriginalMember(owner = "client!ji", name = "a", descriptor = "(II)I") + public static int lookup1Values(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { + @Pc(10) int returnValue; + for (returnValue = (int) Math.pow((double) arg0, 1.0D / (double) arg1) + 1; IntUtils.pow(arg1, returnValue) > arg0; returnValue--) { + } + return returnValue; + } + + @OriginalMember(owner = "client!ji", name = "a", descriptor = "()[F") public final float[] method2413() { return this.aFloatArrayArray1[this.method2415()]; } diff --git a/client/src/main/java/WaterMaterialRenderer.java b/client/src/main/java/WaterMaterialRenderer.java index 1c73a2a..da920bc 100644 --- a/client/src/main/java/WaterMaterialRenderer.java +++ b/client/src/main/java/WaterMaterialRenderer.java @@ -8,7 +8,9 @@ import org.openrs2.deob.annotation.Pc; @OriginalClass("client!pd") public final class WaterMaterialRenderer implements MaterialRenderer { - @OriginalMember(owner = "client!pd", name = "a", descriptor = "I") + @OriginalMember(owner = "client!v", name = "c", descriptor = "[F") + public static final float[] aFloatArray2 = new float[] { 0.073F, 0.169F, 0.24F, 1.0F }; + @OriginalMember(owner = "client!pd", name = "a", descriptor = "I") private int anInt4440 = -1; @OriginalMember(owner = "client!pd", name = "c", descriptor = "[F") @@ -26,6 +28,21 @@ public final class WaterMaterialRenderer implements MaterialRenderer { this.method3437(); } + @OriginalMember(owner = "client!jj", name = "a", descriptor = "(B)[F") + public static float[] method2422() { + @Pc(3) float local3 = Static161.method3068() + Static161.method3059(); + @Pc(9) int local9 = Static161.method3064(); + @Pc(18) float local18 = (float) (local9 >> 16 & 0xFF) / 255.0F; + Static251.aFloatArray28[3] = 1.0F; + @Pc(37) float local37 = (float) (local9 >> 8 & 0xFF) / 255.0F; + @Pc(39) float local39 = 0.58823526F; + @Pc(46) float local46 = (float) (local9 & 0xFF) / 255.0F; + Static251.aFloatArray28[2] = aFloatArray2[2] * local46 * local39 * local3; + Static251.aFloatArray28[0] = aFloatArray2[0] * local18 * local39 * local3; + Static251.aFloatArray28[1] = local3 * local39 * local37 * aFloatArray2[1]; + return Static251.aFloatArray28; + } + @OriginalMember(owner = "client!pd", name = "d", descriptor = "()V") private void method3435() { @Pc(2) byte[] local2 = new byte[] { 0, -1 }; @@ -114,7 +131,7 @@ public final class WaterMaterialRenderer implements MaterialRenderer { public final void method4604(@OriginalArg(0) int arg0) { @Pc(1) GL2 local1 = GlRenderer.gl; local1.glActiveTexture(GL2.GL_TEXTURE1); - local1.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, Static257.aFloatArray2, 0); + local1.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, aFloatArray2, 0); local1.glActiveTexture(GL2.GL_TEXTURE0); if ((arg0 & 0x1) == 1) { if (!Static151.allows3DTextureMapping) { diff --git a/client/src/main/java/WorldMap.java b/client/src/main/java/WorldMap.java new file mode 100644 index 0000000..434095f --- /dev/null +++ b/client/src/main/java/WorldMap.java @@ -0,0 +1,833 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class WorldMap { + @OriginalMember(owner = "client!nc", name = "e", descriptor = "Lclient!na;") + public static final JagString UNDERLAY = Static28.parse("underlay"); + @OriginalMember(owner = "client!vj", name = "m", descriptor = "Lclient!na;") + public static final JagString LABELS = Static28.parse("_labels"); + @OriginalMember(owner = "client!ac", name = "m", descriptor = "Lclient!na;") + public static final JagString OVERLAY = Static28.parse("overlay"); + @OriginalMember(owner = "client!fm", name = "gb", descriptor = "Lclient!na;") + public static final JagString OVERLAY2 = Static28.parse("overlay2"); + @OriginalMember(owner = "client!df", name = "c", descriptor = "Lclient!na;") + public static final JagString LOC = Static28.parse("loc"); + @OriginalMember(owner = "client!vk", name = "h", descriptor = "I") + public static final int anInt5338 = (int) (Math.random() * 33.0D) - 16; + @OriginalMember(owner = "client!kd", name = "rb", descriptor = "I") + public static final int anInt3254 = (int) (Math.random() * 17.0D) - 8; + @OriginalMember(owner = "client!lf", name = "c", descriptor = "Lclient!ih;") + public static final LinkedList mapElements = new LinkedList(); + @OriginalMember(owner = "client!wa", name = "ub", descriptor = "Lclient!bn;") + public static Map currentMap; + @OriginalMember(owner = "client!dc", name = "O", descriptor = "I") + public static int loadPercentage = 0; + @OriginalMember(owner = "client!gj", name = "r", descriptor = "F") + public static float zoom; + @OriginalMember(owner = "client!km", name = "uc", descriptor = "F") + public static float targetZoom; + @OriginalMember(owner = "client!mh", name = "S", descriptor = "I") + public static int originX; + @OriginalMember(owner = "client!aa", name = "j", descriptor = "I") + public static int originZ; + @OriginalMember(owner = "client!oi", name = "m", descriptor = "I") + public static int length; + @OriginalMember(owner = "client!dl", name = "e", descriptor = "I") + public static int width; + @OriginalMember(owner = "client!lf", name = "b", descriptor = "[I") + public static int[] overlayColors; + @OriginalMember(owner = "client!wb", name = "l", descriptor = "Lclient!fd;") + public static WorldMapFont font26; + @OriginalMember(owner = "client!mj", name = "n", descriptor = "Lclient!fd;") + public static WorldMapFont font30; + @OriginalMember(owner = "client!kc", name = "C", descriptor = "Lclient!fd;") + public static WorldMapFont font22; + @OriginalMember(owner = "client!qh", name = "d", descriptor = "Lclient!fd;") + public static WorldMapFont font19; + @OriginalMember(owner = "client!kc", name = "n", descriptor = "Lclient!fd;") + public static WorldMapFont font17; + @OriginalMember(owner = "client!nf", name = "d", descriptor = "Lclient!fd;") + public static WorldMapFont font14; + @OriginalMember(owner = "client!ma", name = "q", descriptor = "Lclient!fd;") + public static WorldMapFont font12; + @OriginalMember(owner = "client!we", name = "v", descriptor = "Lclient!fd;") + public static WorldMapFont font11; + @OriginalMember(owner = "client!bc", name = "W", descriptor = "I") + public static int anInt435; + @OriginalMember(owner = "client!rj", name = "P", descriptor = "I") + public static int anInt4901 = -1; + @OriginalMember(owner = "client!lc", name = "l", descriptor = "I") + public static int anInt3482 = -1; + @OriginalMember(owner = "client!cd", name = "u", descriptor = "I") + public static int anInt919; + @OriginalMember(owner = "client!qh", name = "a", descriptor = "Lclient!se;") + public static MapElementList labels; + @OriginalMember(owner = "client!ck", name = "J", descriptor = "[[[B") + public static byte[][][] aByteArrayArrayArray3; + @OriginalMember(owner = "client!fi", name = "m", descriptor = "[[[B") + public static byte[][][] aByteArrayArrayArray7; + @OriginalMember(owner = "client!hb", name = "v", descriptor = "[[[B") + public static byte[][][] aByteArrayArrayArray8; + @OriginalMember(owner = "client!si", name = "R", descriptor = "[[[B") + public static byte[][][] aByteArrayArrayArray12; + @OriginalMember(owner = "client!jl", name = "I", descriptor = "[[[B") + public static byte[][][] aByteArrayArrayArray10; + @OriginalMember(owner = "client!eh", name = "g", descriptor = "[[[I") + public static int[][][] scenery; + @OriginalMember(owner = "client!gj", name = "i", descriptor = "[[[I") + public static int[][][] underlayColors; + @OriginalMember(owner = "client!uc", name = "d", descriptor = "[[[I") + public static int[][][] anIntArrayArrayArray17; + + @OriginalMember(owner = "client!pa", name = "d", descriptor = "(I)V") + public static void method3413() { + if (currentMap == null) { + return; + } + + if (loadPercentage < 10) { + if (!MapList.archive.allFilesComplete(currentMap.group)) { + loadPercentage = client.js5Archive23.getPercentageComplete(currentMap.group) / 10; + return; + } + + Static6.method84(); + loadPercentage = 10; + } + + if (loadPercentage == 10) { + originX = currentMap.anInt763 >> 6 << 6; + originZ = currentMap.anInt771 >> 6 << 6; + length = (currentMap.anInt758 >> 6 << 6) + 64 - originZ; + width = (currentMap.anInt770 >> 6 << 6) + 64 - originX; + if (currentMap.defaultZoom == 37) { + zoom = 3.0F; + targetZoom = 3.0F; + } else if (currentMap.defaultZoom == 50) { + zoom = 4.0F; + targetZoom = 4.0F; + } else if (currentMap.defaultZoom == 75) { + zoom = 6.0F; + targetZoom = 6.0F; + } else if (currentMap.defaultZoom == 100) { + zoom = 8.0F; + targetZoom = 8.0F; + } else if (currentMap.defaultZoom == 200) { + zoom = 16.0F; + targetZoom = 16.0F; + } else { + zoom = 8.0F; + targetZoom = 8.0F; + } + + @Pc(144) int local144 = (PlayerList.self.xFine >> 7) + Static225.originX - originX; + @Pc(153) int local153 = local144 + (int) (Math.random() * 10.0D) - 5; + @Pc(168) int local168 = originZ + length - Static142.originZ - (PlayerList.self.zFine >> 7) - 1; + @Pc(177) int local177 = local168 + (int) (Math.random() * 10.0D) - 5; + if (local153 >= 0 && width > local153 && local177 >= 0 && local177 < length) { + anInt435 = local153; + anInt919 = local177; + } else { + anInt919 = originZ + length - currentMap.anInt764 * 64 - 1; + anInt435 = currentMap.anInt769 * 64 - originX; + } + + method965(); + overlayColors = new int[FloTypeList.capacity + 1]; + @Pc(235) int length = WorldMap.length >> 6; + @Pc(239) int width = WorldMap.width >> 6; + aByteArrayArrayArray8 = new byte[width][length][]; + @Pc(249) int local249 = Static86.anInt2293 >> 2 << 10; + aByteArrayArrayArray7 = new byte[width][length][]; + underlayColors = new int[width][length][]; + aByteArrayArrayArray3 = new byte[width][length][]; + anIntArrayArrayArray17 = new int[width][length][]; + aByteArrayArrayArray12 = new byte[width][length][]; + @Pc(273) int local273 = Static183.anInt4272 >> 1; + aByteArrayArrayArray10 = new byte[width][length][]; + scenery = new int[width][length][]; + Static70.loadOverlayColors(local273, local249); + loadPercentage = 20; + } else if (loadPercentage == 20) { + readUnderlay(new Buffer(MapList.archive.fetchFile(UNDERLAY, currentMap.group))); + loadPercentage = 30; + Static7.ping(true); + GameShell.resetTimer(); + } else if (loadPercentage == 30) { + readOverlay(new Buffer(MapList.archive.fetchFile(OVERLAY, currentMap.group))); + loadPercentage = 40; + GameShell.resetTimer(); + } else if (loadPercentage == 40) { + readOverlay2(new Buffer(MapList.archive.fetchFile(OVERLAY2, currentMap.group))); + loadPercentage = 50; + GameShell.resetTimer(); + } else if (loadPercentage == 50) { + readLocs(new Buffer(MapList.archive.fetchFile(LOC, currentMap.group))); + loadPercentage = 60; + Static7.ping(true); + GameShell.resetTimer(); + } else if (loadPercentage == 60) { + if (MapList.archive.isGroupNameValid(JagString.concatenate(new JagString[] { currentMap.group, LABELS}))) { + if (!MapList.archive.allFilesComplete(JagString.concatenate(new JagString[] { currentMap.group, LABELS}))) { + return; + } + labels = MapElementList.create(JagString.concatenate(new JagString[] { currentMap.group, LABELS}), MapList.archive); + } else { + labels = new MapElementList(0); + } + loadPercentage = 70; + GameShell.resetTimer(); + } else if (loadPercentage == 70) { + font11 = new WorldMapFont(11, true, GameShell.canvas); + loadPercentage = 73; + Static7.ping(true); + GameShell.resetTimer(); + } else if (loadPercentage == 73) { + font12 = new WorldMapFont(12, true, GameShell.canvas); + loadPercentage = 76; + Static7.ping(true); + GameShell.resetTimer(); + } else if (loadPercentage == 76) { + font14 = new WorldMapFont(14, true, GameShell.canvas); + loadPercentage = 79; + Static7.ping(true); + GameShell.resetTimer(); + } else if (loadPercentage == 79) { + font17 = new WorldMapFont(17, true, GameShell.canvas); + loadPercentage = 82; + Static7.ping(true); + GameShell.resetTimer(); + } else if (loadPercentage == 82) { + font19 = new WorldMapFont(19, true, GameShell.canvas); + loadPercentage = 85; + Static7.ping(true); + GameShell.resetTimer(); + } else if (loadPercentage == 85) { + font22 = new WorldMapFont(22, true, GameShell.canvas); + loadPercentage = 88; + Static7.ping(true); + GameShell.resetTimer(); + } else if (loadPercentage == 88) { + font26 = new WorldMapFont(26, true, GameShell.canvas); + loadPercentage = 91; + Static7.ping(true); + GameShell.resetTimer(); + } else { + font30 = new WorldMapFont(30, true, GameShell.canvas); + loadPercentage = 100; + Static7.ping(true); + GameShell.resetTimer(); + System.gc(); + } + } + + @OriginalMember(owner = "client!cn", name = "e", descriptor = "(B)V") + public static void method965() { + if (anInt435 < 0) { + anInt4901 = -1; + anInt435 = 0; + anInt3482 = -1; + } + if (anInt435 > width) { + anInt4901 = -1; + anInt435 = width; + anInt3482 = -1; + } + if (anInt919 < 0) { + anInt3482 = -1; + anInt4901 = -1; + anInt919 = 0; + } + if (length < anInt919) { + anInt919 = length; + anInt4901 = -1; + anInt3482 = -1; + } + } + + @OriginalMember(owner = "client!cj", name = "a", descriptor = "(BLclient!wa;)V") + public static void readUnderlay(@OriginalArg(1) Buffer data) { + @Pc(13) int local13 = anInt5338 >> 1; + @Pc(19) int local19 = anInt3254 >> 2 << 10; + @Pc(23) byte[][] underlays = new byte[width][length]; + @Pc(33) int local33; + @Pc(102) int local102; + @Pc(114) int local114; + while (data.offset < data.data.length) { + @Pc(31) int local31 = 0; + local33 = 0; + @Pc(35) boolean local35 = false; + if (data.g1() == 1) { + local33 = data.g1(); + local31 = data.g1(); + local35 = true; + } + @Pc(57) int local57 = data.g1(); + @Pc(61) int local61 = data.g1(); + @Pc(68) int local68 = local57 * 64 - originX; + @Pc(78) int local78 = length + originZ - local61 * 64 - 1; + if (local68 >= 0 && local78 - 63 >= 0 && width > local68 + 63 && length > local78) { + for (local102 = 0; local102 < 64; local102++) { + @Pc(112) byte[] underlay = underlays[local68 + local102]; + for (local114 = 0; local114 < 64; local114++) { + if (!local35 || local102 >= local33 * 8 && local33 * 8 + 8 > local102 && local114 >= local31 * 8 && local114 < local31 * 8 + 8) { + underlay[local78 - local114] = data.g1s(); + } + } + } + } else if (local35) { + data.offset += 64; + } else { + data.offset += 4096; + } + } + @Pc(175) int local175 = width; + local33 = length; + @Pc(180) int[] local180 = new int[local33]; + @Pc(183) int[] local183 = new int[local33]; + @Pc(186) int[] local186 = new int[local33]; + @Pc(189) int[] local189 = new int[local33]; + @Pc(192) int[] local192 = new int[local33]; + for (local102 = -5; local102 < local175; local102++) { + @Pc(225) int local225; + @Pc(293) int local293; + for (@Pc(203) int local203 = 0; local203 < local33; local203++) { + local114 = local102 + 5; + @Pc(272) int local272; + if (local175 > local114) { + local225 = underlays[local114][local203] & 0xFF; + if (local225 > 0) { + @Pc(236) FluType local236 = Static199.method3593(local225 - 1); + local183[local203] += local236.weightedHue; + local180[local203] += local236.saturation; + local186[local203] += local236.lightness; + local189[local203] += local236.chroma; + local272 = local192[local203]++; + } + } + local225 = local102 - 5; + if (local225 >= 0) { + local293 = underlays[local225][local203] & 0xFF; + if (local293 > 0) { + @Pc(302) FluType local302 = Static199.method3593(local293 - 1); + local183[local203] -= local302.weightedHue; + local180[local203] -= local302.saturation; + local186[local203] -= local302.lightness; + local189[local203] -= local302.chroma; + local272 = local192[local203]--; + } + } + } + if (local102 >= 0) { + @Pc(355) int[][] local355 = anIntArrayArrayArray17[local102 >> 6]; + local114 = 0; + local225 = 0; + @Pc(361) int local361 = 0; + @Pc(363) int local363 = 0; + local293 = 0; + for (@Pc(367) int local367 = -5; local367 < local33; local367++) { + @Pc(378) int local378 = local367 + 5; + if (local33 > local378) { + local363 += local192[local378]; + local225 += local180[local378]; + local293 += local186[local378]; + local114 += local183[local378]; + local361 += local189[local378]; + } + @Pc(415) int local415 = local367 - 5; + if (local415 >= 0) { + local293 -= local186[local415]; + local361 -= local189[local415]; + local114 -= local183[local415]; + local363 -= local192[local415]; + local225 -= local180[local415]; + } + if (local367 >= 0 && local363 > 0) { + @Pc(462) int[] local462 = local355[local367 >> 6]; + @Pc(480) int local480 = local361 == 0 ? 0 : Static54.method1309(local293 / local363, local225 / local363, local114 * 256 / local361); + if (underlays[local102][local367] != 0) { + if (local462 == null) { + local462 = local355[local367 >> 6] = new int[4096]; + } + @Pc(519) int local519 = local13 + (local480 & 0x7F); + if (local519 < 0) { + local519 = 0; + } else if (local519 > 127) { + local519 = 127; + } + @Pc(541) int local541 = local519 + (local480 & 0x380) + (local480 + local19 & 0xFC00); + local462[((local367 & 0x3F) << 6) + (local102 & 0x3F)] = Rasteriser.palette[Static87.method1814(96, local541)]; + } else if (local462 != null) { + local462[((local367 & 0x3F) << 6) + (local102 & 0x3F)] = 0; + } + } + } + } + } + } + + @OriginalMember(owner = "client!dk", name = "a", descriptor = "(Lclient!wa;Z)V") + public static void readOverlay(@OriginalArg(0) Buffer arg0) { + label87: while (true) { + if (arg0.offset < arg0.data.length) { + @Pc(22) int local22 = 0; + @Pc(24) boolean local24 = false; + @Pc(26) int local26 = 0; + if (arg0.g1() == 1) { + local24 = true; + local22 = arg0.g1(); + local26 = arg0.g1(); + } + @Pc(46) int local46 = arg0.g1(); + @Pc(50) int local50 = arg0.g1(); + @Pc(62) int local62 = originZ + length - local50 * 64 - 1; + @Pc(69) int local69 = local46 * 64 - originX; + @Pc(147) byte local147; + @Pc(91) int local91; + if (local69 >= 0 && local62 - 63 >= 0 && local69 + 63 < width && local62 < length) { + local91 = local69 >> 6; + @Pc(95) int local95 = local62 >> 6; + @Pc(97) int local97 = 0; + while (true) { + if (local97 >= 64) { + continue label87; + } + for (@Pc(104) int local104 = 0; local104 < 64; local104++) { + if (!local24 || local97 >= local22 * 8 && local97 < local22 * 8 + 8 && local104 >= local26 * 8 && local104 < local26 * 8 + 8) { + local147 = arg0.g1s(); + if (local147 != 0) { + if (aByteArrayArrayArray3[local91][local95] == null) { + aByteArrayArrayArray3[local91][local95] = new byte[4096]; + } + aByteArrayArrayArray3[local91][local95][local97 + (63 - local104 << 6)] = local147; + @Pc(186) byte local186 = arg0.g1s(); + if (aByteArrayArrayArray8[local91][local95] == null) { + aByteArrayArrayArray8[local91][local95] = new byte[4096]; + } + aByteArrayArrayArray8[local91][local95][local97 + (63 - local104 << 6)] = local186; + } + } + } + local97++; + } + } + local91 = 0; + while (true) { + if ((local24 ? 64 : 4096) <= local91) { + continue label87; + } + local147 = arg0.g1s(); + if (local147 != 0) { + arg0.offset++; + } + local91++; + } + } + return; + } + } + + @OriginalMember(owner = "client!sk", name = "a", descriptor = "(ILclient!wa;)V") + public static void readOverlay2(@OriginalArg(1) Buffer arg0) { + label83: while (true) { + if (arg0.offset < arg0.data.length) { + @Pc(23) int local23 = 0; + @Pc(25) boolean local25 = false; + @Pc(27) int local27 = 0; + if (arg0.g1() == 1) { + local25 = true; + local23 = arg0.g1(); + local27 = arg0.g1(); + } + @Pc(46) int local46 = arg0.g1(); + @Pc(50) int local50 = arg0.g1(); + @Pc(57) int local57 = local46 * 64 - originX; + @Pc(68) int local68 = length + originZ - local50 * 64 - 1; + @Pc(146) byte local146; + @Pc(96) int local96; + if (local57 >= 0 && local68 - 63 >= 0 && width > local57 + 63 && local68 < length) { + local96 = local57 >> 6; + @Pc(100) int local100 = local68 >> 6; + @Pc(102) int local102 = 0; + while (true) { + if (local102 >= 64) { + continue label83; + } + for (@Pc(107) int local107 = 0; local107 < 64; local107++) { + if (!local25 || local23 * 8 <= local102 && local23 * 8 + 8 > local102 && local107 >= local27 * 8 && local27 * 8 + 8 > local107) { + local146 = arg0.g1s(); + if (local146 != 0) { + if (aByteArrayArrayArray12[local96][local100] == null) { + aByteArrayArrayArray12[local96][local100] = new byte[4096]; + } + aByteArrayArrayArray12[local96][local100][(63 - local107 << 6) + local102] = local146; + @Pc(182) byte local182 = arg0.g1s(); + if (aByteArrayArrayArray10[local96][local100] == null) { + aByteArrayArrayArray10[local96][local100] = new byte[4096]; + } + aByteArrayArrayArray10[local96][local100][local102 + (63 - local107 << 6)] = local182; + } + } + } + local102++; + } + } + local96 = 0; + while (true) { + if (local96 >= (local25 ? 64 : 4096)) { + continue label83; + } + local146 = arg0.g1s(); + if (local146 != 0) { + arg0.offset++; + } + local96++; + } + } + return; + } + } + + @OriginalMember(owner = "client!nc", name = "a", descriptor = "(BLclient!wa;)V") + public static void readLocs(@OriginalArg(1) Buffer arg0) { + label123: while (true) { + if (arg0.data.length > arg0.offset) { + @Pc(17) boolean local17 = false; + @Pc(19) int local19 = 0; + @Pc(21) int local21 = 0; + if (arg0.g1() == 1) { + local19 = arg0.g1(); + local17 = true; + local21 = arg0.g1(); + } + @Pc(42) int local42 = arg0.g1(); + @Pc(46) int local46 = arg0.g1(); + @Pc(53) int local53 = local42 * 64 - originX; + @Pc(65) int local65 = originZ + length - local46 * 64 - 1; + @Pc(84) int local84; + @Pc(95) int local95; + if (local53 >= 0 && local65 - 63 >= 0 && width > local53 + 63 && local65 < length) { + local84 = local53 >> 6; + local95 = local65 >> 6; + @Pc(150) int local150 = 0; + while (true) { + if (local150 >= 64) { + continue label123; + } + for (@Pc(155) int local155 = 0; local155 < 64; local155++) { + if (!local17 || local19 * 8 <= local150 && local150 < local19 * 8 + 8 && local155 >= local21 * 8 && local155 < local21 * 8 + 8) { + @Pc(202) int local202 = arg0.g1(); + if (local202 != 0) { + @Pc(214) int id; + if ((local202 & 0x1) == 1) { + id = arg0.g1(); + if (aByteArrayArrayArray7[local84][local95] == null) { + aByteArrayArrayArray7[local84][local95] = new byte[4096]; + } + aByteArrayArrayArray7[local84][local95][local150 + (63 - local155 << 6)] = (byte) id; + } + if ((local202 & 0x2) == 2) { + id = arg0.g3(); + if (scenery[local84][local95] == null) { + scenery[local84][local95] = new int[4096]; + } + scenery[local84][local95][(63 - local155 << 6) + local150] = id; + } + if ((local202 & 0x4) == 4) { + id = arg0.g3(); + if (underlayColors[local84][local95] == null) { + underlayColors[local84][local95] = new int[4096]; + } + id--; + @Pc(312) LocType local312 = Static271.get(id); + if (local312.multiLocs != null) { + local312 = local312.getMultiLoc(); + if (local312 == null || local312.mapElement == -1) { + continue; + } + } + underlayColors[local84][local95][(63 - local155 << 6) + local150] = local312.anInt4426 + 1; + @Pc(353) MapElement element = new MapElement(); + element.id = local312.mapElement; + element.anInt4307 = local53; + element.anInt4314 = local65; + mapElements.addTail(element); + } + } + } + } + local150++; + } + } + local84 = 0; + while (true) { + if (local84 >= (local17 ? 64 : 4096)) { + continue label123; + } + local95 = arg0.g1(); + if (local95 != 0) { + if ((local95 & 0x1) == 1) { + arg0.offset++; + } + if ((local95 & 0x2) == 2) { + arg0.offset += 2; + } + if ((local95 & 0x4) == 4) { + arg0.offset += 3; + } + } + local84++; + } + } + return; + } + } + + @OriginalMember(owner = "client!le", name = "a", descriptor = "(IIIIIIIIIII)V") + public static void method2735(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) { + @Pc(9) int local9 = arg3 - arg5; + @Pc(14) int local14 = arg1 - arg2; + if (width > arg3) { + local9++; + } + if (length > arg1) { + local14++; + } + @Pc(32) int local32; + @Pc(47) int local47; + @Pc(57) int local57; + @Pc(62) int local62; + @Pc(71) int local71; + @Pc(104) int local104; + @Pc(145) int local145; + @Pc(157) int local157; + @Pc(162) int local162; + @Pc(211) int local211; + @Pc(222) int mapScene; + @Pc(233) int mapSceneId; + @Pc(254) int angle; + @Pc(270) int local270; + @Pc(276) int local276; + @Pc(312) int local312; + @Pc(372) int local372; + @Pc(185) int[][] local185; + for (local32 = 0; local32 < local9; local32++) { + local47 = local32 * arg7 >> 16; + local57 = (local32 + 1) * arg7 >> 16; + local62 = local57 - local47; + if (local62 > 0) { + local71 = local32 + arg5 >> 6; + if (local71 >= 0 && anIntArrayArrayArray17.length - 1 >= local71) { + local47 += arg4; + local185 = anIntArrayArrayArray17[local71]; + @Pc(189) byte[][] local189 = aByteArrayArrayArray3[local71]; + @Pc(193) byte[][] local193 = aByteArrayArrayArray8[local71]; + @Pc(197) byte[][] local197 = aByteArrayArrayArray7[local71]; + @Pc(201) byte[][] local201 = aByteArrayArrayArray10[local71]; + local57 += arg4; + @Pc(209) byte[][] local209 = aByteArrayArrayArray12[local71]; + for (local211 = 0; local211 < local14; local211++) { + mapScene = arg6 * local211 >> 16; + mapSceneId = (local211 + 1) * arg6 >> 16; + @Pc(238) int local238 = mapSceneId - mapScene; + if (local238 > 0) { + mapSceneId += arg0; + angle = arg2 + local211 >> 6; + @Pc(260) int local260 = arg2 + local211 & 0x3F; + mapScene += arg0; + local270 = local32 + arg5 & 0x3F; + local276 = (local260 << 6) + local270; + if (angle < 0 || local185.length - 1 < angle || local185[angle] == null) { + if (currentMap.anInt759 != -1) { + local312 = currentMap.anInt759; + } else if ((local211 + arg2 & 0x4) == (arg5 + local32 & 0x4)) { + local312 = overlayColors[FloType.anInt865 + 1]; + } else { + local312 = 4936552; + } + if (angle < 0 || angle > local185.length - 1) { + if (local312 == 0) { + local312 = 1; + } + SoftwareRaster.fillRect(local47, mapScene, local62, local238, local312); + continue; + } + } else { + local312 = local185[angle][local276]; + } + local372 = local189[angle] == null ? 0 : overlayColors[local189[angle][local276] & 0xFF]; + if (local312 == 0) { + local312 = 1; + } + @Pc(395) int local395 = local209[angle] == null ? 0 : overlayColors[local209[angle][local276] & 0xFF]; + @Pc(437) int local437; + if (local372 == 0 && local395 == 0) { + SoftwareRaster.fillRect(local47, mapScene, local62, local238, local312); + } else { + @Pc(433) byte local433; + if (local372 != 0) { + if (local372 == -1) { + local372 = 1; + } + local433 = local193[angle] == null ? 0 : local193[angle][local276]; + local437 = local433 & 0xFC; + if (local437 == 0 || local62 <= 1 || local238 <= 1) { + SoftwareRaster.fillRect(local47, mapScene, local62, local238, local372); + } else { + Static280.method4667(SoftwareRaster.pixels, local372, local47, local433 & 0x3, local312, local437 >> 2, local238, local62, mapScene, true); + } + } + if (local395 != 0) { + if (local395 == -1) { + local395 = local312; + } + local433 = local201[angle][local276]; + local437 = local433 & 0xFC; + if (local437 == 0 || local62 <= 1 || local238 <= 1) { + SoftwareRaster.fillRect(local47, mapScene, local62, local238, local395); + } + Static280.method4667(SoftwareRaster.pixels, local395, local47, local433 & 0x3, 0, local437 >> 2, local238, local62, mapScene, local372 == 0); + } + } + if (local197[angle] != null) { + @Pc(546) int local546 = local197[angle][local276] & 0xFF; + if (local546 != 0) { + if (local62 == 1) { + local437 = local47; + } else { + local437 = local57 - 1; + } + @Pc(569) int local569; + if (local238 == 1) { + local569 = mapScene; + } else { + local569 = mapSceneId - 1; + } + @Pc(575) int local575 = 13421772; + if (local546 >= 5 && local546 <= 8 || local546 >= 13 && local546 <= 16 || local546 >= 21 && local546 <= 24 || local546 == 27 || local546 == 28) { + local575 = 13369344; + local546 -= 4; + } + if (local546 == 1) { + SoftwareRaster.drawVerticalLine(local47, mapScene, local238, local575); + } else if (local546 == 2) { + SoftwareRaster.drawHorizontalLine(local47, mapScene, local62, local575); + } else if (local546 == 3) { + SoftwareRaster.drawVerticalLine(local437, mapScene, local238, local575); + } else if (local546 == 4) { + SoftwareRaster.drawHorizontalLine(local47, local569, local62, local575); + } else if (local546 == 9) { + SoftwareRaster.drawVerticalLine(local47, mapScene, local238, 16777215); + SoftwareRaster.drawHorizontalLine(local47, mapScene, local62, local575); + } else if (local546 == 10) { + SoftwareRaster.drawVerticalLine(local437, mapScene, local238, 16777215); + SoftwareRaster.drawHorizontalLine(local47, mapScene, local62, local575); + } else if (local546 == 11) { + SoftwareRaster.drawVerticalLine(local437, mapScene, local238, 16777215); + SoftwareRaster.drawHorizontalLine(local47, local569, local62, local575); + } else if (local546 == 12) { + SoftwareRaster.drawVerticalLine(local47, mapScene, local238, 16777215); + SoftwareRaster.drawHorizontalLine(local47, local569, local62, local575); + } else if (local546 == 17) { + SoftwareRaster.drawHorizontalLine(local47, mapScene, 1, local575); + } else if (local546 == 18) { + SoftwareRaster.drawHorizontalLine(local437, mapScene, 1, local575); + } else if (local546 == 19) { + SoftwareRaster.drawHorizontalLine(local437, local569, 1, local575); + } else if (local546 == 20) { + SoftwareRaster.drawHorizontalLine(local47, local569, 1, local575); + } else { + @Pc(705) int local705; + if (local546 == 25) { + for (local705 = 0; local705 < local238; local705++) { + SoftwareRaster.drawHorizontalLine(local705 + local47, -local705 + local569, 1, local575); + } + } else if (local546 == 26) { + for (local705 = 0; local705 < local238; local705++) { + SoftwareRaster.drawHorizontalLine(local705 + local47, mapScene + local705, 1, local575); + } + } + } + } + } + } + } + } else { + local47 += arg4; + for (@Pc(90) int local90 = 0; local90 < local14; local90++) { + if (currentMap.anInt759 != -1) { + local104 = currentMap.anInt759; + } else if ((local32 + arg5 & 0x4) == (local90 + arg2 & 0x4)) { + local104 = overlayColors[FloType.anInt865 + 1]; + } else { + local104 = 0x4b5368; + } + if (local104 == 0) { + local104 = 1; + } + local145 = (arg6 * local90 >> 16) + arg0; + local157 = arg0 + ((local90 + 1) * arg6 >> 16); + local162 = local157 - local145; + SoftwareRaster.fillRect(local47, local145, local62, local162, local104); + } + } + } + } + for (local32 = -2; local32 < local9 + 2; local32++) { + local47 = local32 * arg7 >> 16; + local57 = arg7 * (local32 + 1) >> 16; + local62 = local57 - local47; + if (local62 > 0) { + local47 += arg4; + local71 = arg5 + local32 >> 6; + if (local71 >= 0 && scenery.length - 1 >= local71) { + local185 = scenery[local71]; + for (local104 = -2; local104 < local14 + 2; local104++) { + local145 = local104 * arg6 >> 16; + local157 = (local104 + 1) * arg6 >> 16; + local162 = local157 - local145; + if (local162 > 0) { + local145 += arg0; + @Pc(931) int local931 = local104 + arg2 >> 6; + if (local931 >= 0 && local931 <= local185.length - 1) { + local211 = ((arg2 + local104 & 0x3F) << 6) + (local32 + arg5 & 0x3F); + if (local185[local931] != null) { + mapScene = local185[local931][local211]; + mapSceneId = mapScene & 0x3FFF; + if (mapSceneId != 0) { + angle = mapScene >> 14 & 0x3; + @Pc(998) MsiType type = MsiTypeList.get(mapSceneId - 1); + @Pc(1003) SoftwareIndexedSprite sprite = type.getSprite(angle); + if (sprite != null) { + local276 = local162 * sprite.height / 4; + local270 = local62 * sprite.width / 4; + if (type.aBoolean2) { + local312 = mapScene >> 16 & 0xF; + local372 = mapScene >> 20 & 0xF; + if ((angle & 0x1) == 1) { + angle = local312; + local312 = local372; + local372 = angle; + } + local270 = local62 * local312; + local276 = local162 * local372; + } + if (local270 != 0 && local276 != 0) { + if (type.anInt11 == 0) { + sprite.method1398(local47, local145 + local162 - local276, local270, local276); + } else { + sprite.method1390(local47, local145 + local162 - local276, local270, local276, type.anInt11); + } + } + } + } + } + } + } + } + } + } + } + } +} diff --git a/client/src/main/java/WorldMapFont.java b/client/src/main/java/WorldMapFont.java index f42cd9b..0babd2d 100644 --- a/client/src/main/java/WorldMapFont.java +++ b/client/src/main/java/WorldMapFont.java @@ -118,31 +118,31 @@ public final class WorldMapFont { @Pc(21) int local21 = arg4[arg0 + 3]; @Pc(27) int local27 = arg4[arg0 + 4]; @Pc(47) int local47 = arg4[arg0] * 16384 + arg4[arg0 + 1] * 128 + arg4[arg0 + 2]; - @Pc(53) int local53 = local7 + local15 * Static129.width; - @Pc(57) int local57 = Static129.width - local21; + @Pc(53) int local53 = local7 + local15 * SoftwareRaster.width; + @Pc(57) int local57 = SoftwareRaster.width - local21; @Pc(59) int local59 = 0; @Pc(66) int local66; - if (local15 < Static129.clipTop) { - local66 = Static129.clipTop - local15; + if (local15 < SoftwareRaster.clipTop) { + local66 = SoftwareRaster.clipTop - local15; local27 -= local66; - local15 = Static129.clipTop; + local15 = SoftwareRaster.clipTop; local47 += local66 * local21; - local53 += local66 * Static129.width; + local53 += local66 * SoftwareRaster.width; } - if (local15 + local27 >= Static129.clipBottom) { - local27 -= local15 + local27 + 1 - Static129.clipBottom; + if (local15 + local27 >= SoftwareRaster.clipBottom) { + local27 -= local15 + local27 + 1 - SoftwareRaster.clipBottom; } - if (local7 < Static129.clipLeft) { - local66 = Static129.clipLeft - local7; + if (local7 < SoftwareRaster.clipLeft) { + local66 = SoftwareRaster.clipLeft - local7; local21 -= local66; - local7 = Static129.clipLeft; + local7 = SoftwareRaster.clipLeft; local47 += local66; local53 += local66; local59 = local66; local57 += local66; } - if (local7 + local21 >= Static129.clipRight) { - local66 = local7 + local21 + 1 - Static129.clipRight; + if (local7 + local21 >= SoftwareRaster.clipRight) { + local66 = local7 + local21 + 1 - SoftwareRaster.clipRight; local21 -= local66; local59 += local66; local57 += local66; @@ -151,9 +151,9 @@ public final class WorldMapFont { return; } if (this.grayscale) { - this.renderGlyphGrayscale(Static129.pixels, arg4, arg3, local47, local53, local21, local27, local57, local59); + this.renderGlyphGrayscale(SoftwareRaster.pixels, arg4, arg3, local47, local53, local21, local27, local57, local59); } else { - this.renderGlyphMono(Static129.pixels, arg4, arg3, local47, local53, local21, local27, local57, local59); + this.renderGlyphMono(SoftwareRaster.pixels, arg4, arg3, local47, local53, local21, local27, local57, local59); } } @@ -201,7 +201,7 @@ public final class WorldMapFont { public final void renderStringCenter(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { @Pc(5) int local5 = this.getStringWidth(arg0) / 2; @Pc(8) int local8 = this.method1511(); - if (arg1 - local5 <= Static129.clipRight && (arg1 + local5 >= Static129.clipLeft && (arg2 - local8 <= Static129.clipBottom && arg2 >= 0))) { + if (arg1 - local5 <= SoftwareRaster.clipRight && (arg1 + local5 >= SoftwareRaster.clipLeft && (arg2 - local8 <= SoftwareRaster.clipBottom && arg2 >= 0))) { this.renderString(arg0, arg1 - local5, arg2, arg3, true); } } diff --git a/client/src/main/java/client.java b/client/src/main/java/client.java index 5234b44..4043a68 100644 --- a/client/src/main/java/client.java +++ b/client/src/main/java/client.java @@ -14,6 +14,59 @@ import org.openrs2.deob.annotation.Pc; @OriginalClass("client!client") public final class client extends GameShell { + @OriginalMember(owner = "client!dk", name = "j", descriptor = "[Lclient!en;") + public static final BufferedFile[] cacheIndexes = new BufferedFile[28]; + @OriginalMember(owner = "client!sg", name = "k", descriptor = "Lclient!ve;") + public static Js5 js5Archive23; + @OriginalMember(owner = "client!pb", name = "Q", descriptor = "I") + public static int worldListId = 1; + @OriginalMember(owner = "client!gj", name = "b", descriptor = "I") + public static int modeWhere = 0; + @OriginalMember(owner = "client!gg", name = "U", descriptor = "I") + public static int modeWhat = 0; + @OriginalMember(owner = "client!ud", name = "S", descriptor = "Z") + public static boolean advertSuppressed = false; + @OriginalMember(owner = "client!lb", name = "v", descriptor = "I") + public static int language = 0; + @OriginalMember(owner = "client!t", name = "x", descriptor = "Z") + public static boolean javaScript = false; + @OriginalMember(owner = "client!lk", name = "U", descriptor = "Z") + public static boolean objectTag = false; + @OriginalMember(owner = "client!vk", name = "n", descriptor = "I") + public static int game = 0; + @OriginalMember(owner = "client!wk", name = "w", descriptor = "I") + public static int country; + @OriginalMember(owner = "client!od", name = "n", descriptor = "Z") + public static boolean haveIe6 = false; + @OriginalMember(owner = "client!qi", name = "r", descriptor = "I") + public static int affiliate = 0; + @OriginalMember(owner = "client!dk", name = "h", descriptor = "Lclient!na;") + public static JagString settings = null; + @OriginalMember(owner = "client!rh", name = "j", descriptor = "Lclient!client;") + public static client instance; + @OriginalMember(owner = "client!ba", name = "D", descriptor = "Lclient!vh;") + public static AudioChannel musicChannel; + @OriginalMember(owner = "client!fk", name = "q", descriptor = "Lclient!uc;") + public static MouseWheel mouseWheel; + @OriginalMember(owner = "client!lh", name = "s", descriptor = "Lclient!vh;") + public static AudioChannel soundChannel; + @OriginalMember(owner = "client!id", name = "l", descriptor = "Lclient!jb;") + public static Js5NetQueue js5NetQueue; + @OriginalMember(owner = "client!gm", name = "T", descriptor = "Lclient!k;") + public static Js5CacheQueue js5CacheQueue; + @OriginalMember(owner = "client!nj", name = "f", descriptor = "Lclient!en;") + public static BufferedFile cacheData; + @OriginalMember(owner = "client!pf", name = "f", descriptor = "Lclient!en;") + public static BufferedFile cacheMasterIndex; + @OriginalMember(owner = "client!jg", name = "c", descriptor = "Lclient!en;") + public static BufferedFile uid; + @OriginalMember(owner = "client!tl", name = "d", descriptor = "I") + public static int gameState = 0; + @OriginalMember(owner = "client!vd", name = "w", descriptor = "Lclient!vk;") + public static FrameBuffer frameBuffer; + @OriginalMember(owner = "client!id", name = "f", descriptor = "Z") + public static boolean clean = false; + @OriginalMember(owner = "client!client", name = "main", descriptor = "([Ljava/lang/String;)V") public static void main(@OriginalArg(0) String[] arg0) { try { @@ -26,67 +79,73 @@ public final class client extends GameShell { // Static131.method2577("argument count"); } @Pc(15) int local15 = -1; - Static187.worldListId = Integer.parseInt(arg0[0]); - Static83.modeWhere = 2; + worldListId = Integer.parseInt(arg0[0]); + modeWhere = 2; if (arg0[1].equals("live")) { - Static81.modeWhat = 0; + modeWhat = 0; } else if (arg0[1].equals("rc")) { - Static81.modeWhat = 1; + modeWhat = 1; } else if (arg0[1].equals("wip")) { - Static81.modeWhat = 2; + modeWhat = 2; } else { - Static131.method2577("modewhat"); + printUsage("modewhat"); } - Static249.advertSuppressed = false; + advertSuppressed = false; try { @Pc(63) byte[] local63 = arg0[2].getBytes("ISO-8859-1"); local15 = Static101.method2053(Static10.decodeString(local63, local63.length, 0)); } catch (@Pc(74) Exception local74) { } if (local15 != -1) { - Static141.language = local15; + language = local15; } else if (arg0[2].equals("english")) { - Static141.language = 0; + language = 0; } else if (arg0[2].equals("german")) { - Static141.language = 1; + language = 1; } else { - Static131.method2577("language"); + printUsage("language"); } - Static3.setLanguage(Static141.language); - Static233.javaScript = false; - Static150.objectTag = false; + LocalizedText.setLanguage(language); + javaScript = false; + objectTag = false; if (arg0[3].equals("game0")) { - Static266.game = 0; + game = 0; } else if (arg0[3].equals("game1")) { - Static266.game = 1; + game = 1; } else { - Static131.method2577("game"); + printUsage("game"); } - Static279.country = 0; - Static178.haveIe6 = false; - Static204.affiliate = 0; - Static47.settings = Static186.EMPTY; + country = 0; + haveIe6 = false; + affiliate = 0; + settings = JagString.EMPTY; @Pc(146) client c = new client(); - Static215.instance = c; - c.startApplication(Static81.modeWhat + 32, "runescape"); + instance = c; + c.startApplication(modeWhat + 32, "runescape"); GameShell.frame.setLocation(40, 40); } catch (@Pc(167) Exception ex) { - Static89.report(null, ex); + TracingException.report(null, ex); } } + @OriginalMember(owner = "client!kd", name = "a", descriptor = "(Ljava/lang/String;B)V") + public static void printUsage(@OriginalArg(0) String arg0) { + System.out.println("Bad " + arg0 + ", Usage: worldid, , , "); + System.exit(1); + } + @OriginalMember(owner = "client!client", name = "f", descriptor = "(I)V") @Override protected final void mainRedraw() { - if (Static244.gameState == 1000) { + if (gameState == 1000) { return; } - @Pc(15) boolean local15 = Static138.method2699(); - if (local15 && Static144.aBoolean173 && Static11.musicChannel != null) { - Static11.musicChannel.method3570(); + @Pc(15) boolean local15 = MidiPlayer.method2699(); + if (local15 && MidiPlayer.jingle && musicChannel != null) { + musicChannel.method3570(); } - if ((Static244.gameState == 30 || Static244.gameState == 10) && (GameShell.replaceCanvas || Static97.aLong89 != 0L && Static97.aLong89 < MonotonicClock.currentTimeMillis())) { - Static241.setWindowMode(GameShell.replaceCanvas, Static144.getWindowMode(), Static114.anInt5831, Static22.anInt729); + if ((gameState == 30 || gameState == 10) && (GameShell.replaceCanvas || Static97.aLong89 != 0L && Static97.aLong89 < MonotonicClock.currentTimeMillis())) { + Static241.setWindowMode(GameShell.replaceCanvas, Static144.getWindowMode(), Preferences.fullScreenWidth, Preferences.fullScreenHeight); } @Pc(80) int local80; @Pc(84) int local84; @@ -111,8 +170,8 @@ public final class client extends GameShell { Static97.aLong89 = MonotonicClock.currentTimeMillis() + 500L; } } - if (GameShell.fullScreenFrame != null && !GameShell.focus && (Static244.gameState == 30 || Static244.gameState == 10)) { - Static241.setWindowMode(false, Static214.windowMode, -1, -1); + if (GameShell.fullScreenFrame != null && !GameShell.focus && (gameState == 30 || gameState == 10)) { + Static241.setWindowMode(false, Preferences.favoriteWorlds, -1, -1); } @Pc(158) boolean local158 = false; if (GameShell.fullRedraw) { @@ -127,70 +186,70 @@ public final class client extends GameShell { Static186.aBooleanArray100[local80] = true; } } - if (Static244.gameState == 0) { - Static13.render(null, local158, Static126.mainLoadSecondaryText, Static199.mainLoadPercentage); - } else if (Static244.gameState == 5) { - Static182.render(false, Static280.aClass3_Sub2_Sub9_43); - } else if (Static244.gameState == 10) { + if (gameState == 0) { + LoadingBarAwt.render(null, local158, Static126.mainLoadSecondaryText, Static199.mainLoadPercentage); + } else if (gameState == 5) { + LoadingBar.render(false, Fonts.b12Full); + } else if (gameState == 10) { Static126.method2460(); - } else if (Static244.gameState == 25 || Static244.gameState == 28) { + } else if (gameState == 25 || gameState == 28) { if (Static233.loadingScreenState == 1) { if (Static230.anInt5150 < Static175.mapFilesMissingCount) { Static230.anInt5150 = Static175.mapFilesMissingCount; } local80 = (Static230.anInt5150 - Static175.mapFilesMissingCount) * 50 / Static230.anInt5150; - Static114.drawTextOnScreen(false, Static34.concatenate(new JagString[] { LocalizedText.LOADING, Static229.aClass100_974, Static123.parseInt(local80), Static14.aClass100_80 })); + Static114.drawTextOnScreen(false, JagString.concatenate(new JagString[] { LocalizedText.LOADING, Static229.aClass100_974, Static123.parseInt(local80), Static14.aClass100_80 })); } else if (Static233.loadingScreenState == 2) { if (Static38.anInt1196 < Static271.anInt5804) { Static38.anInt1196 = Static271.anInt5804; } local80 = (Static38.anInt1196 - Static271.anInt5804) * 50 / Static38.anInt1196 + 50; - Static114.drawTextOnScreen(false, Static34.concatenate(new JagString[] { LocalizedText.LOADING, Static229.aClass100_974, Static123.parseInt(local80), Static14.aClass100_80 })); + Static114.drawTextOnScreen(false, JagString.concatenate(new JagString[] { LocalizedText.LOADING, Static229.aClass100_974, Static123.parseInt(local80), Static14.aClass100_80 })); } else { Static114.drawTextOnScreen(false, LocalizedText.LOADING); } - } else if (Static244.gameState == 30) { + } else if (gameState == 30) { Static89.method1841(); - } else if (Static244.gameState == 40) { - Static114.drawTextOnScreen(false, Static34.concatenate(new JagString[] { LocalizedText.CONLOST, Static269.aClass100_556, LocalizedText.ATTEMPT_TO_REESTABLISH})); + } else if (gameState == 40) { + Static114.drawTextOnScreen(false, JagString.concatenate(new JagString[] { LocalizedText.CONLOST, Static269.aClass100_556, LocalizedText.ATTEMPT_TO_REESTABLISH})); } - if (GlRenderer.enabled && Static244.gameState != 0) { + if (GlRenderer.enabled && gameState != 0) { GlRenderer.swapBuffers(); - for (local80 = 0; local80 < Static24.anInt766; local80++) { - Static31.rectangleRedraw[local80] = false; + for (local80 = 0; local80 < InterfaceList.anInt766; local80++) { + InterfaceList.rectangleRedraw[local80] = false; } } else { @Pc(388) Graphics local388; - if ((Static244.gameState == 30 || Static244.gameState == 10) && Static199.rectDebug == 0 && !local158) { + if ((gameState == 30 || gameState == 10) && Static199.rectDebug == 0 && !local158) { try { local388 = GameShell.canvas.getGraphics(); - for (local84 = 0; local84 < Static24.anInt766; local84++) { - if (Static31.rectangleRedraw[local84]) { - Static260.frameBuffer.drawAt(Static224.anIntArray443[local84], Static264.anIntArray410[local84], Static67.anIntArray320[local84], local388, Static50.anIntArray133[local84]); - Static31.rectangleRedraw[local84] = false; + for (local84 = 0; local84 < InterfaceList.anInt766; local84++) { + if (InterfaceList.rectangleRedraw[local84]) { + frameBuffer.drawAt(Static224.anIntArray443[local84], Static264.anIntArray410[local84], Static67.anIntArray320[local84], local388, Static50.anIntArray133[local84]); + InterfaceList.rectangleRedraw[local84] = false; } } } catch (@Pc(423) Exception local423) { GameShell.canvas.repaint(); } - } else if (Static244.gameState != 0) { + } else if (gameState != 0) { try { local388 = GameShell.canvas.getGraphics(); - Static260.frameBuffer.draw(local388); - for (local84 = 0; local84 < Static24.anInt766; local84++) { - Static31.rectangleRedraw[local84] = false; + frameBuffer.draw(local388); + for (local84 = 0; local84 < InterfaceList.anInt766; local84++) { + InterfaceList.rectangleRedraw[local84] = false; } } catch (@Pc(453) Exception local453) { GameShell.canvas.repaint(); } } } - if (Static107.clean) { + if (clean) { Static213.clean(); } - if (Static164.safeMode && Static244.gameState == 10 && Static154.topLevelInterface != -1) { - Static164.safeMode = false; - Static203.savePreferences(GameShell.signLink); + if (Preferences.safeMode && gameState == 10 && InterfaceList.topLevelInterface != -1) { + Preferences.safeMode = false; + Preferences.write(GameShell.signLink); } } @@ -201,52 +260,52 @@ public final class client extends GameShell { GlRenderer.quit(); } if (GameShell.fullScreenFrame != null) { - Static25.exitFullScreen(GameShell.fullScreenFrame, GameShell.signLink); + DisplayMode.exitFullScreen(GameShell.fullScreenFrame, GameShell.signLink); GameShell.fullScreenFrame = null; } if (GameShell.signLink != null) { GameShell.signLink.unloadGlNatives(this.getClass()); } - if (Static178.instance != null) { - Static178.instance.running = false; + if (MouseRecorder.instance != null) { + MouseRecorder.instance.running = false; } - Static178.instance = null; - if (Static124.socket != null) { - Static124.socket.close(); - Static124.socket = null; + MouseRecorder.instance = null; + if (Protocol.socket != null) { + Protocol.socket.close(); + Protocol.socket = null; } Keyboard.stop(GameShell.canvas); - Static223.stop(GameShell.canvas); - if (Static71.mouseWheel != null) { - Static71.mouseWheel.stop(GameShell.canvas); + Mouse.stop(GameShell.canvas); + if (mouseWheel != null) { + mouseWheel.stop(GameShell.canvas); } - Static6.quit(); - Static251.quit(); - Static71.mouseWheel = null; - if (Static11.musicChannel != null) { - Static11.musicChannel.quit(); + Keyboard.quit(); + Mouse.quit(); + mouseWheel = null; + if (musicChannel != null) { + musicChannel.quit(); } - if (Static147.soundChannel != null) { - Static147.soundChannel.quit(); + if (soundChannel != null) { + soundChannel.quit(); } - Static107.js5NetQueue.quit(); - Static86.js5CacheQueue.quit(); + js5NetQueue.quit(); + js5CacheQueue.quit(); try { - if (Static172.cacheData != null) { - Static172.cacheData.method1455(); + if (cacheData != null) { + cacheData.method1455(); } - if (Static47.cacheIndexes != null) { - for (@Pc(95) int local95 = 0; local95 < Static47.cacheIndexes.length; local95++) { - if (Static47.cacheIndexes[local95] != null) { - Static47.cacheIndexes[local95].method1455(); + if (cacheIndexes != null) { + for (@Pc(95) int local95 = 0; local95 < cacheIndexes.length; local95++) { + if (cacheIndexes[local95] != null) { + cacheIndexes[local95].method1455(); } } } - if (Static190.cacheMasterIndex != null) { - Static190.cacheMasterIndex.method1455(); + if (cacheMasterIndex != null) { + cacheMasterIndex.method1455(); } - if (Static121.uid != null) { - Static121.uid.method1455(); + if (uid != null) { + uid.method1455(); } } catch (@Pc(129) IOException local129) { } @@ -258,107 +317,107 @@ public final class client extends GameShell { if (!this.isHostnameValid()) { return; } - Static187.worldListId = Integer.parseInt(this.getParameter("worldid")); - Static83.modeWhere = Integer.parseInt(this.getParameter("modewhere")); - if (Static83.modeWhere < 0 || Static83.modeWhere > 1) { - Static83.modeWhere = 0; + worldListId = Integer.parseInt(this.getParameter("worldid")); + modeWhere = Integer.parseInt(this.getParameter("modewhere")); + if (modeWhere < 0 || modeWhere > 1) { + modeWhere = 0; } - Static81.modeWhat = Integer.parseInt(this.getParameter("modewhat")); - if (Static81.modeWhat < 0 || Static81.modeWhat > 2) { - Static81.modeWhat = 0; + modeWhat = Integer.parseInt(this.getParameter("modewhat")); + if (modeWhat < 0 || modeWhat > 2) { + modeWhat = 0; } @Pc(50) String local50 = this.getParameter("advertsuppressed"); if (local50 != null && local50.equals("1")) { - Static249.advertSuppressed = true; + advertSuppressed = true; } else { - Static249.advertSuppressed = false; + advertSuppressed = false; } try { - Static141.language = Integer.parseInt(this.getParameter("lang")); + language = Integer.parseInt(this.getParameter("lang")); } catch (@Pc(69) Exception local69) { - Static141.language = 0; + language = 0; } - Static3.setLanguage(Static141.language); + LocalizedText.setLanguage(language); @Pc(78) String local78 = this.getParameter("objecttag"); if (local78 != null && local78.equals("1")) { - Static233.javaScript = true; + javaScript = true; } else { - Static233.javaScript = false; + javaScript = false; } @Pc(94) String local94 = this.getParameter("js"); if (local94 != null && local94.equals("1")) { - Static150.objectTag = true; + objectTag = true; } else { - Static150.objectTag = false; + objectTag = false; } @Pc(111) String local111 = this.getParameter("game"); if (local111 != null && local111.equals("1")) { - Static266.game = 1; + game = 1; } else { - Static266.game = 0; + game = 0; } try { - Static204.affiliate = Integer.parseInt(this.getParameter("affid")); + affiliate = Integer.parseInt(this.getParameter("affid")); } catch (@Pc(130) Exception local130) { - Static204.affiliate = 0; + affiliate = 0; } - Static47.settings = Static227.SETTINGS.fromParameters(this); - if (Static47.settings == null) { - Static47.settings = Static186.EMPTY; + settings = Static227.SETTINGS.fromParameters(this); + if (settings == null) { + settings = JagString.EMPTY; } @Pc(146) String local146 = this.getParameter("country"); if (local146 != null) { try { - Static279.country = Integer.parseInt(local146); + country = Integer.parseInt(local146); } catch (@Pc(153) Exception local153) { - Static279.country = 0; + country = 0; } } @Pc(159) String local159 = this.getParameter("haveie6"); if (local159 != null && local159.equals("1")) { - Static178.haveIe6 = true; + haveIe6 = true; } else { - Static178.haveIe6 = false; + haveIe6 = false; } - Static215.instance = this; - this.startApplet(Static81.modeWhat + 32); + instance = this; + this.startApplet(modeWhat + 32); } @OriginalMember(owner = "client!client", name = "g", descriptor = "(I)V") @Override protected final void mainInit() { Static203.method3662(); - Static86.js5CacheQueue = new Js5CacheQueue(); - Static107.js5NetQueue = new Js5NetQueue(); - if (Static81.modeWhat != 0) { + js5CacheQueue = new Js5CacheQueue(); + js5NetQueue = new Js5NetQueue(); + if (modeWhat != 0) { Static51.aByteArrayArray8 = new byte[50][]; } - Static80.read(GameShell.signLink); // preferences - if (Static83.modeWhere == 0) { + Preferences.read(GameShell.signLink); + if (modeWhere == 0) { Static143.worldListHostname = GlobalConfig.DEFAULT_HOSTNAME; // this.getCodeBase().getHost(); Static97.worldListAlternatePort = GlobalConfig.ALTERNATE_PORT + 1; Static249.worldListDefaultPort = GlobalConfig.DEFAULT_PORT + 1; - } else if (Static83.modeWhere == 1) { + } else if (modeWhere == 1) { Static143.worldListHostname = GlobalConfig.DEFAULT_HOSTNAME; // this.getCodeBase().getHost(); - Static97.worldListAlternatePort = GlobalConfig.ALTERNATE_PORT + Static187.worldListId; - Static249.worldListDefaultPort = GlobalConfig.DEFAULT_PORT + Static187.worldListId; - } else if (Static83.modeWhere == 2) { + Static97.worldListAlternatePort = GlobalConfig.ALTERNATE_PORT + worldListId; + Static249.worldListDefaultPort = GlobalConfig.DEFAULT_PORT + worldListId; + } else if (modeWhere == 2) { Static143.worldListHostname = GlobalConfig.DEFAULT_HOSTNAME; // "127.0.0.1"; - Static97.worldListAlternatePort = GlobalConfig.ALTERNATE_PORT + Static187.worldListId; - Static249.worldListDefaultPort = GlobalConfig.DEFAULT_PORT + Static187.worldListId; + Static97.worldListAlternatePort = GlobalConfig.ALTERNATE_PORT + worldListId; + Static249.worldListDefaultPort = GlobalConfig.DEFAULT_PORT + worldListId; } - if (Static266.game == 1) { + if (game == 1) { Static172.shiftClick = true; Static161.anInt3923 = 16777215; Static161.anInt3922 = 0; Static33.aShortArrayArray2 = Static198.aShortArrayArray4; Static172.aShortArrayArray7 = Static32.aShortArrayArray1; Static200.aShortArray65 = Static2.aShortArray1; - Static160.aShortArray41 = Static20.aShortArray5; + Static160.aShortArray41 = PlayerAppearance.aShortArray5; } else { Static33.aShortArrayArray2 = Static154.aShortArrayArray6; Static160.aShortArray41 = Static195.aShortArray64; - Static172.aShortArrayArray7 = Static43.aShortArrayArray5; + Static172.aShortArrayArray7 = SubScript.aShortArrayArray5; Static200.aShortArray65 = Static260.aShortArray71; } Static55.alternatePort = Static97.worldListAlternatePort; @@ -367,40 +426,40 @@ public final class client extends GameShell { Static208.worldListPort = Static249.worldListDefaultPort; Static259.aShortArray88 = Static62.aShortArray19 = Static232.aShortArray74 = Static259.aShortArray87 = new short[256]; Static209.port = Static208.worldListPort; - if ((SignLink.anInt5928 == 3 && Static83.modeWhere != 2) || GlobalConfig.SELECT_DEFAULT_WORLD) { - Static125.worldId = Static187.worldListId; + if ((SignLink.anInt5928 == 3 && modeWhere != 2) || GlobalConfig.SELECT_DEFAULT_WORLD) { + Static125.worldId = worldListId; } Keyboard.init(); // keyboard Keyboard.start(GameShell.canvas); // keyboard Static88.start(GameShell.canvas); // mouse - Static71.mouseWheel = Static44.create(); - if (Static71.mouseWheel != null) { - Static71.mouseWheel.start(GameShell.canvas); + mouseWheel = Static44.create(); + if (mouseWheel != null) { + mouseWheel.start(GameShell.canvas); } Static7.anInt986 = SignLink.anInt5928; try { if (GameShell.signLink.cacheData != null) { - Static172.cacheData = new BufferedFile(GameShell.signLink.cacheData, 5200, 0); + cacheData = new BufferedFile(GameShell.signLink.cacheData, 5200, 0); for (@Pc(162) int i = 0; i < 28; i++) { - Static47.cacheIndexes[i] = new BufferedFile(GameShell.signLink.cacheIndexes[i], 6000, 0); + cacheIndexes[i] = new BufferedFile(GameShell.signLink.cacheIndexes[i], 6000, 0); } - Static190.cacheMasterIndex = new BufferedFile(GameShell.signLink.cacheMasterIndex, 6000, 0); - Static148.masterCache = new Cache(255, Static172.cacheData, Static190.cacheMasterIndex, 500000); - Static121.uid = new BufferedFile(GameShell.signLink.uid, 24, 0); + cacheMasterIndex = new BufferedFile(GameShell.signLink.cacheMasterIndex, 6000, 0); + Static148.masterCache = new Cache(255, cacheData, cacheMasterIndex, 500000); + uid = new BufferedFile(GameShell.signLink.uid, 24, 0); GameShell.signLink.cacheIndexes = null; GameShell.signLink.cacheMasterIndex = null; GameShell.signLink.uid = null; GameShell.signLink.cacheData = null; } } catch (@Pc(220) IOException ex) { - Static121.uid = null; - Static172.cacheData = null; - Static190.cacheMasterIndex = null; + uid = null; + cacheData = null; + cacheMasterIndex = null; Static148.masterCache = null; } Static278.mainLoadPrimaryText = LocalizedText.GAME0_LOADING; - if (Static83.modeWhere != 0) { - Static43.displayFps = true; + if (modeWhere != 0) { + Cheat.displayFps = true; } } @@ -411,9 +470,9 @@ public final class client extends GameShell { @OriginalMember(owner = "client!client", name = "a", descriptor = "(ZI)V") private void setJs5Response(@OriginalArg(1) int arg0) { - Static107.js5NetQueue.errors++; + js5NetQueue.errors++; Static37.js5SocketRequest = null; - Static107.js5NetQueue.response = arg0; + js5NetQueue.response = arg0; Static206.js5Socket = null; Static4.js5ConnectState = 0; } @@ -425,8 +484,8 @@ public final class client extends GameShell { Static205.keyChars[Static182.keyQueueSize] = Keyboard.keyChar; } Static178.anInt4247++; - if (Static154.topLevelInterface != -1) { - Static57.method1320(0, 0, 0, GameShell.canvasWidth, Static154.topLevelInterface, 0, GameShell.canvasHeight); + if (InterfaceList.topLevelInterface != -1) { + Static57.method1320(0, 0, 0, GameShell.canvasWidth, InterfaceList.topLevelInterface, 0, GameShell.canvasHeight); } Static119.transmitTimer++; if (GlRenderer.enabled) { @@ -488,7 +547,7 @@ public final class client extends GameShell { if (priorityRequest == null) { while (true) { do { - priorityRequest = (HookRequest) Static185.lowPriorityRequests.removeHead(); + priorityRequest = (HookRequest) InterfaceList.lowPriorityRequests.removeHead(); if (priorityRequest == null) { if (Static105.aClass13_14 != null) { Static4.method28(); @@ -536,7 +595,7 @@ public final class client extends GameShell { @OriginalMember(owner = "client!client", name = "d", descriptor = "(Z)V") private void js5NetworkLoop() { - @Pc(3) boolean idle = Static107.js5NetQueue.loop(); + @Pc(3) boolean idle = js5NetQueue.loop(); if (!idle) { this.js5Connect(); } @@ -544,8 +603,8 @@ public final class client extends GameShell { @OriginalMember(owner = "client!client", name = "h", descriptor = "(I)V") private void js5Connect() { - if (Static233.js5PrevErrors < Static107.js5NetQueue.errors) { - Static22.js5ConnectDelay = 5 * 50 * (Static107.js5NetQueue.errors - 1); + if (Static233.js5PrevErrors < js5NetQueue.errors) { + Static22.js5ConnectDelay = 5 * 50 * (js5NetQueue.errors - 1); if (Static271.defaultPort == Static209.port) { Static209.port = Static55.alternatePort; } else { @@ -554,29 +613,29 @@ public final class client extends GameShell { if (Static22.js5ConnectDelay > 3000) { Static22.js5ConnectDelay = 3000; } - if (Static107.js5NetQueue.errors >= 2 && Static107.js5NetQueue.response == 6) { + if (js5NetQueue.errors >= 2 && js5NetQueue.response == 6) { this.error("js5connect_outofdate"); - Static244.gameState = 1000; + gameState = 1000; return; } - if (Static107.js5NetQueue.errors >= 4 && Static107.js5NetQueue.response == -1) { + if (js5NetQueue.errors >= 4 && js5NetQueue.response == -1) { this.error("js5crc"); - Static244.gameState = 1000; + gameState = 1000; return; } - if (Static107.js5NetQueue.errors >= 4 && (Static244.gameState == 0 || Static244.gameState == 5)) { - if (Static107.js5NetQueue.response == 7 || Static107.js5NetQueue.response == 9) { + if (js5NetQueue.errors >= 4 && (gameState == 0 || gameState == 5)) { + if (js5NetQueue.response == 7 || js5NetQueue.response == 9) { this.error("js5connect_full"); - } else if (Static107.js5NetQueue.response > 0) { + } else if (js5NetQueue.response > 0) { this.error("js5connect"); } else { this.error("js5io"); } - Static244.gameState = 1000; + gameState = 1000; return; } } - Static233.js5PrevErrors = Static107.js5NetQueue.errors; + Static233.js5PrevErrors = js5NetQueue.errors; if (Static22.js5ConnectDelay > 0) { Static22.js5ConnectDelay--; return; @@ -605,7 +664,7 @@ public final class client extends GameShell { Static217.js5ConnectTime = MonotonicClock.currentTimeMillis(); } if (Static4.js5ConnectState == 3) { - if (Static244.gameState == 0 || Static244.gameState == 5 || Static206.js5Socket.available() > 0) { + if (gameState == 0 || gameState == 5 || Static206.js5Socket.available() > 0) { @Pc(258) int response = Static206.js5Socket.read(); if (response != 0) { this.setJs5Response(response); @@ -618,8 +677,8 @@ public final class client extends GameShell { } } if (Static4.js5ConnectState == 4) { - @Pc(296) boolean loggedOut = Static244.gameState == 5 || Static244.gameState == 10 || Static244.gameState == 28; - Static107.js5NetQueue.loggedOut(!loggedOut, Static206.js5Socket); + @Pc(296) boolean loggedOut = gameState == 5 || gameState == 10 || gameState == 28; + js5NetQueue.loggedOut(!loggedOut, Static206.js5Socket); Static206.js5Socket = null; Static37.js5SocketRequest = null; Static4.js5ConnectState = 0; @@ -631,14 +690,14 @@ public final class client extends GameShell { @OriginalMember(owner = "client!client", name = "i", descriptor = "(I)V") private void mainLoad() { - if (!Static164.safeMode) { + if (!Preferences.safeMode) { noSafeMode: while (true) { do { if (!Keyboard.nextKey()) { break noSafeMode; } } while (Keyboard.keyChar != 115 && Keyboard.keyChar != 83); - Static164.safeMode = true; + Preferences.safeMode = true; } } @@ -675,7 +734,7 @@ public final class client extends GameShell { Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD10B; } else if (Static166.mainLoadState == 30) { if (Static257.js5MasterIndex == null) { - Static257.js5MasterIndex = new Js5MasterIndex(Static107.js5NetQueue, Static86.js5CacheQueue); + Static257.js5MasterIndex = new Js5MasterIndex(js5NetQueue, js5CacheQueue); } if (Static257.js5MasterIndex.method178()) { Static213.js5Archive0 = Static9.createJs5(false, true, true, 0); @@ -701,7 +760,7 @@ public final class client extends GameShell { Static253.js5Archive20 = Static9.createJs5(false, true, true, 20); Static122.js5Archive21 = Static9.createJs5(false, true, true, 21); Static156.js5Archive22 = Static9.createJs5(false, true, true, 22); - Static227.js5Archive23 = Static9.createJs5(true, true, true, 23); + js5Archive23 = Static9.createJs5(true, true, true, 23); Static254.js5Archive24 = Static9.createJs5(false, true, true, 24); Static28.js5Archive25 = Static9.createJs5(false, true, true, 25); Static167.js5Archive26 = Static9.createJs5(true, true, true, 26); @@ -721,40 +780,40 @@ public final class client extends GameShell { if (percentage == 100) { Static199.mainLoadPercentage = 20; Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD40B; - Static75.init(Static209.js5Archive8); + Sprites.init(Static209.js5Archive8); Static167.init(Static209.js5Archive8); Static81.init(Static209.js5Archive8); Static166.mainLoadState = 45; } else { if (percentage != 0) { - Static126.mainLoadSecondaryText = Static34.concatenate(new JagString[] { LocalizedText.CHECKING_FOR_UPDATES, Static123.parseInt(percentage), Static49.PERCENT_SIGN}); + Static126.mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.CHECKING_FOR_UPDATES, Static123.parseInt(percentage), Static49.PERCENT_SIGN}); } Static199.mainLoadPercentage = 20; } } else if (Static166.mainLoadState == 45) { - AudioChannel.init(Static99.stereo); + AudioChannel.init(Preferences.stereo); Static148.musicStream = new MidiPcmStream(); Static148.musicStream.init(); - Static11.musicChannel = AudioChannel.create(22050, GameShell.signLink, GameShell.canvas, 0); - Static11.musicChannel.setStream(Static148.musicStream); + musicChannel = AudioChannel.create(22050, GameShell.signLink, GameShell.canvas, 0); + musicChannel.setStream(Static148.musicStream); Static34.init(Static148.musicStream, Static138.js5Archive15, Static137.js5Archive14, Static248.js5Archive4); - Static147.soundChannel = AudioChannel.create(2048, GameShell.signLink, GameShell.canvas, 1); + soundChannel = AudioChannel.create(2048, GameShell.signLink, GameShell.canvas, 1); Static204.soundStream = new MixerPcmStream(); - Static147.soundChannel.setStream(Static204.soundStream); + soundChannel.setStream(Static204.soundStream); Static56.resampler = new Resampler(22050, Static44.sampleRate); Static250.titleSong = Static130.js5Archive6.getGroupId(Static1.TITLE_SONG); Static199.mainLoadPercentage = 30; Static166.mainLoadState = 50; Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD45B; } else if (Static166.mainLoadState == 50) { - percentage = Static74.getReady(Static209.js5Archive8, Static261.js5Archive13); + percentage = Fonts.getReady(Static209.js5Archive8, Static261.js5Archive13); i = Static143.getTotal(); if (percentage >= i) { Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD50B; Static199.mainLoadPercentage = 35; Static166.mainLoadState = 60; } else { - Static126.mainLoadSecondaryText = Static34.concatenate(new JagString[] { LocalizedText.MAINLOAD50, Static123.parseInt(percentage * 100 / i), Static49.PERCENT_SIGN}); + Static126.mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD50, Static123.parseInt(percentage * 100 / i), Static49.PERCENT_SIGN}); Static199.mainLoadPercentage = 35; } } else if (Static166.mainLoadState == 60) { @@ -765,7 +824,7 @@ public final class client extends GameShell { Static166.mainLoadState = 65; Static199.mainLoadPercentage = 40; } else { - Static126.mainLoadSecondaryText = Static34.concatenate(new JagString[] { LocalizedText.MAINLOAD60, Static123.parseInt(percentage * 100 / i), Static49.PERCENT_SIGN}); + Static126.mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD60, Static123.parseInt(percentage * 100 / i), Static49.PERCENT_SIGN}); Static199.mainLoadPercentage = 40; } } else if (Static166.mainLoadState == 65) { @@ -824,42 +883,42 @@ public final class client extends GameShell { Static58.init(); Static166.mainLoadState = 80; } else { - Static126.mainLoadSecondaryText = Static34.concatenate(new JagString[] { LocalizedText.MAINLOAD70, Static123.parseInt(percentage / 11), Static49.PERCENT_SIGN}); + Static126.mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD70, Static123.parseInt(percentage / 11), Static49.PERCENT_SIGN}); Static199.mainLoadPercentage = 50; } } else if (Static166.mainLoadState == 80) { - percentage = Static28.getReady(Static209.js5Archive8); + percentage = Sprites.getReady(Static209.js5Archive8); i = Static62.total(); if (i > percentage) { - Static126.mainLoadSecondaryText = Static34.concatenate(new JagString[] { LocalizedText.MAINLOAD80, Static123.parseInt(percentage * 100 / i), Static49.PERCENT_SIGN}); + Static126.mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD80, Static123.parseInt(percentage * 100 / i), Static49.PERCENT_SIGN}); Static199.mainLoadPercentage = 60; } else { - Static30.load(Static209.js5Archive8); + Sprites.load(Static209.js5Archive8); Static166.mainLoadState = 90; Static199.mainLoadPercentage = 60; Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD80B; } } else if (Static166.mainLoadState == 90) { if (Static167.js5Archive26.fetchAll()) { - @Pc(951) Js5GlTextureProvider textureProvider = new Js5GlTextureProvider(Static195.js5Archive9, Static167.js5Archive26, Static209.js5Archive8, 20, !Static53.highDetailTextures); + @Pc(951) Js5GlTextureProvider textureProvider = new Js5GlTextureProvider(Static195.js5Archive9, Static167.js5Archive26, Static209.js5Archive8, 20, !Preferences.highDetailTextures); Rasteriser.unpackTextures(textureProvider); - if (Static113.brightness == 1) { + if (Preferences.brightness == 1) { Rasteriser.setBrightness(0.9F); } - if (Static113.brightness == 2) { + if (Preferences.brightness == 2) { Rasteriser.setBrightness(0.8F); } - if (Static113.brightness == 3) { + if (Preferences.brightness == 3) { Rasteriser.setBrightness(0.7F); } - if (Static113.brightness == 4) { + if (Preferences.brightness == 4) { Rasteriser.setBrightness(0.6F); } Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD90B; Static166.mainLoadState = 100; Static199.mainLoadPercentage = 70; } else { - Static126.mainLoadSecondaryText = Static34.concatenate(new JagString[] { LocalizedText.MAINLOAD90, Static123.parseInt(Static167.js5Archive26.getPercentageComplete()), Static49.PERCENT_SIGN}); + Static126.mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD90, Static123.parseInt(Static167.js5Archive26.getPercentageComplete()), Static49.PERCENT_SIGN}); Static199.mainLoadPercentage = 70; } } else if (Static166.mainLoadState == 100) { @@ -867,39 +926,39 @@ public final class client extends GameShell { Static166.mainLoadState = 110; } } else if (Static166.mainLoadState == 110) { - Static178.instance = new MouseRecorder(); - GameShell.signLink.startThread(10, Static178.instance); + MouseRecorder.instance = new MouseRecorder(); + GameShell.signLink.startThread(10, MouseRecorder.instance); Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD110B; Static199.mainLoadPercentage = 75; Static166.mainLoadState = 120; } else if (Static166.mainLoadState == 120) { - if (Static184.js5Archive10.isFileReady(Static186.EMPTY, Static252.HUFFMAN_GROUP)) { - @Pc(1060) HuffmanCodec codec = new HuffmanCodec(Static184.js5Archive10.fetchFile(Static186.EMPTY, Static252.HUFFMAN_GROUP)); + if (Static184.js5Archive10.isFileReady(JagString.EMPTY, Static252.HUFFMAN_GROUP)) { + @Pc(1060) HuffmanCodec codec = new HuffmanCodec(Static184.js5Archive10.fetchFile(JagString.EMPTY, Static252.HUFFMAN_GROUP)); Static1.method1(codec); Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD120B; Static166.mainLoadState = 130; Static199.mainLoadPercentage = 80; } else { - Static126.mainLoadSecondaryText = Static34.concatenate(new JagString[] { LocalizedText.MAINLOAD120, Static206.aClass100_899 }); + Static126.mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD120, Static206.aClass100_899 }); Static199.mainLoadPercentage = 80; } } else if (Static166.mainLoadState == 130) { if (!Static41.js5Archive3.fetchAll()) { - Static126.mainLoadSecondaryText = Static34.concatenate(new JagString[] { LocalizedText.MAINLOAD130, Static123.parseInt(Static41.js5Archive3.getPercentageComplete() * 3 / 4), Static49.PERCENT_SIGN}); + Static126.mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, Static123.parseInt(Static41.js5Archive3.getPercentageComplete() * 3 / 4), Static49.PERCENT_SIGN}); Static199.mainLoadPercentage = 85; } else if (!Static16.js5Archive12.fetchAll()) { - Static126.mainLoadSecondaryText = Static34.concatenate(new JagString[] { LocalizedText.MAINLOAD130, Static123.parseInt(Static16.js5Archive12.getPercentageComplete() / 10 + 75), Static49.PERCENT_SIGN}); + Static126.mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, Static123.parseInt(Static16.js5Archive12.getPercentageComplete() / 10 + 75), Static49.PERCENT_SIGN}); Static199.mainLoadPercentage = 85; } else if (!Static261.js5Archive13.fetchAll()) { - Static126.mainLoadSecondaryText = Static34.concatenate(new JagString[] { LocalizedText.MAINLOAD130, Static123.parseInt(Static261.js5Archive13.getPercentageComplete() / 20 + 85), Static49.PERCENT_SIGN}); + Static126.mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, Static123.parseInt(Static261.js5Archive13.getPercentageComplete() / 20 + 85), Static49.PERCENT_SIGN}); Static199.mainLoadPercentage = 85; - } else if (Static227.js5Archive23.allFilesComplete(Static165.DETAILS)) { - Static234.method4018(Static173.aClass3_Sub2_Sub1_Sub1Array9, Static227.js5Archive23); + } else if (js5Archive23.allFilesComplete(Static165.DETAILS)) { + Static234.method4018(Sprites.mapfunctions, js5Archive23); Static199.mainLoadPercentage = 95; Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD130B; Static166.mainLoadState = 135; } else { - Static126.mainLoadSecondaryText = Static34.concatenate(new JagString[] { LocalizedText.MAINLOAD130, Static123.parseInt(Static227.js5Archive23.method4478(Static165.DETAILS) / 10 + 90), Static49.PERCENT_SIGN}); + Static126.mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, Static123.parseInt(js5Archive23.getPercentageComplete(Static165.DETAILS) / 10 + 90), Static49.PERCENT_SIGN}); Static199.mainLoadPercentage = 85; } } else if (Static166.mainLoadState == 135) { @@ -929,18 +988,18 @@ public final class client extends GameShell { Static199.mainLoadPercentage = 97; Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD140; Static166.mainLoadState = 150; - Static107.clean = true; + clean = true; } else if (Static166.mainLoadState == 150) { Static151.method2807(); - if (Static164.safeMode) { - Static102.windowMode = 0; - Static186.antiAliasingMode = 0; - Static214.windowMode = 0; - Static141.buildArea = 0; + if (Preferences.safeMode) { + Preferences.windowMode = 0; + Preferences.antiAliasingMode = 0; + Preferences.favoriteWorlds = 0; + Preferences.buildArea = 0; } - Static164.safeMode = true; - Static203.savePreferences(GameShell.signLink); - Static241.setWindowMode(false, Static214.windowMode, -1, -1); + Preferences.safeMode = true; + Preferences.write(GameShell.signLink); + Static241.setWindowMode(false, Preferences.favoriteWorlds, -1, -1); Static199.mainLoadPercentage = 100; Static166.mainLoadState = 160; Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD150B; @@ -952,7 +1011,7 @@ public final class client extends GameShell { @OriginalMember(owner = "client!client", name = "a", descriptor = "(B)V") @Override protected final void mainLoop() { - if (Static244.gameState == 1000) { + if (gameState == 1000) { return; } Static83.loop++; @@ -972,27 +1031,27 @@ public final class client extends GameShell { if (GlRenderer.enabled) { Static63.process(); } - if (Static71.mouseWheel != null) { - @Pc(75) int wheelRotation = Static71.mouseWheel.getRotation(); + if (mouseWheel != null) { + @Pc(75) int wheelRotation = mouseWheel.getRotation(); Static58.wheelRotation = wheelRotation; } - if (Static244.gameState == 0) { + if (gameState == 0) { this.mainLoad(); - Static234.resetTimer(); - } else if (Static244.gameState == 5) { + GameShell.resetTimer(); + } else if (gameState == 5) { this.mainLoad(); - Static234.resetTimer(); - } else if (Static244.gameState == 25 || Static244.gameState == 28) { + GameShell.resetTimer(); + } else if (gameState == 25 || gameState == 28) { Static78.rebuildMap(); } - if (Static244.gameState == 10) { + if (gameState == 10) { this.method943(); Static158.loop(); Static31.loopAuto(); Static216.loop(); - } else if (Static244.gameState == 30) { + } else if (gameState == 30) { Static81.method1756(); - } else if (Static244.gameState == 40) { + } else if (gameState == 40) { Static216.loop(); if (Static266.reply != -3) { if (Static266.reply == 15) {