From b3a5fdbec90efd60a0894680ffdcc76fde4632eb Mon Sep 17 00:00:00 2001 From: Pazaz Date: Mon, 25 Apr 2022 02:11:03 -0400 Subject: [PATCH] Created TypeList classes and moved static members to them --- client/src/main/java/AnimFrameset.java | 4 +- client/src/main/java/AreaSound.java | 2 +- client/src/main/java/AudioChannel.java | 12 +- client/src/main/java/BasType.java | 2 +- client/src/main/java/BasTypeList.java | 46 + client/src/main/java/Base37.java | 32 + client/src/main/java/Buffer.java | 7 +- client/src/main/java/Camera.java | 2 +- client/src/main/java/Cheat.java | 24 +- client/src/main/java/Class32.java | 4 +- client/src/main/java/Class5.java | 2 +- client/src/main/java/Component.java | 47 +- client/src/main/java/CreateManager.java | 123 ++ client/src/main/java/CursorType.java | 6 +- client/src/main/java/CursorTypeList.java | 53 + client/src/main/java/EnumTypeList.java | 30 + client/src/main/java/Equipment.java | 24 + client/src/main/java/Flames.java | 26 + client/src/main/java/FloType.java | 2 +- client/src/main/java/FloTypeList.java | 42 + client/src/main/java/FluType.java | 2 +- client/src/main/java/FluTypeList.java | 45 + client/src/main/java/FontMetricsList.java | 6 + client/src/main/java/Fonts.java | 19 + client/src/main/java/GlAlphaSprite.java | 2 +- client/src/main/java/GlBuffer.java | 2 +- .../java/{Static63.java => GlCleaner.java} | 2 +- client/src/main/java/GlFont.java | 10 +- client/src/main/java/GlIndexedSprite.java | 10 +- client/src/main/java/GlModel.java | 420 +++---- client/src/main/java/GlRenderer.java | 4 +- client/src/main/java/GlSolidColorTexture.java | 6 +- client/src/main/java/GlSprite.java | 10 +- client/src/main/java/GlTexture.java | 10 +- client/src/main/java/GlTile.java | 4 +- .../src/main/java/GlVertexBufferObject.java | 8 +- client/src/main/java/HintArrowManager.java | 65 ++ client/src/main/java/HitBarList.java | 6 + client/src/main/java/IdkType.java | 8 +- client/src/main/java/IdkTypeList.java | 51 + client/src/main/java/InterfaceList.java | 139 +++ client/src/main/java/InvTypeList.java | 30 + client/src/main/java/IsaacRandom.java | 2 +- client/src/main/java/JagString.java | 31 +- client/src/main/java/Js5.java | 6 +- .../main/java/Js5CachedResourceProvider.java | 2 +- client/src/main/java/Js5MasterIndex.java | 4 +- client/src/main/java/Js5NetQueue.java | 4 +- .../main/java/Js5QuickChatCommandDecoder.java | 6 +- client/src/main/java/LightType.java | 2 +- client/src/main/java/LightTypeList.java | 45 + .../src/main/java/LiquidMaterialRenderer.java | 8 +- client/src/main/java/LoadingBar.java | 10 +- client/src/main/java/LoadingBarAwt.java | 7 + client/src/main/java/Loc.java | 16 +- client/src/main/java/LocType.java | 72 +- client/src/main/java/LocTypeList.java | 93 ++ client/src/main/java/LocalizedText.java | 522 ++++----- client/src/main/java/LoginManager.java | 457 ++++++++ client/src/main/java/Map.java | 23 +- .../java/{Class3_Sub24.java => MapChunk.java} | 4 +- client/src/main/java/MapElementList.java | 2 +- client/src/main/java/MapList.java | 21 + client/src/main/java/MidiPlayer.java | 65 ++ client/src/main/java/MiniMenu.java | 2 +- client/src/main/java/Model.java | 24 +- client/src/main/java/Mouse.java | 25 +- client/src/main/java/MouseRecorder.java | 2 + client/src/main/java/MouseWheel.java | 12 +- client/src/main/java/MsiType.java | 10 +- client/src/main/java/MsiTypeList.java | 53 +- client/src/main/java/MusicPlayer.java | 8 + client/src/main/java/Npc.java | 8 +- client/src/main/java/NpcType.java | 30 +- client/src/main/java/NpcTypeList.java | 60 + client/src/main/java/ObjStack.java | 2 +- client/src/main/java/ObjType.java | 36 +- client/src/main/java/ObjTypeList.java | 97 ++ client/src/main/java/Packet.java | 10 +- client/src/main/java/ParamTypeList.java | 30 + client/src/main/java/PathFinder.java | 6 + client/src/main/java/PathingEntity.java | 14 +- client/src/main/java/Player.java | 28 +- client/src/main/java/PlayerAppearance.java | 136 ++- client/src/main/java/PlayerList.java | 2 + client/src/main/java/Preferences.java | 7 + client/src/main/java/ProjAnim.java | 6 +- client/src/main/java/Protocol.java | 153 +++ client/src/main/java/QuickChatCatType.java | 2 +- .../src/main/java/QuickChatCatTypeList.java | 41 + client/src/main/java/QuickChatPhraseType.java | 2 +- .../main/java/QuickChatPhraseTypeList.java | 54 + client/src/main/java/SceneGraph.java | 25 +- client/src/main/java/SeqType.java | 12 +- client/src/main/java/SeqTypeList.java | 68 ++ client/src/main/java/Shadow.java | 2 +- client/src/main/java/ShadowModelList.java | 151 +++ client/src/main/java/SoftLruHashTable.java | 2 +- client/src/main/java/SoftwareModel.java | 140 +-- client/src/main/java/SoundBank.java | 4 +- client/src/main/java/SoundPlayer.java | 58 +- .../main/java/SpecularMaterialRenderer.java | 2 +- client/src/main/java/SpotAnim.java | 6 +- client/src/main/java/SpotAnimType.java | 10 +- client/src/main/java/SpotAnimTypeList.java | 64 ++ client/src/main/java/Sprites.java | 41 +- client/src/main/java/Static1.java | 57 +- client/src/main/java/Static10.java | 39 +- client/src/main/java/Static101.java | 11 +- client/src/main/java/Static102.java | 12 - client/src/main/java/Static103.java | 481 ++++---- client/src/main/java/Static104.java | 6 +- client/src/main/java/Static105.java | 4 +- client/src/main/java/Static106.java | 5 +- client/src/main/java/Static107.java | 19 +- client/src/main/java/Static109.java | 25 - client/src/main/java/Static11.java | 6 +- client/src/main/java/Static110.java | 22 +- client/src/main/java/Static111.java | 18 +- client/src/main/java/Static112.java | 16 +- client/src/main/java/Static113.java | 2 +- client/src/main/java/Static114.java | 4 +- client/src/main/java/Static115.java | 14 +- client/src/main/java/Static116.java | 41 +- client/src/main/java/Static118.java | 11 +- client/src/main/java/Static119.java | 47 +- client/src/main/java/Static12.java | 5 +- client/src/main/java/Static121.java | 5 +- client/src/main/java/Static122.java | 7 +- client/src/main/java/Static123.java | 21 +- client/src/main/java/Static124.java | 17 +- client/src/main/java/Static125.java | 56 +- client/src/main/java/Static126.java | 6 - client/src/main/java/Static127.java | 55 +- client/src/main/java/Static130.java | 5 +- client/src/main/java/Static132.java | 9 +- client/src/main/java/Static133.java | 9 +- client/src/main/java/Static134.java | 9 +- client/src/main/java/Static136.java | 2 +- client/src/main/java/Static137.java | 18 +- client/src/main/java/Static138.java | 39 +- client/src/main/java/Static139.java | 8 +- client/src/main/java/Static14.java | 7 +- client/src/main/java/Static140.java | 48 +- client/src/main/java/Static141.java | 35 +- client/src/main/java/Static142.java | 13 +- client/src/main/java/Static143.java | 19 +- client/src/main/java/Static144.java | 5 +- client/src/main/java/Static145.java | 24 +- client/src/main/java/Static146.java | 5 +- client/src/main/java/Static147.java | 8 +- client/src/main/java/Static148.java | 23 +- client/src/main/java/Static149.java | 3 - client/src/main/java/Static15.java | 5 +- client/src/main/java/Static150.java | 30 +- client/src/main/java/Static151.java | 16 +- client/src/main/java/Static153.java | 21 +- client/src/main/java/Static154.java | 9 +- client/src/main/java/Static155.java | 8 +- client/src/main/java/Static156.java | 9 +- client/src/main/java/Static158.java | 114 +- client/src/main/java/Static159.java | 6 +- client/src/main/java/Static16.java | 8 +- client/src/main/java/Static160.java | 12 +- client/src/main/java/Static163.java | 9 +- client/src/main/java/Static164.java | 22 +- client/src/main/java/Static165.java | 14 +- client/src/main/java/Static166.java | 5 +- client/src/main/java/Static167.java | 24 +- client/src/main/java/Static169.java | 5 +- client/src/main/java/Static17.java | 39 +- client/src/main/java/Static170.java | 23 +- client/src/main/java/Static171.java | 14 +- client/src/main/java/Static172.java | 13 +- client/src/main/java/Static173.java | 10 +- client/src/main/java/Static175.java | 7 +- client/src/main/java/Static176.java | 39 +- client/src/main/java/Static178.java | 8 +- client/src/main/java/Static179.java | 15 +- client/src/main/java/Static18.java | 7 +- client/src/main/java/Static180.java | 26 +- client/src/main/java/Static181.java | 41 +- client/src/main/java/Static182.java | 8 +- client/src/main/java/Static183.java | 2 +- client/src/main/java/Static184.java | 12 +- client/src/main/java/Static185.java | 12 +- client/src/main/java/Static189.java | 14 - client/src/main/java/Static19.java | 10 +- client/src/main/java/Static190.java | 13 +- client/src/main/java/Static191.java | 7 +- client/src/main/java/Static192.java | 8 +- client/src/main/java/Static193.java | 35 +- client/src/main/java/Static195.java | 16 +- client/src/main/java/Static196.java | 65 +- client/src/main/java/Static197.java | 10 +- client/src/main/java/Static198.java | 11 +- client/src/main/java/Static199.java | 24 - client/src/main/java/Static2.java | 24 +- client/src/main/java/Static20.java | 5 +- client/src/main/java/Static200.java | 8 +- client/src/main/java/Static201.java | 8 +- client/src/main/java/Static202.java | 34 +- client/src/main/java/Static203.java | 12 +- client/src/main/java/Static204.java | 17 +- client/src/main/java/Static205.java | 3 - client/src/main/java/Static206.java | 13 +- client/src/main/java/Static207.java | 132 +-- client/src/main/java/Static208.java | 6 - client/src/main/java/Static209.java | 19 +- client/src/main/java/Static210.java | 10 - client/src/main/java/Static211.java | 13 +- client/src/main/java/Static212.java | 7 - client/src/main/java/Static213.java | 27 - client/src/main/java/Static214.java | 22 +- client/src/main/java/Static216.java | 300 ----- client/src/main/java/Static217.java | 52 +- client/src/main/java/Static218.java | 50 +- client/src/main/java/Static219.java | 24 +- client/src/main/java/Static22.java | 3 - client/src/main/java/Static220.java | 53 +- client/src/main/java/Static221.java | 18 +- client/src/main/java/Static223.java | 25 +- client/src/main/java/Static224.java | 10 +- client/src/main/java/Static225.java | 48 +- client/src/main/java/Static226.java | 15 +- client/src/main/java/Static227.java | 10 +- client/src/main/java/Static228.java | 9 +- client/src/main/java/Static229.java | 17 +- client/src/main/java/Static23.java | 8 +- client/src/main/java/Static230.java | 71 +- client/src/main/java/Static231.java | 18 +- client/src/main/java/Static232.java | 16 +- client/src/main/java/Static233.java | 26 +- client/src/main/java/Static234.java | 66 +- client/src/main/java/Static235.java | 26 +- client/src/main/java/Static238.java | 10 +- client/src/main/java/Static24.java | 14 +- client/src/main/java/Static240.java | 7 +- client/src/main/java/Static241.java | 29 +- client/src/main/java/Static243.java | 24 +- client/src/main/java/Static244.java | 7 +- client/src/main/java/Static245.java | 47 +- client/src/main/java/Static246.java | 24 +- client/src/main/java/Static247.java | 20 - client/src/main/java/Static248.java | 11 +- client/src/main/java/Static249.java | 20 +- client/src/main/java/Static25.java | 16 - client/src/main/java/Static250.java | 21 +- client/src/main/java/Static251.java | 5 - client/src/main/java/Static252.java | 9 +- client/src/main/java/Static253.java | 37 +- client/src/main/java/Static254.java | 11 +- client/src/main/java/Static256.java | 17 - client/src/main/java/Static257.java | 15 +- client/src/main/java/Static258.java | 18 +- client/src/main/java/Static259.java | 6 - client/src/main/java/Static26.java | 38 +- client/src/main/java/Static260.java | 17 +- client/src/main/java/Static261.java | 5 +- client/src/main/java/Static262.java | 12 - client/src/main/java/Static263.java | 64 +- client/src/main/java/Static264.java | 4 +- client/src/main/java/Static265.java | 3 - client/src/main/java/Static266.java | 18 +- client/src/main/java/Static267.java | 16 +- client/src/main/java/Static269.java | 34 +- client/src/main/java/Static27.java | 11 +- client/src/main/java/Static270.java | 22 +- client/src/main/java/Static271.java | 28 +- client/src/main/java/Static272.java | 13 +- client/src/main/java/Static273.java | 8 +- client/src/main/java/Static274.java | 6 - client/src/main/java/Static275.java | 30 - client/src/main/java/Static276.java | 44 +- client/src/main/java/Static278.java | 40 +- client/src/main/java/Static279.java | 15 +- client/src/main/java/Static28.java | 27 - client/src/main/java/Static280.java | 9 +- client/src/main/java/Static282.java | 20 - client/src/main/java/Static29.java | 20 +- client/src/main/java/Static3.java | 16 +- client/src/main/java/Static30.java | 7 +- client/src/main/java/Static31.java | 109 +- client/src/main/java/Static32.java | 9 +- client/src/main/java/Static33.java | 10 +- client/src/main/java/Static34.java | 70 +- client/src/main/java/Static35.java | 5 +- client/src/main/java/Static36.java | 31 +- client/src/main/java/Static37.java | 7 +- client/src/main/java/Static38.java | 4 +- client/src/main/java/Static39.java | 5 +- client/src/main/java/Static4.java | 1001 ++++++++--------- client/src/main/java/Static40.java | 26 +- client/src/main/java/Static41.java | 162 +-- client/src/main/java/Static43.java | 2 +- client/src/main/java/Static44.java | 24 +- client/src/main/java/Static45.java | 31 +- client/src/main/java/Static49.java | 38 +- client/src/main/java/Static5.java | 31 +- client/src/main/java/Static50.java | 6 +- client/src/main/java/Static52.java | 6 - client/src/main/java/Static53.java | 16 +- client/src/main/java/Static54.java | 79 +- client/src/main/java/Static55.java | 5 +- client/src/main/java/Static56.java | 15 +- client/src/main/java/Static57.java | 10 +- client/src/main/java/Static58.java | 27 +- client/src/main/java/Static59.java | 25 +- client/src/main/java/Static6.java | 15 +- client/src/main/java/Static60.java | 7 +- client/src/main/java/Static61.java | 11 +- client/src/main/java/Static62.java | 12 +- client/src/main/java/Static64.java | 18 +- client/src/main/java/Static65.java | 2 +- client/src/main/java/Static67.java | 7 +- client/src/main/java/Static69.java | 21 +- client/src/main/java/Static7.java | 21 +- client/src/main/java/Static70.java | 7 +- client/src/main/java/Static71.java | 45 +- client/src/main/java/Static72.java | 20 +- client/src/main/java/Static73.java | 18 +- client/src/main/java/Static74.java | 6 +- client/src/main/java/Static75.java | 341 ++---- client/src/main/java/Static78.java | 80 +- client/src/main/java/Static79.java | 56 +- client/src/main/java/Static8.java | 11 +- client/src/main/java/Static80.java | 23 +- client/src/main/java/Static81.java | 189 ++-- client/src/main/java/Static82.java | 5 +- client/src/main/java/Static83.java | 3 - client/src/main/java/Static84.java | 87 +- client/src/main/java/Static85.java | 17 +- client/src/main/java/Static86.java | 14 +- client/src/main/java/Static87.java | 42 +- client/src/main/java/Static88.java | 382 +++---- client/src/main/java/Static89.java | 11 +- client/src/main/java/Static9.java | 28 +- client/src/main/java/Static90.java | 33 +- client/src/main/java/Static91.java | 9 +- client/src/main/java/Static92.java | 9 +- client/src/main/java/Static93.java | 13 +- client/src/main/java/Static96.java | 18 +- client/src/main/java/Static97.java | 30 - client/src/main/java/Static98.java | 3 - client/src/main/java/Static99.java | 2 +- client/src/main/java/StructTypeList.java | 30 + client/src/main/java/SubScript.java | 6 - client/src/main/java/TitleScreen.java | 58 + .../main/java/UnderwaterMaterialRenderer.java | 35 +- client/src/main/java/VarbitTypeList.java | 45 + client/src/main/java/VarpTypeList.java | 48 + client/src/main/java/WordPack.java | 14 + client/src/main/java/World.java | 8 +- client/src/main/java/WorldList.java | 216 ++++ client/src/main/java/WorldMap.java | 61 +- client/src/main/java/client.java | 942 ++++++++++------ 356 files changed, 6604 insertions(+), 6652 deletions(-) create mode 100644 client/src/main/java/BasTypeList.java create mode 100644 client/src/main/java/Base37.java create mode 100644 client/src/main/java/CreateManager.java create mode 100644 client/src/main/java/CursorTypeList.java create mode 100644 client/src/main/java/EnumTypeList.java create mode 100644 client/src/main/java/Equipment.java create mode 100644 client/src/main/java/Flames.java create mode 100644 client/src/main/java/FluTypeList.java create mode 100644 client/src/main/java/FontMetricsList.java rename client/src/main/java/{Static63.java => GlCleaner.java} (99%) create mode 100644 client/src/main/java/HintArrowManager.java create mode 100644 client/src/main/java/HitBarList.java create mode 100644 client/src/main/java/IdkTypeList.java create mode 100644 client/src/main/java/InvTypeList.java create mode 100644 client/src/main/java/LightTypeList.java create mode 100644 client/src/main/java/LocTypeList.java create mode 100644 client/src/main/java/LoginManager.java rename client/src/main/java/{Class3_Sub24.java => MapChunk.java} (85%) create mode 100644 client/src/main/java/MusicPlayer.java create mode 100644 client/src/main/java/NpcTypeList.java create mode 100644 client/src/main/java/ObjTypeList.java create mode 100644 client/src/main/java/ParamTypeList.java create mode 100644 client/src/main/java/PathFinder.java create mode 100644 client/src/main/java/QuickChatCatTypeList.java create mode 100644 client/src/main/java/QuickChatPhraseTypeList.java create mode 100644 client/src/main/java/SeqTypeList.java create mode 100644 client/src/main/java/ShadowModelList.java create mode 100644 client/src/main/java/SpotAnimTypeList.java delete mode 100644 client/src/main/java/Static212.java delete mode 100644 client/src/main/java/Static275.java delete mode 100644 client/src/main/java/Static282.java create mode 100644 client/src/main/java/StructTypeList.java delete mode 100644 client/src/main/java/SubScript.java create mode 100644 client/src/main/java/TitleScreen.java create mode 100644 client/src/main/java/VarbitTypeList.java create mode 100644 client/src/main/java/VarpTypeList.java create mode 100644 client/src/main/java/WordPack.java create mode 100644 client/src/main/java/WorldList.java diff --git a/client/src/main/java/AnimFrameset.java b/client/src/main/java/AnimFrameset.java index d7e635b..e00079e 100644 --- a/client/src/main/java/AnimFrameset.java +++ b/client/src/main/java/AnimFrameset.java @@ -12,9 +12,9 @@ public final class AnimFrameset extends SecondaryNode { @OriginalMember(owner = "client!cl", name = "", descriptor = "(Lclient!ve;Lclient!ve;IZ)V") public AnimFrameset(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3) { @Pc(5) LinkedList local5 = new LinkedList(); - @Pc(10) int local10 = arg0.method4504(arg2); + @Pc(10) int local10 = arg0.getGroupCapacity(arg2); this.frames = new AnimFrame[local10]; - @Pc(19) int[] local19 = arg0.method4503(arg2); + @Pc(19) int[] local19 = arg0.getFileIds(arg2); for (@Pc(21) int local21 = 0; local21 < local19.length; local21++) { @Pc(37) byte[] local37 = arg0.getFile(arg2, local19[local21]); @Pc(51) int local51 = local37[1] & 0xFF | (local37[0] & 0xFF) << 8; diff --git a/client/src/main/java/AreaSound.java b/client/src/main/java/AreaSound.java index c745dff..bf03f96 100644 --- a/client/src/main/java/AreaSound.java +++ b/client/src/main/java/AreaSound.java @@ -96,7 +96,7 @@ public final class AreaSound extends Node { this.radius = this.player.soundRadius * 128; } if (this.sound != local8 && this.primaryStream != null) { - Static204.soundStream.removeSubStream(this.primaryStream); + client.soundStream.removeSubStream(this.primaryStream); this.primaryStream = null; } } diff --git a/client/src/main/java/AudioChannel.java b/client/src/main/java/AudioChannel.java index 7ed1b93..74d039e 100644 --- a/client/src/main/java/AudioChannel.java +++ b/client/src/main/java/AudioChannel.java @@ -9,6 +9,8 @@ public class AudioChannel { @OriginalMember(owner = "client!na", name = "w", descriptor = "Z") public static boolean stereo; + @OriginalMember(owner = "client!va", name = "O", descriptor = "I") + public static int threadPriority; @OriginalMember(owner = "client!vh", name = "h", descriptor = "Lclient!qb;") private PcmStream stream; @@ -60,7 +62,7 @@ public class AudioChannel { @OriginalMember(owner = "client!dc", name = "a", descriptor = "(IIIZ)V") public static void init(@OriginalArg(3) boolean arg0) { - Static258.threadPriority = 2; + threadPriority = 2; stereo = arg0; Static44.sampleRate = 22050; } @@ -80,10 +82,10 @@ public class AudioChannel { local33.bufferCapacity = 16384; } local33.open(local33.bufferCapacity); - if (Static258.threadPriority > 0 && Static60.thread == null) { + if (threadPriority > 0 && Static60.thread == null) { Static60.thread = new AudioThread(); Static60.thread.signLink = arg1; - arg1.startThread(Static258.threadPriority, Static60.thread); + arg1.startThread(threadPriority, Static60.thread); } if (Static60.thread != null) { if (Static60.thread.channels[arg3] != null) { @@ -100,10 +102,10 @@ public class AudioChannel { local120.init(arg2); local120.bufferCapacity = 16384; local120.open(local120.bufferCapacity); - if (Static258.threadPriority > 0 && Static60.thread == null) { + if (threadPriority > 0 && Static60.thread == null) { Static60.thread = new AudioThread(); Static60.thread.signLink = arg1; - arg1.startThread(Static258.threadPriority, Static60.thread); + arg1.startThread(threadPriority, Static60.thread); } if (Static60.thread != null) { if (Static60.thread.channels[arg3] != null) { diff --git a/client/src/main/java/BasType.java b/client/src/main/java/BasType.java index 3f840ad..93726c1 100644 --- a/client/src/main/java/BasType.java +++ b/client/src/main/java/BasType.java @@ -92,7 +92,7 @@ public final class BasType { } @OriginalMember(owner = "client!ck", name = "a", descriptor = "(ILclient!wa;)V") - public final void method880(@OriginalArg(1) Buffer arg0) { + public final void decode(@OriginalArg(1) Buffer arg0) { while (true) { @Pc(16) int local16 = arg0.g1(); if (local16 == 0) { diff --git a/client/src/main/java/BasTypeList.java b/client/src/main/java/BasTypeList.java new file mode 100644 index 0000000..6e1ff2c --- /dev/null +++ b/client/src/main/java/BasTypeList.java @@ -0,0 +1,46 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class BasTypeList { + @OriginalMember(owner = "client!vf", name = "a", descriptor = "Lclient!n;") + public static final SoftLruHashTable types = new SoftLruHashTable(64); + @OriginalMember(owner = "client!nd", name = "p", descriptor = "Lclient!ve;") + public static Js5 archive; + + @OriginalMember(owner = "client!ge", name = "a", descriptor = "(BLclient!ve;)V") + public static void init(@OriginalArg(1) Js5 arg0) { + archive = arg0; + } + + @OriginalMember(owner = "client!hb", name = "a", descriptor = "(ZI)Lclient!ck;") + public static BasType get(@OriginalArg(1) int arg0) { + @Pc(10) BasType local10 = (BasType) types.get((long) arg0); + if (local10 != null) { + return local10; + } + @Pc(21) byte[] local21 = archive.getFile(32, arg0); + local10 = new BasType(); + if (local21 != null) { + local10.decode(new Buffer(local21)); + } + local10.method878(); + types.put(local10, (long) arg0); + return local10; + } + + @OriginalMember(owner = "client!jk", name = "e", descriptor = "(B)V") + public static void method2433() { + types.clear(); + } + + @OriginalMember(owner = "client!bi", name = "c", descriptor = "(II)V") + public static void clean() { + types.clean(5); + } + + @OriginalMember(owner = "client!di", name = "d", descriptor = "(I)V") + public static void method1172() { + types.method3103(); + } +} diff --git a/client/src/main/java/Base37.java b/client/src/main/java/Base37.java new file mode 100644 index 0000000..2b1f5fb --- /dev/null +++ b/client/src/main/java/Base37.java @@ -0,0 +1,32 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class Base37 { + @OriginalMember(owner = "client!ge", name = "a", descriptor = "(IJ)Lclient!na;") + public static JagString decodeLowerCase(@OriginalArg(1) long arg0) { + if (arg0 <= 0L || arg0 >= 6582952005840035281L) { + return null; + } else if (arg0 % 37L == 0L) { + return null; + } else { + @Pc(32) int local32 = 0; + @Pc(34) long local34 = arg0; + while (local34 != 0L) { + local34 /= 37L; + local32++; + } + @Pc(48) byte[] local48 = new byte[local32]; + while (arg0 != 0L) { + @Pc(65) long local65 = arg0; + arg0 /= 37L; + local32--; + local48[local32] = Static31.aByteArray12[(int) (local65 - arg0 * 37L)]; + } + @Pc(88) JagString local88 = new JagString(); + local88.chars = local48; + local88.length = local48.length; + return local88; + } + } +} diff --git a/client/src/main/java/Buffer.java b/client/src/main/java/Buffer.java index 2450892..5ef8956 100644 --- a/client/src/main/java/Buffer.java +++ b/client/src/main/java/Buffer.java @@ -59,7 +59,12 @@ public class Buffer extends Node { this.data = src; } - @OriginalMember(owner = "client!wa", name = "c", descriptor = "(I)I") + @OriginalMember(owner = "client!si", name = "a", descriptor = "(BLclient!na;)I") + public static int getStringLength(@OriginalArg(1) JagString arg0) { + return arg0.length() + 1; + } + + @OriginalMember(owner = "client!wa", name = "c", descriptor = "(I)I") public final int g2() { this.offset += 2; return ((this.data[this.offset - 2] & 0xFF) << 8) + (this.data[this.offset - 1] & 0xFF); diff --git a/client/src/main/java/Camera.java b/client/src/main/java/Camera.java index 3fe1fc4..06e2138 100644 --- a/client/src/main/java/Camera.java +++ b/client/src/main/java/Camera.java @@ -35,7 +35,7 @@ public class Camera { yawTarget = mod(yawTarget, 2047.0d); @Pc(33) int local33 = Static81.cameraX >> 7; @Pc(37) int local37 = Static111.cameraZ >> 7; - @Pc(43) int local43 = Static207.method3685(Static55.level, Static81.cameraX, Static111.cameraZ); + @Pc(43) int local43 = SceneGraph.getTileHeight(Static55.level, Static81.cameraX, Static111.cameraZ); @Pc(45) int local45 = 0; @Pc(64) int local64; if (local33 > 3 && local37 > 3 && local33 < 100 && local37 < 100) { diff --git a/client/src/main/java/Cheat.java b/client/src/main/java/Cheat.java index 9c2a31c..485512d 100644 --- a/client/src/main/java/Cheat.java +++ b/client/src/main/java/Cheat.java @@ -2,13 +2,29 @@ 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"); + public static final JagString JS5DROP = JagString.parse("::serverjs5drop"); @OriginalMember(owner = "client!v", name = "d", descriptor = "Lclient!na;") - public static final JagString CLIENTDROP = Static28.parse("::clientdrop"); + public static final JagString CLIENTDROP = JagString.parse("::clientdrop"); @OriginalMember(owner = "client!dg", name = "b", descriptor = "Lclient!na;") - public static final JagString aClass100_333 = Static28.parse("Shift)2click ENABLED(Q"); + public static final JagString aClass100_333 = JagString.parse("Shift)2click ENABLED(Q"); @OriginalMember(owner = "client!dg", name = "d", descriptor = "Lclient!na;") - public static final JagString aClass100_334 = Static28.parse("Cache:"); + public static final JagString aClass100_334 = JagString.parse("Cache:"); + @OriginalMember(owner = "client!c", name = "Y", descriptor = "Lclient!na;") + public static final JagString aClass100_154 = JagString.parse("Mem:"); + @OriginalMember(owner = "client!nh", name = "hb", descriptor = "Lclient!na;") + public static final JagString aClass100_623 = JagString.parse("::fps "); + @OriginalMember(owner = "client!nb", name = "e", descriptor = "Lclient!na;") + public static final JagString aClass100_775 = JagString.parse("::breakcon"); + @OriginalMember(owner = "client!wf", name = "s", descriptor = "Lclient!na;") + public static final JagString aClass100_943 = JagString.parse("Forced tweening disabled)3"); + @OriginalMember(owner = "client!wd", name = "f", descriptor = "Lclient!na;") + public static final JagString aClass100_990 = JagString.parse("::errortest"); + @OriginalMember(owner = "client!wb", name = "j", descriptor = "Lclient!na;") + public static final JagString aClass100_1093 = JagString.parse("Memory after cleanup="); + @OriginalMember(owner = "client!th", name = "h", descriptor = "Lclient!na;") + public static final JagString aClass100_1088 = JagString.parse("::setparticles"); + @OriginalMember(owner = "client!rc", name = "K", descriptor = "Lclient!na;") + public static final JagString aClass100_232 = JagString.parse("::rect_debug"); @OriginalMember(owner = "client!dg", name = "f", descriptor = "Z") public static boolean displayFps = false; } diff --git a/client/src/main/java/Class32.java b/client/src/main/java/Class32.java index 4279e86..4c005b6 100644 --- a/client/src/main/java/Class32.java +++ b/client/src/main/java/Class32.java @@ -5,8 +5,8 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Class32 { @OriginalMember(owner = "client!ee", name = "h", descriptor = "I") - public int anInt1739; + public int flag; @OriginalMember(owner = "client!ee", name = "i", descriptor = "Lclient!na;") - public JagString aClass100_378; + public JagString name; } diff --git a/client/src/main/java/Class5.java b/client/src/main/java/Class5.java index b75509a..b113420 100644 --- a/client/src/main/java/Class5.java +++ b/client/src/main/java/Class5.java @@ -26,5 +26,5 @@ public final class Class5 { public short aShort8; @OriginalMember(owner = "client!ae", name = "h", descriptor = "Z") - public boolean aBoolean3 = false; + public boolean valid = false; } diff --git a/client/src/main/java/Component.java b/client/src/main/java/Component.java index bb90d5e..ebf667a 100644 --- a/client/src/main/java/Component.java +++ b/client/src/main/java/Component.java @@ -6,6 +6,12 @@ import org.openrs2.deob.annotation.Pc; @OriginalClass("client!be") public final class Component { + @OriginalMember(owner = "client!pf", name = "b", descriptor = "Lclient!n;") + public static final SoftLruHashTable sprites = new SoftLruHashTable(200); + @OriginalMember(owner = "client!jk", name = "z", descriptor = "Lclient!n;") + public static final SoftLruHashTable models = new SoftLruHashTable(50); + @OriginalMember(owner = "client!gn", name = "i", descriptor = "Lclient!n;") + public static final SoftLruHashTable fonts = new SoftLruHashTable(20); @OriginalMember(owner = "client!be", name = "b", descriptor = "[Ljava/lang/Object;") public Object[] anObjectArray1; @@ -477,6 +483,13 @@ public final class Component { @OriginalMember(owner = "client!be", name = "xd", descriptor = "I") public int anInt530 = 0; + @OriginalMember(owner = "client!ec", name = "a", descriptor = "(II)V") + public static void clean() { + sprites.clean(50); + models.clean(50); + fonts.clean(50); + } + @OriginalMember(owner = "client!be", name = "a", descriptor = "(IIB)V") public final void method477(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { if (this.anIntArray39 == null || this.anIntArray39.length <= arg0) { @@ -500,7 +513,7 @@ public final class Component { if (this.anIntArray37 != null) { return true; } - @Pc(18) SoftwareIndexedSprite local18 = Static164.loadSoftwareIndexedSprite(this.anInt477, Static23.aClass153_12); + @Pc(18) SoftwareIndexedSprite local18 = Static164.loadSoftwareIndexedSprite(this.anInt477, InterfaceList.aClass153_12); if (local18 == null) { return false; } @@ -774,15 +787,15 @@ public final class Component { if (local29 == -1) { return null; } - @Pc(43) Sprite local43 = (Sprite) Static190.aClass99_26.get((long) local29); + @Pc(43) Sprite local43 = (Sprite) sprites.get((long) local29); if (local43 != null) { return local43; } - local43 = SpriteLoader.loadSprites(local29, Static23.aClass153_12); + local43 = SpriteLoader.loadSprites(local29, InterfaceList.aClass153_12); if (local43 == null) { Static211.aBoolean72 = true; } else { - Static190.aClass99_26.put(local43, (long) local29); + sprites.put(local43, (long) local29); } return local43; } @@ -848,22 +861,22 @@ public final class Component { } else { @Pc(61) Model local61; if (local10 == 1) { - local61 = (Model) Static124.aClass99_17.get((long) ((local10 << 16) + local13)); + local61 = (Model) models.get((long) ((local10 << 16) + local13)); if (local61 == null) { - @Pc(69) RawModel local69 = Static77.create(Static203.aClass153_85, local13); + @Pc(69) RawModel local69 = Static77.create(InterfaceList.aClass153_85, local13); if (local69 == null) { Static211.aBoolean72 = true; return null; } local61 = local69.createModel(64, 768, -50, -10, -50); - Static124.aClass99_17.put(local61, (long) (local13 + (local10 << 16))); + models.put(local61, (long) (local13 + (local10 << 16))); } if (arg1 != null) { local61 = arg1.method4215(local61, arg0, arg3, arg2); } return local61; } else if (local10 == 2) { - local61 = Static214.get(local13).getHeadModel(arg1, arg3, arg0, arg2); + local61 = NpcTypeList.get(local13).getHeadModel(arg1, arg3, arg0, arg2); if (local61 == null) { Static211.aBoolean72 = true; return null; @@ -882,7 +895,7 @@ public final class Component { return local61; } } else if (local10 == 4) { - @Pc(164) ObjType local164 = Static71.get(local13); + @Pc(164) ObjType local164 = ObjTypeList.get(local13); @Pc(173) Model local173 = local164.getModel(arg0, arg3, arg1, 10, arg2); if (local173 == null) { Static211.aBoolean72 = true; @@ -891,7 +904,7 @@ public final class Component { return local173; } } else if (local10 == 6) { - local61 = Static214.get(local13).getBodyModel(null, 0, 0, arg0, arg3, arg2, null, 0, arg1); + local61 = NpcTypeList.get(local13).getBodyModel(null, 0, 0, arg0, arg3, arg2, null, 0, arg1); if (local61 == null) { Static211.aBoolean72 = true; return null; @@ -930,15 +943,15 @@ public final class Component { return null; } @Pc(66) long local66 = ((this.aBoolean21 ? 1L : 0L) << 38) + ((this.aBoolean18 ? 1L : 0L) << 35) + (long) local12 + ((long) this.anInt514 << 36) + ((this.aBoolean26 ? 1L : 0L) << 39) + ((long) this.anInt513 << 40); - @Pc(72) Sprite local72 = (Sprite) Static190.aClass99_26.get(local66); + @Pc(72) Sprite local72 = (Sprite) sprites.get(local66); if (local72 != null) { return local72; } @Pc(85) SoftwareSprite local85; if (this.aBoolean18) { - local85 = Static80.loadSoftwareAlphaSprite(Static23.aClass153_12, local12); + local85 = Static80.loadSoftwareAlphaSprite(InterfaceList.aClass153_12, local12); } else { - local85 = SpriteLoader.loadSoftwareSprite(0, Static23.aClass153_12, local12); + local85 = SpriteLoader.loadSoftwareSprite(0, InterfaceList.aClass153_12, local12); } if (local85 == null) { Static211.aBoolean72 = true; @@ -969,7 +982,7 @@ public final class Component { } else { local72 = new GlSprite(local85); } - Static190.aClass99_26.put(local72, local66); + sprites.put(local72, local66); return local72; } @@ -1162,16 +1175,16 @@ public final class Component { if (this.anInt502 == -1) { return null; } - @Pc(21) Font local21 = (Font) Static87.aClass99_12.get((long) this.anInt502); + @Pc(21) Font local21 = (Font) fonts.get((long) this.anInt502); if (local21 != null) { return local21; } - local21 = Static127.method2462(this.anInt502, Static23.aClass153_12, Static167.aClass153_64); + local21 = Static127.method2462(this.anInt502, InterfaceList.aClass153_12, InterfaceList.aClass153_64); if (local21 == null) { Static211.aBoolean72 = true; } else { local21.setNameIcons(arg0, null); - Static87.aClass99_12.put(local21, (long) this.anInt502); + fonts.put(local21, (long) this.anInt502); } return local21; } diff --git a/client/src/main/java/CreateManager.java b/client/src/main/java/CreateManager.java new file mode 100644 index 0000000..e2ef66a --- /dev/null +++ b/client/src/main/java/CreateManager.java @@ -0,0 +1,123 @@ +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +import java.io.IOException; +import java.net.Socket; + +public class CreateManager { + @OriginalMember(owner = "client!oe", name = "l", descriptor = "I") + public static int step = 0; + @OriginalMember(owner = "client!sf", name = "a", descriptor = "I") + public static int loops = 0; + @OriginalMember(owner = "client!eg", name = "v", descriptor = "I") + public static int errors = 0; + @OriginalMember(owner = "client!sc", name = "y", descriptor = "I") + public static int reply = -2; + @OriginalMember(owner = "client!si", name = "S", descriptor = "[Lclient!na;") + public static JagString[] suggestedNames; + + @OriginalMember(owner = "client!mh", name = "f", descriptor = "(B)V") + public static void loop() { + if (step == 0) { + return; + } + try { + if (++loops > 2000) { + if (Protocol.socket != null) { + Protocol.socket.close(); + Protocol.socket = null; + } + if (errors >= 1) { + reply = -5; + step = 0; + return; + } + step = 1; + loops = 0; + errors++; + if (client.port == client.defaultPort) { + client.port = client.alternatePort; + } else { + client.port = client.defaultPort; + } + } + if (step == 1) { + Protocol.socketRequest = GameShell.signLink.openSocket(client.hostname, client.port); + step = 2; + } + @Pc(120) int local120; + if (step == 2) { + if (Protocol.socketRequest.status == 2) { + throw new IOException(); + } + if (Protocol.socketRequest.status != 1) { + return; + } + Protocol.socket = new BufferedSocket((Socket) Protocol.socketRequest.result, GameShell.signLink); + Protocol.socketRequest = null; + Protocol.socket.write(Protocol.outboundBuffer.data, Protocol.outboundBuffer.offset); + if (client.musicChannel != null) { + client.musicChannel.method3571(); + } + if (client.soundChannel != null) { + client.soundChannel.method3571(); + } + local120 = Protocol.socket.read(); + if (client.musicChannel != null) { + client.musicChannel.method3571(); + } + if (client.soundChannel != null) { + client.soundChannel.method3571(); + } + if (local120 != 21) { + reply = local120; + step = 0; + Protocol.socket.close(); + Protocol.socket = null; + return; + } + step = 3; + } + if (step == 3) { + if (Protocol.socket.available() < 1) { + return; + } + suggestedNames = new JagString[Protocol.socket.read()]; + step = 4; + } + if (step == 4) { + if (Protocol.socket.available() < suggestedNames.length * 8) { + return; + } + Protocol.inboundBuffer.offset = 0; + Protocol.socket.read(0, suggestedNames.length * 8, Protocol.inboundBuffer.data); + for (local120 = 0; local120 < suggestedNames.length; local120++) { + suggestedNames[local120] = Base37.decodeLowerCase(Protocol.inboundBuffer.g8()); + } + reply = 21; + step = 0; + Protocol.socket.close(); + Protocol.socket = null; + return; + } + } catch (@Pc(238) IOException local238) { + if (Protocol.socket != null) { + Protocol.socket.close(); + Protocol.socket = null; + } + if (errors < 1) { + errors++; + if (client.defaultPort == client.port) { + client.port = client.alternatePort; + } else { + client.port = client.defaultPort; + } + loops = 0; + step = 1; + } else { + reply = -4; + step = 0; + } + } + } +} diff --git a/client/src/main/java/CursorType.java b/client/src/main/java/CursorType.java index 3e42f6a..f1c8d6a 100644 --- a/client/src/main/java/CursorType.java +++ b/client/src/main/java/CursorType.java @@ -17,13 +17,13 @@ public final class CursorType { @OriginalMember(owner = "client!ia", name = "a", descriptor = "(B)Lclient!mm;") public final SoftwareSprite getSprite() { - @Pc(7) SoftwareSprite local7 = (SoftwareSprite) Static7.sprites.get((long) this.spriteId); + @Pc(7) SoftwareSprite local7 = (SoftwareSprite) CursorTypeList.sprites.get((long) this.spriteId); if (local7 != null) { return local7; } - local7 = Static80.loadSoftwareAlphaSprite(Static243.spritesArchive, this.spriteId); + local7 = Static80.loadSoftwareAlphaSprite(CursorTypeList.spritesArchive, this.spriteId); if (local7 != null) { - Static7.sprites.put(local7, (long) this.spriteId); + CursorTypeList.sprites.put(local7, (long) this.spriteId); } return local7; } diff --git a/client/src/main/java/CursorTypeList.java b/client/src/main/java/CursorTypeList.java new file mode 100644 index 0000000..95bde62 --- /dev/null +++ b/client/src/main/java/CursorTypeList.java @@ -0,0 +1,53 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class CursorTypeList { + @OriginalMember(owner = "client!ge", name = "i", descriptor = "Lclient!n;") + public static final SoftLruHashTable types = new SoftLruHashTable(64); + @OriginalMember(owner = "client!ah", name = "i", descriptor = "Lclient!n;") + public static final SoftLruHashTable sprites = new SoftLruHashTable(2); + @OriginalMember(owner = "client!mc", name = "Z", descriptor = "Lclient!ve;") + public static Js5 archive; + @OriginalMember(owner = "client!tk", name = "j", descriptor = "Lclient!ve;") + public static Js5 spritesArchive; + + @OriginalMember(owner = "client!u", name = "a", descriptor = "(BLclient!ve;Lclient!ve;)V") + public static void init(@OriginalArg(1) Js5 arg0, @OriginalArg(2) Js5 arg1) { + archive = arg0; + spritesArchive = arg1; + } + + @OriginalMember(owner = "client!qg", name = "d", descriptor = "(II)Lclient!ia;") + public static CursorType get(@OriginalArg(0) int arg0) { + @Pc(10) CursorType local10 = (CursorType) types.get((long) arg0); + if (local10 != null) { + return local10; + } + @Pc(20) byte[] local20 = archive.getFile(33, arg0); + local10 = new CursorType(); + if (local20 != null) { + local10.decode(new Buffer(local20), arg0); + } + types.put(local10, (long) arg0); + return local10; + } + + @OriginalMember(owner = "client!an", name = "i", descriptor = "(I)V") + public static void method351() { + types.clear(); + sprites.clear(); + } + + @OriginalMember(owner = "client!c", name = "d", descriptor = "(II)V") + public static void clean() { + types.clean(5); + sprites.clean(5); + } + + @OriginalMember(owner = "client!ca", name = "a", descriptor = "(Z)V") + public static void method741() { + types.method3103(); + sprites.method3103(); + } +} diff --git a/client/src/main/java/EnumTypeList.java b/client/src/main/java/EnumTypeList.java new file mode 100644 index 0000000..0c4f8fd --- /dev/null +++ b/client/src/main/java/EnumTypeList.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 EnumTypeList { + @OriginalMember(owner = "client!lj", name = "p", descriptor = "Lclient!gn;") + public static final LruHashTable types = new LruHashTable(128); + @OriginalMember(owner = "client!gk", name = "e", descriptor = "Lclient!ve;") + public static Js5 archive; + + @OriginalMember(owner = "client!gl", name = "a", descriptor = "(Lclient!ve;I)V") + public static void init(@OriginalArg(0) Js5 arg0) { + archive = arg0; + } + + @OriginalMember(owner = "client!ui", name = "a", descriptor = "(IZ)Lclient!ml;") + public static EnumType get(@OriginalArg(0) int arg0) { + @Pc(10) EnumType local10 = (EnumType) types.get((long) arg0); + if (local10 != null) { + return local10; + } + @Pc(24) byte[] local24 = archive.getFile(Static97.method1959(arg0), Static103.method2236(arg0)); + local10 = new EnumType(); + if (local24 != null) { + local10.decode(new Buffer(local24)); + } + types.put(local10, (long) arg0); + return local10; + } +} diff --git a/client/src/main/java/Equipment.java b/client/src/main/java/Equipment.java new file mode 100644 index 0000000..6eb6eb8 --- /dev/null +++ b/client/src/main/java/Equipment.java @@ -0,0 +1,24 @@ +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class Equipment { + @OriginalMember(owner = "client!ta", name = "p", descriptor = "[I") + public static int[] anIntArray455; + + @OriginalMember(owner = "client!eh", name = "a", descriptor = "(I)V") + public static void init() { + @Pc(8) int[] local8 = new int[ObjTypeList.anInt3245]; + @Pc(10) int local10 = 0; + @Pc(12) int local12; + for (local12 = 0; local12 < ObjTypeList.anInt3245; local12++) { + @Pc(19) ObjType local19 = ObjTypeList.get(local12); + if (local19.manWear1 >= 0 || local19.womanWear1 >= 0) { + local8[local10++] = local12; + } + } + anIntArray455 = new int[local10]; + for (local12 = 0; local12 < local10; local12++) { + anIntArray455[local12] = local8[local12]; + } + } +} diff --git a/client/src/main/java/Flames.java b/client/src/main/java/Flames.java new file mode 100644 index 0000000..83cdd1d --- /dev/null +++ b/client/src/main/java/Flames.java @@ -0,0 +1,26 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; + +public class Flames { + @OriginalMember(owner = "client!se", name = "t", descriptor = "[I") + public static final int[] anIntArray445 = new int[] { 12543016, 15504954, 15914854, 16773818 }; + @OriginalMember(owner = "client!bb", name = "m", descriptor = "Lclient!na;") + public static final JagString RUNES = JagString.parse("runes"); + @OriginalMember(owner = "client!km", name = "Yc", descriptor = "I") + public static int anInt3443; + + @OriginalMember(owner = "client!gg", name = "a", descriptor = "(ILclient!ve;)V") + public static void init(@OriginalArg(1) Js5 arg0) { + anInt3443 = arg0.getGroupId(RUNES); + } + + @OriginalMember(owner = "client!sk", name = "a", descriptor = "(Lclient!ve;I)Z") + public static boolean isReady(@OriginalArg(0) Js5 arg0) { + return arg0.isFileReady(anInt3443); + } + + @OriginalMember(owner = "client!wa", name = "a", descriptor = "(Z)V") + public static void update() { + Static250.anInt5434++; + } +} diff --git a/client/src/main/java/FloType.java b/client/src/main/java/FloType.java index 147557e..2db9e9c 100644 --- a/client/src/main/java/FloType.java +++ b/client/src/main/java/FloType.java @@ -39,7 +39,7 @@ public final class FloType { public int anInt5889 = 1190717; @OriginalMember(owner = "client!wl", name = "a", descriptor = "(ILclient!wa;I)V") - public final void method4669(@OriginalArg(1) Buffer arg0, @OriginalArg(2) int arg1) { + public final void decode(@OriginalArg(1) Buffer arg0, @OriginalArg(2) int arg1) { while (true) { @Pc(5) int local5 = arg0.g1(); if (local5 == 0) { diff --git a/client/src/main/java/FloTypeList.java b/client/src/main/java/FloTypeList.java index 2457975..3c8abb5 100644 --- a/client/src/main/java/FloTypeList.java +++ b/client/src/main/java/FloTypeList.java @@ -1,6 +1,48 @@ +import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; public class FloTypeList { + @OriginalMember(owner = "client!t", name = "p", descriptor = "Lclient!n;") + public static final SoftLruHashTable types = new SoftLruHashTable(64); @OriginalMember(owner = "client!hj", name = "a", descriptor = "I") public static int capacity; + @OriginalMember(owner = "client!cl", name = "J", descriptor = "Lclient!ve;") + public static Js5 archive; + + @OriginalMember(owner = "client!qc", name = "a", descriptor = "(ZLclient!ve;)V") + public static void init(@OriginalArg(1) Js5 arg0) { + archive = arg0; + capacity = archive.getGroupCapacity(4); + } + + @OriginalMember(owner = "client!um", name = "a", descriptor = "(BI)Lclient!wl;") + public static FloType method4395(@OriginalArg(1) int arg0) { + @Pc(6) FloType local6 = (FloType) types.get((long) arg0); + if (local6 != null) { + return local6; + } + @Pc(30) byte[] local30 = archive.getFile(4, arg0); + local6 = new FloType(); + if (local30 != null) { + local6.decode(new Buffer(local30), arg0); + } + types.put(local6, (long) arg0); + return local6; + } + + @OriginalMember(owner = "client!uh", name = "e", descriptor = "(I)V") + public static void method4301() { + types.method3103(); + } + + @OriginalMember(owner = "client!wh", name = "a", descriptor = "(I)V") + public static void method4612() { + types.clear(); + } + + @OriginalMember(owner = "client!aj", name = "c", descriptor = "(II)V") + public static void clean() { + types.clean(5); + } } diff --git a/client/src/main/java/FluType.java b/client/src/main/java/FluType.java index ff3c3ec..14c2353 100644 --- a/client/src/main/java/FluType.java +++ b/client/src/main/java/FluType.java @@ -92,7 +92,7 @@ public final class FluType { } @OriginalMember(owner = "client!ni", name = "a", descriptor = "(ILclient!wa;I)V") - public final void method3217(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { + public final void decode(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { while (true) { @Pc(7) int local7 = arg1.g1(); if (local7 == 0) { diff --git a/client/src/main/java/FluTypeList.java b/client/src/main/java/FluTypeList.java new file mode 100644 index 0000000..bbb9a0f --- /dev/null +++ b/client/src/main/java/FluTypeList.java @@ -0,0 +1,45 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class FluTypeList { + @OriginalMember(owner = "client!gj", name = "p", descriptor = "Lclient!n;") + public static final SoftLruHashTable types = new SoftLruHashTable(64); + @OriginalMember(owner = "client!oj", name = "x", descriptor = "Lclient!ve;") + public static Js5 archive; + + @OriginalMember(owner = "client!qc", name = "a", descriptor = "(ZI)Lclient!ni;") + public static FluType get(@OriginalArg(1) int arg0) { + @Pc(10) FluType local10 = (FluType) types.get((long) arg0); + if (local10 != null) { + return local10; + } + @Pc(27) byte[] local27 = archive.getFile(1, arg0); + local10 = new FluType(); + if (local27 != null) { + local10.decode(arg0, new Buffer(local27)); + } + types.put(local10, (long) arg0); + return local10; + } + + @OriginalMember(owner = "client!hc", name = "a", descriptor = "(Lclient!ve;I)V") + public static void init(@OriginalArg(0) Js5 arg0) { + archive = arg0; + } + + @OriginalMember(owner = "client!sd", name = "f", descriptor = "(B)V") + public static void method3885() { + types.method3103(); + } + + @OriginalMember(owner = "client!ed", name = "c", descriptor = "(I)V") + public static void method1308() { + types.clear(); + } + + @OriginalMember(owner = "client!fk", name = "b", descriptor = "(IB)V") + public static void clean() { + types.clean(5); + } +} diff --git a/client/src/main/java/FontMetricsList.java b/client/src/main/java/FontMetricsList.java new file mode 100644 index 0000000..151d3e3 --- /dev/null +++ b/client/src/main/java/FontMetricsList.java @@ -0,0 +1,6 @@ +import org.openrs2.deob.annotation.OriginalMember; + +public class FontMetricsList { + @OriginalMember(owner = "client!l", name = "f", descriptor = "Lclient!n;") + public static final SoftLruHashTable fontMetrics = new SoftLruHashTable(4); +} diff --git a/client/src/main/java/Fonts.java b/client/src/main/java/Fonts.java index f2a84d7..3b1e86e 100644 --- a/client/src/main/java/Fonts.java +++ b/client/src/main/java/Fonts.java @@ -9,6 +9,8 @@ public class Fonts { public static Font p12Full; @OriginalMember(owner = "client!wl", name = "q", descriptor = "Lclient!rk;") public static Font b12Full; + @OriginalMember(owner = "client!vj", name = "j", descriptor = "Lclient!dd;") + public static SoftwareFont p11FullSoftware; @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) { @@ -33,4 +35,21 @@ public class Fonts { } return ready; } + + @OriginalMember(owner = "client!ld", name = "a", descriptor = "(B)I") + public static int getTotal() { + return 6; + } + + @OriginalMember(owner = "client!hn", name = "a", descriptor = "(Lclient!ve;ILclient!ve;)V") + public static void load(@OriginalArg(0) Js5 arg0, @OriginalArg(2) Js5 arg1) { + p11Full = Static127.method2462(Sprites.p11FullId, arg1, arg0); + if (GlRenderer.enabled) { + p11FullSoftware = Static122.method2412(Sprites.p11FullId, arg0, arg1); + } else { + p11FullSoftware = (SoftwareFont) p11Full; + } + p12Full = Static127.method2462(Sprites.p12FullId, arg1, arg0); + b12Full = Static127.method2462(Sprites.b12FullId, arg1, arg0); + } } diff --git a/client/src/main/java/GlAlphaSprite.java b/client/src/main/java/GlAlphaSprite.java index 52a42f6..bd773ac 100644 --- a/client/src/main/java/GlAlphaSprite.java +++ b/client/src/main/java/GlAlphaSprite.java @@ -50,7 +50,7 @@ public final class GlAlphaSprite extends GlSprite { } GlRenderer.setTextureId(this.textureId); local96.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_RGBA, this.powerOfTwoWidth, this.powerOfTwoHeight, 0, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, local94); - Static63.onCard2d += local94.limit() - this.anInt1869; + GlCleaner.onCard2d += local94.limit() - this.anInt1869; this.anInt1869 = local94.limit(); } } diff --git a/client/src/main/java/GlBuffer.java b/client/src/main/java/GlBuffer.java index e43ac08..f629833 100644 --- a/client/src/main/java/GlBuffer.java +++ b/client/src/main/java/GlBuffer.java @@ -12,7 +12,7 @@ public final class GlBuffer { public ByteBuffer aByteBuffer8; @OriginalMember(owner = "client!ql", name = "b", descriptor = "Z") - public boolean aBoolean235 = false; + public boolean valid = false; @OriginalMember(owner = "client!ql", name = "a", descriptor = "I") public int anInt4777 = 0; diff --git a/client/src/main/java/Static63.java b/client/src/main/java/GlCleaner.java similarity index 99% rename from client/src/main/java/Static63.java rename to client/src/main/java/GlCleaner.java index 81f8dc9..d54d49d 100644 --- a/client/src/main/java/Static63.java +++ b/client/src/main/java/GlCleaner.java @@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; -public final class Static63 { +public final class GlCleaner { @OriginalMember(owner = "client!fa", name = "a", descriptor = "I") public static int onCardTexture = 0; diff --git a/client/src/main/java/GlFont.java b/client/src/main/java/GlFont.java index 3a97c33..ee6aca6 100644 --- a/client/src/main/java/GlFont.java +++ b/client/src/main/java/GlFont.java @@ -34,13 +34,13 @@ public final class GlFont extends Font { @Override protected void finalize() throws Throwable { if (this.textureId != -1) { - Static63.deleteTexture2d(this.textureId, this.size, this.contextId); + GlCleaner.deleteTexture2d(this.textureId, this.size, this.contextId); this.textureId = -1; this.size = 0; } if (this.listIds != null) { for (@Pc(21) int i = 0; i < this.listIds.length; i++) { - Static63.deleteList(this.listIds[i], this.contextId); + GlCleaner.deleteList(this.listIds[i], this.contextId); } this.listIds = null; } @@ -139,7 +139,7 @@ public final class GlFont extends Font { gl.glEnd(); gl.glEndList(); } - this.contextId = Static63.contextId; + this.contextId = GlCleaner.contextId; } @OriginalMember(owner = "client!mb", name = "a", descriptor = "([[B)V") @@ -186,11 +186,11 @@ public final class GlFont extends Font { @Pc(162) int[] temp = new int[1]; gl.glGenTextures(1, temp, 0); this.textureId = temp[0]; - this.contextId = Static63.contextId; + this.contextId = GlCleaner.contextId; } GlRenderer.setTextureId(this.textureId); gl.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_LUMINANCE_ALPHA, this.powerOfTwoSize, this.powerOfTwoSize, 0, GL2.GL_LUMINANCE_ALPHA, GL2.GL_UNSIGNED_BYTE, buffer); - Static63.onCard2d += buffer.limit() - this.size; + GlCleaner.onCard2d += buffer.limit() - this.size; this.size = buffer.limit(); gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_NEAREST); gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_NEAREST); diff --git a/client/src/main/java/GlIndexedSprite.java b/client/src/main/java/GlIndexedSprite.java index 48f0457..4b7e8bd 100644 --- a/client/src/main/java/GlIndexedSprite.java +++ b/client/src/main/java/GlIndexedSprite.java @@ -69,11 +69,11 @@ public final class GlIndexedSprite extends IndexedSprite { @Pc(102) int[] local102 = new int[1]; local95.glGenTextures(1, local102, 0); this.anInt4281 = local102[0]; - this.anInt4285 = Static63.contextId; + this.anInt4285 = GlCleaner.contextId; } GlRenderer.setTextureId(this.anInt4281); local95.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_RGBA, this.anInt4287, this.anInt4286, 0, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, local93); - Static63.onCard2d += local93.limit() - this.anInt4284; + GlCleaner.onCard2d += local93.limit() - this.anInt4284; this.anInt4284 = local93.limit(); } @@ -120,12 +120,12 @@ public final class GlIndexedSprite extends IndexedSprite { @Override public final void finalize() throws Throwable { if (this.anInt4281 != -1) { - Static63.deleteTexture2d(this.anInt4281, this.anInt4284, this.anInt4285); + GlCleaner.deleteTexture2d(this.anInt4281, this.anInt4284, this.anInt4285); this.anInt4281 = -1; this.anInt4284 = 0; } if (this.anInt4282 != -1) { - Static63.deleteList(this.anInt4282, this.anInt4285); + GlCleaner.deleteList(this.anInt4282, this.anInt4285); this.anInt4282 = -1; } super.finalize(); @@ -138,7 +138,7 @@ public final class GlIndexedSprite extends IndexedSprite { @Pc(17) GL2 local17 = GlRenderer.gl; if (this.anInt4282 == -1) { this.anInt4282 = local17.glGenLists(1); - this.anInt4285 = Static63.contextId; + this.anInt4285 = GlCleaner.contextId; } local17.glNewList(this.anInt4282, GL2.GL_COMPILE); local17.glBegin(GL2.GL_TRIANGLE_FAN); diff --git a/client/src/main/java/GlModel.java b/client/src/main/java/GlModel.java index 954b4d9..9460822 100644 --- a/client/src/main/java/GlModel.java +++ b/client/src/main/java/GlModel.java @@ -75,7 +75,7 @@ public final class GlModel extends Model { private short[] aShortArray84; @OriginalMember(owner = "client!td", name = "U", descriptor = "Lclient!ae;") - public Class5 aClass5_1; + public Class5 vertexBuffer; @OriginalMember(owner = "client!td", name = "W", descriptor = "[S") private short[] aShortArray85; @@ -84,7 +84,7 @@ public final class GlModel extends Model { private int[] anIntArray462; @OriginalMember(owner = "client!td", name = "Y", descriptor = "Lclient!ql;") - public GlBuffer aClass127_4; + public GlBuffer bounds; @OriginalMember(owner = "client!td", name = "Z", descriptor = "[I") private int[] anIntArray463; @@ -117,7 +117,7 @@ public final class GlModel extends Model { public boolean aBoolean259 = false; @OriginalMember(owner = "client!td", name = "I", descriptor = "I") - public int anInt5295 = 0; + public int vertexCount = 0; @OriginalMember(owner = "client!td", name = "S", descriptor = "I") private int anInt5296 = 0; @@ -180,7 +180,7 @@ public final class GlModel extends Model { local115[local117] = ((long) local127 << 32) + (long) local232; } Static173.method3243(local115, local23); - this.anInt5295 = arg0.anInt2139; + this.vertexCount = arg0.anInt2139; this.anIntArray461 = arg0.anIntArray202; this.anIntArray465 = arg0.anIntArray201; this.anIntArray466 = arg0.anIntArray203; @@ -205,8 +205,8 @@ public final class GlModel extends Model { if (arg0.aShortArray22 != null) { this.aShortArray78 = new short[this.anInt5297]; } - this.aClass5_1 = new Class5(); - this.aClass127_4 = new GlBuffer(); + this.vertexBuffer = new Class5(); + this.bounds = new GlBuffer(); this.aClass127_1 = new GlBuffer(); if (Preferences.highDetailLighting) { this.aClass127_2 = new GlBuffer(); @@ -630,12 +630,12 @@ public final class GlModel extends Model { if (this.anInt5296 == 0) { return; } - if (!this.aClass5_1.aBoolean3) { + if (!this.vertexBuffer.valid) { this.method4108(); } - @Pc(13) short local13 = this.aClass5_1.aShort4; - @Pc(17) short local17 = this.aClass5_1.aShort2; - @Pc(21) short local21 = this.aClass5_1.aShort3; + @Pc(13) short local13 = this.vertexBuffer.aShort4; + @Pc(17) short local17 = this.vertexBuffer.aShort2; + @Pc(21) short local21 = this.vertexBuffer.aShort3; @Pc(31) int local31 = arg7 * arg4 - arg5 * arg3 >> 16; @Pc(41) int local41 = arg6 * arg1 + local31 * arg2 >> 16; @Pc(53) int local53 = local41 + (local13 * arg2 + local21 * arg1 >> 16); @@ -694,10 +694,10 @@ public final class GlModel extends Model { local191 = -999999; local206 = 999999; local210 = -999999; - @Pc(243) short local243 = this.aClass5_1.aShort6; - @Pc(247) short local247 = this.aClass5_1.aShort5; - @Pc(251) short local251 = this.aClass5_1.aShort8; - @Pc(255) short local255 = this.aClass5_1.aShort7; + @Pc(243) short local243 = this.vertexBuffer.aShort6; + @Pc(247) short local247 = this.vertexBuffer.aShort5; + @Pc(251) short local251 = this.vertexBuffer.aShort8; + @Pc(255) short local255 = this.vertexBuffer.aShort7; @Pc(290) int[] local290 = new int[] { local243, local247, local243, local247, local243, local247, local243, local247 }; @Pc(325) int[] local325 = new int[] { local251, local251, local255, local255, local251, local251, local255, local255 }; @Pc(360) int[] local360 = new int[] { local17, local17, local17, local17, local21, local21, local21, local21 }; @@ -752,7 +752,7 @@ public final class GlModel extends Model { } local362 = 0; label118: while (true) { - if (local362 >= this.anInt5295) { + if (local362 >= this.vertexCount) { local362 = 0; while (true) { if (local362 >= this.anInt5297) { @@ -822,7 +822,7 @@ public final class GlModel extends Model { return; } @Pc(7) int local7; - for (local7 = 0; local7 < this.anInt5295; local7++) { + for (local7 = 0; local7 < this.vertexCount; local7++) { @Pc(16) int local16 = this.anIntArray466[local7]; this.anIntArray466[local7] = this.anIntArray461[local7]; this.anIntArray461[local7] = -local16; @@ -832,10 +832,10 @@ public final class GlModel extends Model { this.aShortArray85[local7] = this.aShortArray76[local7]; this.aShortArray76[local7] = (short) -local43; } - this.aClass5_1.aBoolean3 = false; - this.aClass127_4.aBoolean235 = false; + this.vertexBuffer.valid = false; + this.bounds.valid = false; if (this.aClass127_2 != null) { - this.aClass127_2.aBoolean235 = false; + this.aClass127_2.valid = false; } } @@ -849,31 +849,31 @@ public final class GlModel extends Model { public final void method4564(@OriginalArg(0) int arg0) { @Pc(3) int local3 = MathUtils.sin[arg0]; @Pc(7) int local7 = MathUtils.cos[arg0]; - for (@Pc(9) int local9 = 0; local9 < this.anInt5295; local9++) { + for (@Pc(9) int local9 = 0; local9 < this.vertexCount; local9++) { @Pc(29) int local29 = this.anIntArray465[local9] * local3 + this.anIntArray461[local9] * local7 >> 16; this.anIntArray465[local9] = this.anIntArray465[local9] * local7 - this.anIntArray461[local9] * local3 >> 16; this.anIntArray461[local9] = local29; } - this.aClass5_1.aBoolean3 = false; - this.aClass127_4.aBoolean235 = false; + this.vertexBuffer.valid = false; + this.bounds.valid = false; } @OriginalMember(owner = "client!td", name = "g", descriptor = "()I") @Override public final int method4561() { - if (!this.aClass5_1.aBoolean3) { + if (!this.vertexBuffer.valid) { this.method4108(); } - return this.aClass5_1.aShort5; + return this.vertexBuffer.aShort5; } @OriginalMember(owner = "client!td", name = "c", descriptor = "()I") @Override public final int method4550() { - if (!this.aClass5_1.aBoolean3) { + if (!this.vertexBuffer.valid) { this.method4108(); } - return this.aClass5_1.aShort7; + return this.vertexBuffer.aShort7; } @OriginalMember(owner = "client!td", name = "a", descriptor = "()Z") @@ -885,22 +885,22 @@ public final class GlModel extends Model { @OriginalMember(owner = "client!td", name = "k", descriptor = "()I") @Override public final int method4576() { - if (!this.aClass5_1.aBoolean3) { + if (!this.vertexBuffer.valid) { this.method4108(); } - return this.aClass5_1.aShort8; + return this.vertexBuffer.aShort8; } @OriginalMember(owner = "client!td", name = "c", descriptor = "(III)V") @Override public final void method4575(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { - for (@Pc(1) int local1 = 0; local1 < this.anInt5295; local1++) { + for (@Pc(1) int local1 = 0; local1 < this.vertexCount; local1++) { this.anIntArray461[local1] += arg0; this.anIntArray465[local1] += arg1; this.anIntArray466[local1] += arg2; } - this.aClass5_1.aBoolean3 = false; - this.aClass127_4.aBoolean235 = false; + this.vertexBuffer.valid = false; + this.bounds.valid = false; } @OriginalMember(owner = "client!td", name = "b", descriptor = "(ZZZ)Lclient!ak;") @@ -916,7 +916,7 @@ public final class GlModel extends Model { if (this.anInt5297 == 0 || local2.anInt5297 == 0) { return; } - @Pc(12) int local12 = local2.anInt5295; + @Pc(12) int local12 = local2.vertexCount; @Pc(15) int[] local15 = local2.anIntArray461; @Pc(18) int[] local18 = local2.anIntArray465; @Pc(21) int[] local21 = local2.anIntArray466; @@ -956,16 +956,16 @@ public final class GlModel extends Model { } @Pc(92) int[] local92 = local2.anIntArray462; @Pc(95) short[] local95 = local2.aShortArray81; - if (!local2.aClass5_1.aBoolean3) { + if (!local2.vertexBuffer.valid) { local2.method4108(); } - @Pc(105) short local105 = local2.aClass5_1.aShort2; - @Pc(109) short local109 = local2.aClass5_1.aShort3; - @Pc(113) short local113 = local2.aClass5_1.aShort6; - @Pc(117) short local117 = local2.aClass5_1.aShort5; - @Pc(121) short local121 = local2.aClass5_1.aShort8; - @Pc(125) short local125 = local2.aClass5_1.aShort7; - for (@Pc(127) int local127 = 0; local127 < this.anInt5295; local127++) { + @Pc(105) short local105 = local2.vertexBuffer.aShort2; + @Pc(109) short local109 = local2.vertexBuffer.aShort3; + @Pc(113) short local113 = local2.vertexBuffer.aShort6; + @Pc(117) short local117 = local2.vertexBuffer.aShort5; + @Pc(121) short local121 = local2.vertexBuffer.aShort8; + @Pc(125) short local125 = local2.vertexBuffer.aShort7; + for (@Pc(127) int local127 = 0; local127 < this.vertexCount; local127++) { @Pc(138) int local138 = this.anIntArray465[local127] - arg2; if (local138 >= local105 && local138 <= local109) { @Pc(152) int local152 = this.anIntArray461[local127] - arg1; @@ -1110,13 +1110,13 @@ public final class GlModel extends Model { public final void method4554(@OriginalArg(0) int arg0) { @Pc(3) int local3 = MathUtils.sin[arg0]; @Pc(7) int local7 = MathUtils.cos[arg0]; - for (@Pc(9) int local9 = 0; local9 < this.anInt5295; local9++) { + for (@Pc(9) int local9 = 0; local9 < this.vertexCount; local9++) { @Pc(29) int local29 = this.anIntArray466[local9] * local3 + this.anIntArray461[local9] * local7 >> 16; this.anIntArray466[local9] = this.anIntArray466[local9] * local7 - this.anIntArray461[local9] * local3 >> 16; this.anIntArray461[local9] = local29; } - this.aClass5_1.aBoolean3 = false; - this.aClass127_4.aBoolean235 = false; + this.vertexBuffer.valid = false; + this.bounds.valid = false; } @OriginalMember(owner = "client!td", name = "a", descriptor = "(I[IIIIZI[I)V") @@ -1297,7 +1297,7 @@ public final class GlModel extends Model { } } if (this.aClass127_2 != null) { - this.aClass127_2.aBoolean235 = false; + this.aClass127_2.valid = false; } } } else { @@ -1510,7 +1510,7 @@ public final class GlModel extends Model { } } if (local228.length > 0) { - this.aClass127_1.aBoolean235 = false; + this.aClass127_1.valid = false; } } } @@ -1544,7 +1544,7 @@ public final class GlModel extends Model { } } if (local228.length > 0) { - this.aClass127_1.aBoolean235 = false; + this.aClass127_1.valid = false; } } } @@ -1554,10 +1554,10 @@ public final class GlModel extends Model { @OriginalMember(owner = "client!td", name = "b", descriptor = "()I") @Override public final int method4549() { - if (!this.aClass5_1.aBoolean3) { + if (!this.vertexBuffer.valid) { this.method4108(); } - return this.aClass5_1.aShort2; + return this.vertexBuffer.aShort2; } @OriginalMember(owner = "client!td", name = "o", descriptor = "()V") @@ -1570,7 +1570,7 @@ public final class GlModel extends Model { if (this.anIntArray464 != null) { local5 = new int[256]; local7 = 0; - for (local9 = 0; local9 < this.anInt5295; local9++) { + for (local9 = 0; local9 < this.vertexCount; local9++) { local20 = this.anIntArray464[local9] & 0xFF; local24 = local5[local20]++; if (local20 > local7) { @@ -1583,7 +1583,7 @@ public final class GlModel extends Model { local5[local9] = 0; } local9 = 0; - while (local9 < this.anInt5295) { + while (local9 < this.vertexCount) { local20 = this.anIntArray464[local9] & 0xFF; this.anIntArrayArray36[local20][local5[local20]++] = local9++; } @@ -1618,7 +1618,7 @@ public final class GlModel extends Model { public final void method4100(@OriginalArg(0) int arg0) { this.aShort28 = (short) arg0; if (this.aClass127_2 != null) { - this.aClass127_2.aBoolean235 = false; + this.aClass127_2.valid = false; } } @@ -1629,7 +1629,7 @@ public final class GlModel extends Model { return; } @Pc(7) int local7; - for (local7 = 0; local7 < this.anInt5295; local7++) { + for (local7 = 0; local7 < this.vertexCount; local7++) { this.anIntArray461[local7] = -this.anIntArray461[local7]; this.anIntArray466[local7] = -this.anIntArray466[local7]; } @@ -1637,23 +1637,23 @@ public final class GlModel extends Model { this.aShortArray76[local7] = (short) -this.aShortArray76[local7]; this.aShortArray85[local7] = (short) -this.aShortArray85[local7]; } - this.aClass5_1.aBoolean3 = false; - this.aClass127_4.aBoolean235 = false; + this.vertexBuffer.valid = false; + this.bounds.valid = false; if (this.aClass127_2 != null) { - this.aClass127_2.aBoolean235 = false; + this.aClass127_2.valid = false; } } @OriginalMember(owner = "client!td", name = "b", descriptor = "(III)V") @Override public final void resize(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { - for (@Pc(1) int local1 = 0; local1 < this.anInt5295; local1++) { + for (@Pc(1) int local1 = 0; local1 < this.vertexCount; local1++) { this.anIntArray461[local1] = this.anIntArray461[local1] * arg0 >> 7; this.anIntArray465[local1] = this.anIntArray465[local1] * arg1 >> 7; this.anIntArray466[local1] = this.anIntArray466[local1] * arg2 >> 7; } - this.aClass5_1.aBoolean3 = false; - this.aClass127_4.aBoolean235 = false; + this.vertexBuffer.valid = false; + this.bounds.valid = false; } @OriginalMember(owner = "client!td", name = "c", descriptor = "(ZZZ)Lclient!ak;") @@ -1665,12 +1665,12 @@ public final class GlModel extends Model { @OriginalMember(owner = "client!td", name = "e", descriptor = "()V") @Override public final void method4552() { - for (@Pc(1) int local1 = 0; local1 < this.anInt5295; local1++) { + for (@Pc(1) int local1 = 0; local1 < this.vertexCount; local1++) { this.anIntArray461[local1] = -this.anIntArray461[local1]; this.anIntArray466[local1] = -this.anIntArray466[local1]; } - this.aClass5_1.aBoolean3 = false; - this.aClass127_4.aBoolean235 = false; + this.vertexBuffer.valid = false; + this.bounds.valid = false; } @OriginalMember(owner = "client!td", name = "q", descriptor = "()V") @@ -1698,7 +1698,7 @@ public final class GlModel extends Model { @Pc(115) ByteBuffer local115 = ByteBuffer.allocateDirect(Static237.aClass3_Sub15_8.offset); local115.put(Static237.aClass3_Sub15_8.data, 0, Static237.aClass3_Sub15_8.offset); local115.flip(); - this.aClass127_5.aBoolean235 = true; + this.aClass127_5.valid = true; this.aClass127_5.aByteBuffer8 = local115; this.aClass127_5.aClass155_4 = null; return; @@ -1706,7 +1706,7 @@ public final class GlModel extends Model { @Pc(88) GlVertexBufferObject local88 = new GlVertexBufferObject(); @Pc(95) ByteBuffer local95 = ByteBuffer.wrap(Static237.aClass3_Sub15_8.data, 0, Static237.aClass3_Sub15_8.offset); local88.method4519(local95); - this.aClass127_5.aBoolean235 = true; + this.aClass127_5.valid = true; this.aClass127_5.aByteBuffer8 = null; this.aClass127_5.aClass155_4 = local88; } @@ -1714,7 +1714,7 @@ public final class GlModel extends Model { @OriginalMember(owner = "client!td", name = "f", descriptor = "(I)V") public final void method4105(@OriginalArg(0) int arg0) { this.aShort29 = (short) arg0; - this.aClass127_1.aBoolean235 = false; + this.aClass127_1.valid = false; } @OriginalMember(owner = "client!td", name = "d", descriptor = "()Z") @@ -1723,7 +1723,7 @@ public final class GlModel extends Model { if (this.anIntArrayArray36 == null) { return false; } - for (@Pc(6) int local6 = 0; local6 < this.anInt5295; local6++) { + for (@Pc(6) int local6 = 0; local6 < this.vertexCount; local6++) { this.anIntArray461[local6] <<= 0x4; this.anIntArray465[local6] <<= 0x4; this.anIntArray466[local6] <<= 0x4; @@ -1755,7 +1755,7 @@ public final class GlModel extends Model { local43 = Rasteriser.textureProvider.method3229(arg1 & 0xFFFF); } if (local1 != local41 || local22 != local43) { - this.aClass127_1.aBoolean235 = false; + this.aClass127_1.valid = false; } } @@ -1769,7 +1769,7 @@ public final class GlModel extends Model { @Pc(11) int local11 = -32768; @Pc(13) int local13 = 0; @Pc(15) int local15 = 0; - for (@Pc(17) int local17 = 0; local17 < this.anInt5295; local17++) { + for (@Pc(17) int local17 = 0; local17 < this.vertexCount; local17++) { @Pc(26) int local26 = this.anIntArray461[local17]; @Pc(31) int local31 = this.anIntArray465[local17]; @Pc(36) int local36 = this.anIntArray466[local17]; @@ -1800,15 +1800,15 @@ public final class GlModel extends Model { local15 = local74; } } - this.aClass5_1.aShort6 = (short) local1; - this.aClass5_1.aShort5 = (short) local7; - this.aClass5_1.aShort2 = (short) local3; - this.aClass5_1.aShort3 = (short) local9; - this.aClass5_1.aShort8 = (short) local5; - this.aClass5_1.aShort7 = (short) local11; - this.aClass5_1.aShort4 = (short) (Math.sqrt((double) local13) + 0.99D); + this.vertexBuffer.aShort6 = (short) local1; + this.vertexBuffer.aShort5 = (short) local7; + this.vertexBuffer.aShort2 = (short) local3; + this.vertexBuffer.aShort3 = (short) local9; + this.vertexBuffer.aShort8 = (short) local5; + this.vertexBuffer.aShort7 = (short) local11; + this.vertexBuffer.aShort4 = (short) (Math.sqrt((double) local13) + 0.99D); Math.sqrt((double) local15); - this.aClass5_1.aBoolean3 = true; + this.vertexBuffer.valid = true; } @OriginalMember(owner = "client!td", name = "b", descriptor = "(SS)V") @@ -1818,18 +1818,18 @@ public final class GlModel extends Model { this.aShortArray75[local1] = arg1; } } - this.aClass127_1.aBoolean235 = false; + this.aClass127_1.valid = false; } @OriginalMember(owner = "client!td", name = "a", descriptor = "(IILclient!td;[[I[[IIII)V") public final void method4110(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) GlModel arg2, @OriginalArg(3) int[][] arg3, @OriginalArg(4) int[][] arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7) { - if (!arg2.aClass5_1.aBoolean3) { + if (!arg2.vertexBuffer.valid) { arg2.method4108(); } - @Pc(11) int local11 = arg5 + arg2.aClass5_1.aShort6; - @Pc(17) int local17 = arg5 + arg2.aClass5_1.aShort5; - @Pc(23) int local23 = arg7 + arg2.aClass5_1.aShort8; - @Pc(29) int local29 = arg7 + arg2.aClass5_1.aShort7; + @Pc(11) int local11 = arg5 + arg2.vertexBuffer.aShort6; + @Pc(17) int local17 = arg5 + arg2.vertexBuffer.aShort5; + @Pc(23) int local23 = arg7 + arg2.vertexBuffer.aShort8; + @Pc(29) int local29 = arg7 + arg2.vertexBuffer.aShort7; if ((arg0 == 1 || arg0 == 2 || arg0 == 3 || arg0 == 5) && (local11 < 0 || local17 + 128 >> 7 >= arg3.length || local23 < 0 || local29 + 128 >> 7 >= arg3[0].length)) { return; } @@ -1860,7 +1860,7 @@ public final class GlModel extends Model { @Pc(232) int local232; @Pc(244) int local244; if (arg0 == 1) { - for (local150 = 0; local150 < this.anInt5295; local150++) { + for (local150 = 0; local150 < this.vertexCount; local150++) { local161 = this.anIntArray461[local150] + arg5; local168 = this.anIntArray466[local150] + arg7; local172 = local161 & 0x7F; @@ -1876,8 +1876,8 @@ public final class GlModel extends Model { @Pc(362) int local362; @Pc(374) int local374; if (arg0 == 2) { - @Pc(266) short local266 = arg2.aClass5_1.aShort2; - for (local161 = 0; local161 < this.anInt5295; local161++) { + @Pc(266) short local266 = arg2.vertexBuffer.aShort2; + for (local161 = 0; local161 < this.vertexCount; local161++) { local168 = (this.anIntArray465[local161] << 16) / local266; if (local168 < arg1) { local172 = this.anIntArray461[local161] + arg5; @@ -1897,8 +1897,8 @@ public final class GlModel extends Model { local161 = (arg1 >> 8 & 0xFF) * 4; this.method4573(arg3, arg5, arg6, arg7, local150, local161); } else if (arg0 == 4) { - local150 = arg2.aClass5_1.aShort3 - arg2.aClass5_1.aShort2; - for (local161 = 0; local161 < this.anInt5295; local161++) { + local150 = arg2.vertexBuffer.aShort3 - arg2.vertexBuffer.aShort2; + for (local161 = 0; local161 < this.vertexCount; local161++) { local168 = this.anIntArray461[local161] + arg5; local172 = this.anIntArray466[local161] + arg7; local176 = local168 & 0x7F; @@ -1911,8 +1911,8 @@ public final class GlModel extends Model { this.anIntArray465[local161] = this.anIntArray465[local161] + local362 + local150 - arg6; } } else if (arg0 == 5) { - local150 = arg2.aClass5_1.aShort3 - arg2.aClass5_1.aShort2; - for (local161 = 0; local161 < this.anInt5295; local161++) { + local150 = arg2.vertexBuffer.aShort3 - arg2.vertexBuffer.aShort2; + for (local161 = 0; local161 < this.vertexCount; local161++) { local168 = this.anIntArray461[local161] + arg5; local172 = this.anIntArray466[local161] + arg7; local176 = local168 & 0x7F; @@ -1930,8 +1930,8 @@ public final class GlModel extends Model { } } } - this.aClass127_4.aBoolean235 = false; - this.aClass5_1.aBoolean3 = false; + this.bounds.valid = false; + this.vertexBuffer.valid = false; } @OriginalMember(owner = "client!td", name = "a", descriptor = "(ZZZZZZZ)V") @@ -1940,15 +1940,15 @@ 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 && !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) { + @Pc(26) boolean local26 = !this.aClass127_1.valid && (arg1 || arg2 && !Preferences.highDetailLighting); + this.method4113(false, !this.bounds.valid && arg0, local26, this.aClass127_2 != null && !this.aClass127_2.valid && arg2, !this.aClass127_3.valid); + if (!this.aClass127_5.valid && arg3 && arg1) { this.method4103(); } } if (arg0) { - if (this.aClass127_4.aBoolean235) { - if (!this.aClass5_1.aBoolean3) { + if (this.bounds.valid) { + if (!this.vertexBuffer.valid) { this.method4108(); } this.anIntArray461 = null; @@ -1961,7 +1961,7 @@ public final class GlModel extends Model { } } if (arg1) { - if (this.aClass127_1.aBoolean235) { + if (this.aClass127_1.valid) { this.aShortArray75 = null; this.aByteArray71 = null; } else { @@ -1969,7 +1969,7 @@ public final class GlModel extends Model { } } if (arg2 && Preferences.highDetailLighting) { - if (this.aClass127_2.aBoolean235) { + if (this.aClass127_2.valid) { this.aShortArray76 = null; this.aShortArray79 = null; this.aShortArray85 = null; @@ -1978,14 +1978,14 @@ public final class GlModel extends Model { this.aByte19 = (byte) (this.aByte19 | 0x4); } } - if (this.aClass127_3.aBoolean235) { + if (this.aClass127_3.valid) { this.aFloatArray25 = null; this.aFloatArray26 = null; } else { this.aByte19 = (byte) (this.aByte19 | 0x8); } if (arg3 && arg1) { - if (this.aClass127_5.aBoolean235 && this.aClass127_1.aBoolean235) { + if (this.aClass127_5.valid && this.aClass127_1.valid) { this.aShortArray77 = null; this.aShortArray82 = null; this.aShortArray83 = null; @@ -2006,7 +2006,7 @@ public final class GlModel extends Model { private void method4113(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) boolean arg4) { @Pc(1) int local1 = 0; if (arg1) { - this.aClass127_4.anInt4777 = 0; + this.bounds.anInt4777 = 0; local1 += 12; } if (arg2) { @@ -2039,7 +2039,7 @@ public final class GlModel extends Model { if (arg1) { @Pc(109) int local109; if (GlRenderer.bigEndian) { - for (local60 = 0; local60 < this.anInt5295; local60++) { + for (local60 = 0; local60 < this.vertexCount; local60++) { local71 = Float.floatToRawIntBits((float) this.anIntArray461[local60]); local78 = Float.floatToRawIntBits((float) this.anIntArray465[local60]); local85 = Float.floatToRawIntBits((float) this.anIntArray466[local60]); @@ -2057,7 +2057,7 @@ public final class GlModel extends Model { } } } else { - for (local60 = 0; local60 < this.anInt5295; local60++) { + for (local60 = 0; local60 < this.vertexCount; local60++) { local71 = Float.floatToRawIntBits((float) this.anIntArray461[local60]); local78 = Float.floatToRawIntBits((float) this.anIntArray465[local60]); local85 = Float.floatToRawIntBits((float) this.anIntArray466[local60]); @@ -2230,25 +2230,25 @@ public final class GlModel extends Model { this.aClass155_5.method4515(local1007); } if (arg1) { - this.aClass127_4.aBoolean235 = true; - this.aClass127_4.aByteBuffer8 = null; - this.aClass127_4.aClass155_4 = this.aClass155_5; - this.aClass127_4.anInt4782 = local1; + this.bounds.valid = true; + this.bounds.aByteBuffer8 = null; + this.bounds.aClass155_4 = this.aClass155_5; + this.bounds.anInt4782 = local1; } if (arg2) { - this.aClass127_1.aBoolean235 = true; + this.aClass127_1.valid = true; this.aClass127_1.aByteBuffer8 = null; this.aClass127_1.aClass155_4 = this.aClass155_5; this.aClass127_1.anInt4782 = local1; } if (arg3) { - this.aClass127_2.aBoolean235 = true; + this.aClass127_2.valid = true; this.aClass127_2.aByteBuffer8 = null; this.aClass127_2.aClass155_4 = this.aClass155_5; this.aClass127_2.anInt4782 = local1; } if (arg4) { - this.aClass127_3.aBoolean235 = true; + this.aClass127_3.valid = true; this.aClass127_3.aByteBuffer8 = null; this.aClass127_3.aClass155_4 = this.aClass155_5; this.aClass127_3.anInt4782 = local1; @@ -2262,25 +2262,25 @@ public final class GlModel extends Model { Static237.aByteBuffer9.put(Static237.aClass3_Sub15_8.data, 0, Static237.aClass3_Sub15_8.offset); Static237.aByteBuffer9.flip(); if (arg1) { - this.aClass127_4.aBoolean235 = true; - this.aClass127_4.aByteBuffer8 = Static237.aByteBuffer9; - this.aClass127_4.aClass155_4 = null; - this.aClass127_4.anInt4782 = local1; + this.bounds.valid = true; + this.bounds.aByteBuffer8 = Static237.aByteBuffer9; + this.bounds.aClass155_4 = null; + this.bounds.anInt4782 = local1; } if (arg2) { - this.aClass127_1.aBoolean235 = true; + this.aClass127_1.valid = true; this.aClass127_1.aByteBuffer8 = Static237.aByteBuffer9; - this.aClass127_4.aClass155_4 = null; + this.bounds.aClass155_4 = null; this.aClass127_1.anInt4782 = local1; } if (arg3) { - this.aClass127_2.aBoolean235 = true; + this.aClass127_2.valid = true; this.aClass127_2.aByteBuffer8 = Static237.aByteBuffer9; this.aClass127_2.aClass155_4 = null; this.aClass127_2.anInt4782 = local1; } if (arg4) { - this.aClass127_3.aBoolean235 = true; + this.aClass127_3.valid = true; this.aClass127_3.aByteBuffer8 = Static237.aByteBuffer9; this.aClass127_3.aClass155_4 = null; this.aClass127_3.anInt4782 = local1; @@ -2291,25 +2291,25 @@ public final class GlModel extends Model { @Pc(1218) ByteBuffer local1218 = ByteBuffer.wrap(Static237.aClass3_Sub15_8.data, 0, Static237.aClass3_Sub15_8.offset); local1211.method4519(local1218); if (arg1) { - this.aClass127_4.aBoolean235 = true; - this.aClass127_4.aByteBuffer8 = null; - this.aClass127_4.aClass155_4 = local1211; - this.aClass127_4.anInt4782 = local1; + this.bounds.valid = true; + this.bounds.aByteBuffer8 = null; + this.bounds.aClass155_4 = local1211; + this.bounds.anInt4782 = local1; } if (arg2) { - this.aClass127_1.aBoolean235 = true; + this.aClass127_1.valid = true; this.aClass127_1.aByteBuffer8 = null; this.aClass127_1.aClass155_4 = local1211; this.aClass127_1.anInt4782 = local1; } if (arg3) { - this.aClass127_2.aBoolean235 = true; + this.aClass127_2.valid = true; this.aClass127_2.aByteBuffer8 = null; this.aClass127_2.aClass155_4 = local1211; this.aClass127_2.anInt4782 = local1; } if (arg4) { - this.aClass127_3.aBoolean235 = true; + this.aClass127_3.valid = true; this.aClass127_3.aByteBuffer8 = null; this.aClass127_3.aClass155_4 = local1211; this.aClass127_3.anInt4782 = local1; @@ -2319,25 +2319,25 @@ public final class GlModel extends Model { local1007.put(Static237.aClass3_Sub15_8.data, 0, Static237.aClass3_Sub15_8.offset); local1007.flip(); if (arg1) { - this.aClass127_4.aBoolean235 = true; - this.aClass127_4.aByteBuffer8 = local1007; - this.aClass127_4.aClass155_4 = null; - this.aClass127_4.anInt4782 = local1; + this.bounds.valid = true; + this.bounds.aByteBuffer8 = local1007; + this.bounds.aClass155_4 = null; + this.bounds.anInt4782 = local1; } if (arg2) { - this.aClass127_1.aBoolean235 = true; + this.aClass127_1.valid = true; this.aClass127_1.aByteBuffer8 = local1007; - this.aClass127_4.aClass155_4 = null; + this.bounds.aClass155_4 = null; this.aClass127_1.anInt4782 = local1; } if (arg3) { - this.aClass127_2.aBoolean235 = true; + this.aClass127_2.valid = true; this.aClass127_2.aByteBuffer8 = local1007; this.aClass127_2.aClass155_4 = null; this.aClass127_2.anInt4782 = local1; } if (arg4) { - this.aClass127_3.aBoolean235 = true; + this.aClass127_3.valid = true; this.aClass127_3.aByteBuffer8 = local1007; this.aClass127_3.aClass155_4 = null; this.aClass127_3.anInt4782 = local1; @@ -2347,31 +2347,31 @@ public final class GlModel extends Model { @OriginalMember(owner = "client!td", name = "a", descriptor = "(ZZZLclient!td;Lclient!td;)Lclient!ak;") private Model method4114(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) GlModel arg3, @OriginalArg(4) GlModel arg4) { - arg3.anInt5295 = this.anInt5295; + arg3.vertexCount = this.vertexCount; arg3.anInt5296 = this.anInt5296; arg3.anInt5297 = this.anInt5297; arg3.aShort29 = this.aShort29; arg3.aShort28 = this.aShort28; arg3.aByte18 = (byte) ((arg0 && arg1 ? 0 : 2) | 0x1 | (arg2 ? 0 : 4)); - if (arg3.anIntArray461 == null || arg3.anIntArray461.length < this.anInt5295) { - arg3.anIntArray461 = new int[this.anInt5295 + 100]; - arg3.anIntArray465 = new int[this.anInt5295 + 100]; - arg3.anIntArray466 = new int[this.anInt5295 + 100]; + if (arg3.anIntArray461 == null || arg3.anIntArray461.length < this.vertexCount) { + arg3.anIntArray461 = new int[this.vertexCount + 100]; + arg3.anIntArray465 = new int[this.vertexCount + 100]; + arg3.anIntArray466 = new int[this.vertexCount + 100]; } @Pc(69) int local69; - for (local69 = 0; local69 < this.anInt5295; local69++) { + for (local69 = 0; local69 < this.vertexCount; local69++) { arg3.anIntArray461[local69] = this.anIntArray461[local69]; arg3.anIntArray465[local69] = this.anIntArray465[local69]; arg3.anIntArray466[local69] = this.anIntArray466[local69]; } - if (arg3.aClass127_4 == null) { - arg3.aClass127_4 = new GlBuffer(); + if (arg3.bounds == null) { + arg3.bounds = new GlBuffer(); } - arg3.aClass127_4.aBoolean235 = false; - if (arg3.aClass5_1 == null) { - arg3.aClass5_1 = new Class5(); + arg3.bounds.valid = false; + if (arg3.vertexBuffer == null) { + arg3.vertexBuffer = new Class5(); } - arg3.aClass5_1.aBoolean3 = false; + arg3.vertexBuffer.valid = false; if (arg0) { arg3.aByteArray71 = this.aByteArray71; } else { @@ -2401,7 +2401,7 @@ public final class GlModel extends Model { arg4.aClass127_1 = new GlBuffer(); } arg3.aClass127_1 = arg4.aClass127_1; - arg3.aClass127_1.aBoolean235 = false; + arg3.aClass127_1.valid = false; } if (arg2 || this.aShortArray76 == null) { arg3.aShortArray76 = this.aShortArray76; @@ -2431,7 +2431,7 @@ public final class GlModel extends Model { arg4.aClass127_2 = new GlBuffer(); } arg3.aClass127_2 = arg4.aClass127_2; - arg3.aClass127_2.aBoolean235 = false; + arg3.aClass127_2.valid = false; } else { arg3.aClass127_2 = null; } @@ -2483,7 +2483,7 @@ public final class GlModel extends Model { return; } @Pc(7) int local7; - for (local7 = 0; local7 < this.anInt5295; local7++) { + for (local7 = 0; local7 < this.vertexCount; local7++) { @Pc(16) int local16 = this.anIntArray461[local7]; this.anIntArray461[local7] = this.anIntArray466[local7]; this.anIntArray466[local7] = -local16; @@ -2493,17 +2493,17 @@ public final class GlModel extends Model { this.aShortArray76[local7] = this.aShortArray85[local7]; this.aShortArray85[local7] = (short) -local43; } - this.aClass5_1.aBoolean3 = false; - this.aClass127_4.aBoolean235 = false; + this.vertexBuffer.valid = false; + this.bounds.valid = false; if (this.aClass127_2 != null) { - this.aClass127_2.aBoolean235 = false; + this.aClass127_2.valid = false; } } @OriginalMember(owner = "client!td", name = "a", descriptor = "(ZZZZZZZZZZZ)Lclient!td;") public final GlModel method4117(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2, @OriginalArg(4) boolean arg3, @OriginalArg(5) boolean arg4, @OriginalArg(6) boolean arg5, @OriginalArg(7) boolean arg6, @OriginalArg(9) boolean arg7, @OriginalArg(10) boolean arg8) { @Pc(3) GlModel local3 = new GlModel(); - local3.anInt5295 = this.anInt5295; + local3.vertexCount = this.vertexCount; local3.anInt5296 = this.anInt5296; local3.anInt5297 = this.anInt5297; if (arg0) { @@ -2519,11 +2519,11 @@ public final class GlModel extends Model { local3.anIntArray465 = Static115.method2308(this.anIntArray465); } if (arg0 && arg1) { - local3.aClass127_4 = this.aClass127_4; - local3.aClass5_1 = this.aClass5_1; + local3.bounds = this.bounds; + local3.vertexBuffer = this.vertexBuffer; } else { - local3.aClass127_4 = new GlBuffer(); - local3.aClass5_1 = new Class5(); + local3.bounds = new GlBuffer(); + local3.vertexBuffer = new Class5(); } if (arg2) { local3.aShortArray75 = this.aShortArray75; @@ -2590,13 +2590,13 @@ public final class GlModel extends Model { @OriginalMember(owner = "client!td", name = "i", descriptor = "()V") @Override public final void method4563() { - for (@Pc(1) int local1 = 0; local1 < this.anInt5295; local1++) { + for (@Pc(1) int local1 = 0; local1 < this.vertexCount; local1++) { @Pc(10) int local10 = this.anIntArray461[local1]; this.anIntArray461[local1] = this.anIntArray466[local1]; this.anIntArray466[local1] = -local10; } - this.aClass5_1.aBoolean3 = false; - this.aClass127_4.aBoolean235 = false; + this.vertexBuffer.valid = false; + this.bounds.valid = false; } @OriginalMember(owner = "client!td", name = "a", descriptor = "(IIIIIIII)Z") @@ -2615,10 +2615,10 @@ public final class GlModel extends Model { @OriginalMember(owner = "client!td", name = "j", descriptor = "()I") @Override public final int method4566() { - if (!this.aClass5_1.aBoolean3) { + if (!this.vertexBuffer.valid) { this.method4108(); } - return this.aClass5_1.aShort4; + return this.vertexBuffer.aShort4; } @OriginalMember(owner = "client!td", name = "a", descriptor = "(I[IIIIZ)V") @@ -2767,7 +2767,7 @@ public final class GlModel extends Model { } } if (this.aClass127_2 != null) { - this.aClass127_2.aBoolean235 = false; + this.aClass127_2.valid = false; } } } else if (arg0 == 3) { @@ -2806,7 +2806,7 @@ public final class GlModel extends Model { this.aByteArray71[local45] = (byte) local53; } if (local141.length > 0) { - this.aClass127_1.aBoolean235 = false; + this.aClass127_1.valid = false; } } } @@ -2838,7 +2838,7 @@ public final class GlModel extends Model { this.aShortArray75[local45] = (short) (local932 << 10 | local264 << 7 | local484); } if (local141.length > 0) { - this.aClass127_1.aBoolean235 = false; + this.aClass127_1.valid = false; } } } @@ -2855,7 +2855,7 @@ public final class GlModel extends Model { Static237.anInt5298 = 0; Static237.anInt5300 = 0; Static237.anInt5299 = 0; - for (local11 = 0; local11 < this.anInt5295; local11++) { + for (local11 = 0; local11 < this.vertexCount; local11++) { Static237.anInt5298 += this.anIntArray461[local11]; Static237.anInt5300 += this.anIntArray465[local11]; Static237.anInt5299 += this.anIntArray466[local11]; @@ -2871,7 +2871,7 @@ public final class GlModel extends Model { Static237.anInt5299 = arg3; } } else if (arg0 == 1) { - for (local3 = 0; local3 < this.anInt5295; local3++) { + for (local3 = 0; local3 < this.vertexCount; local3++) { this.anIntArray461[local3] += arg1; this.anIntArray465[local3] += arg2; this.anIntArray466[local3] += arg3; @@ -2880,7 +2880,7 @@ public final class GlModel extends Model { @Pc(146) int local146; @Pc(164) int local164; if (arg0 == 2) { - for (local3 = 0; local3 < this.anInt5295; local3++) { + for (local3 = 0; local3 < this.vertexCount; local3++) { this.anIntArray461[local3] -= Static237.anInt5298; this.anIntArray465[local3] -= Static237.anInt5300; this.anIntArray466[local3] -= Static237.anInt5299; @@ -2910,7 +2910,7 @@ public final class GlModel extends Model { this.anIntArray466[local3] += Static237.anInt5299; } } else if (arg0 == 3) { - for (local3 = 0; local3 < this.anInt5295; local3++) { + for (local3 = 0; local3 < this.vertexCount; local3++) { this.anIntArray461[local3] -= Static237.anInt5298; this.anIntArray465[local3] -= Static237.anInt5300; this.anIntArray466[local3] -= Static237.anInt5299; @@ -2931,7 +2931,7 @@ public final class GlModel extends Model { } this.aByteArray71[local3] = (byte) local11; } - this.aClass127_1.aBoolean235 = false; + this.aClass127_1.valid = false; } else if (arg0 == 7) { for (local3 = 0; local3 < this.anInt5297; local3++) { local11 = this.aShortArray75[local3] & 0xFFFF; @@ -2953,7 +2953,7 @@ public final class GlModel extends Model { } this.aShortArray75[local3] = (short) (local502 << 10 | local164 << 7 | local496); } - this.aClass127_1.aBoolean235 = false; + this.aClass127_1.valid = false; } } } @@ -2961,10 +2961,10 @@ public final class GlModel extends Model { @OriginalMember(owner = "client!td", name = "h", descriptor = "()I") @Override public final int method4562() { - if (!this.aClass5_1.aBoolean3) { + if (!this.vertexBuffer.valid) { this.method4108(); } - return this.aClass5_1.aShort6; + return this.vertexBuffer.aShort6; } @OriginalMember(owner = "client!td", name = "w", descriptor = "()V") @@ -2974,10 +2974,10 @@ public final class GlModel extends Model { return; } if (this.aByte18 != 0) { - this.method4113(true, !this.aClass127_4.aBoolean235 && (this.aByte18 & 0x1) != 0, !this.aClass127_1.aBoolean235 && (this.aByte18 & 0x2) != 0, this.aClass127_2 != null && !this.aClass127_2.aBoolean235 && (this.aByte18 & 0x4) != 0, false); + this.method4113(true, !this.bounds.valid && (this.aByte18 & 0x1) != 0, !this.aClass127_1.valid && (this.aByte18 & 0x2) != 0, this.aClass127_2 != null && !this.aClass127_2.valid && (this.aByte18 & 0x4) != 0, false); } - this.method4113(false, !this.aClass127_4.aBoolean235, !this.aClass127_1.aBoolean235, this.aClass127_2 != null && !this.aClass127_2.aBoolean235, !this.aClass127_3.aBoolean235); - if (!this.aClass127_5.aBoolean235) { + this.method4113(false, !this.bounds.valid, !this.aClass127_1.valid, this.aClass127_2 != null && !this.aClass127_2.valid, !this.aClass127_3.valid); + if (!this.aClass127_5.valid) { this.method4103(); } if (this.aByte19 != 0) { @@ -3010,10 +3010,10 @@ public final class GlModel extends Model { this.aByte19 = 0; } @Pc(172) GlVertexBufferObject local172 = null; - if (this.aClass127_4.aClass155_4 != null) { - this.aClass127_4.aClass155_4.method4516(); - local172 = this.aClass127_4.aClass155_4; - local1.glVertexPointer(3, GL2.GL_FLOAT, this.aClass127_4.anInt4782, (long) this.aClass127_4.anInt4777); + if (this.bounds.aClass155_4 != null) { + this.bounds.aClass155_4.method4516(); + local172 = this.bounds.aClass155_4; + local1.glVertexPointer(3, GL2.GL_FLOAT, this.bounds.anInt4782, (long) this.bounds.anInt4777); } if (this.aClass127_1.aClass155_4 != null) { if (local172 != this.aClass127_1.aClass155_4) { @@ -3039,13 +3039,13 @@ 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 || Preferences.highDetailLighting && this.aClass127_2.aClass155_4 == null || this.aClass127_3.aClass155_4 == null) { + if (this.bounds.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); } - if (this.aClass127_4.aClass155_4 == null) { - this.aClass127_4.aByteBuffer8.position(this.aClass127_4.anInt4777); - local1.glVertexPointer(3, GL2.GL_FLOAT, this.aClass127_4.anInt4782, this.aClass127_4.aByteBuffer8); + if (this.bounds.aClass155_4 == null) { + this.bounds.aByteBuffer8.position(this.bounds.anInt4777); + local1.glVertexPointer(3, GL2.GL_FLOAT, this.bounds.anInt4782, this.bounds.aByteBuffer8); } if (this.aClass127_1.aClass155_4 == null) { this.aClass127_1.aByteBuffer8.position(this.aClass127_1.anInt4777); @@ -3086,19 +3086,19 @@ public final class GlModel extends Model { @OriginalMember(owner = "client!td", name = "f", descriptor = "()V") @Override protected final void method4557() { - for (@Pc(1) int local1 = 0; local1 < this.anInt5295; local1++) { + for (@Pc(1) int local1 = 0; local1 < this.vertexCount; local1++) { this.anIntArray461[local1] = this.anIntArray461[local1] + 7 >> 4; this.anIntArray465[local1] = this.anIntArray465[local1] + 7 >> 4; this.anIntArray466[local1] = this.anIntArray466[local1] + 7 >> 4; } - this.aClass5_1.aBoolean3 = false; - this.aClass127_4.aBoolean235 = false; + this.vertexBuffer.valid = false; + this.bounds.valid = false; } @OriginalMember(owner = "client!td", name = "x", descriptor = "()V") public final void method4122() { @Pc(1) int local1; - for (local1 = 0; local1 < this.anInt5295; local1++) { + for (local1 = 0; local1 < this.vertexCount; local1++) { this.anIntArray466[local1] = -this.anIntArray466[local1]; } if (this.aShortArray85 != null) { @@ -3111,12 +3111,12 @@ public final class GlModel extends Model { this.aShortArray77[local1] = this.aShortArray83[local1]; this.aShortArray83[local1] = local48; } - this.aClass5_1.aBoolean3 = false; - this.aClass127_4.aBoolean235 = false; + this.vertexBuffer.valid = false; + this.bounds.valid = false; if (this.aClass127_2 != null) { - this.aClass127_2.aBoolean235 = false; + this.aClass127_2.valid = false; } - this.aClass127_5.aBoolean235 = false; + this.aClass127_5.valid = false; } @OriginalMember(owner = "client!td", name = "d", descriptor = "(I)V") @@ -3124,13 +3124,13 @@ public final class GlModel extends Model { public final void method4574(@OriginalArg(0) int arg0) { @Pc(3) int local3 = MathUtils.sin[arg0]; @Pc(7) int local7 = MathUtils.cos[arg0]; - for (@Pc(9) int local9 = 0; local9 < this.anInt5295; local9++) { + for (@Pc(9) int local9 = 0; local9 < this.vertexCount; local9++) { @Pc(29) int local29 = this.anIntArray465[local9] * local7 - this.anIntArray466[local9] * local3 >> 16; this.anIntArray466[local9] = this.anIntArray465[local9] * local3 + this.anIntArray466[local9] * local7 >> 16; this.anIntArray465[local9] = local29; } - this.aClass5_1.aBoolean3 = false; - this.aClass127_4.aBoolean235 = false; + this.vertexBuffer.valid = false; + this.bounds.valid = false; } @OriginalMember(owner = "client!td", name = "g", descriptor = "(I)V") @@ -3143,7 +3143,7 @@ public final class GlModel extends Model { @Pc(14) int local14 = MathUtils.cos[256]; @Pc(16) int local16; @Pc(36) int local36; - for (local16 = 0; local16 < this.anInt5295; local16++) { + for (local16 = 0; local16 < this.vertexCount; local16++) { local36 = this.anIntArray466[local16] * local10 + this.anIntArray461[local16] * local14 >> 16; this.anIntArray466[local16] = this.anIntArray466[local16] * local14 - this.anIntArray461[local16] * local10 >> 16; this.anIntArray461[local16] = local36; @@ -3153,10 +3153,10 @@ public final class GlModel extends Model { this.aShortArray85[local16] = (short) (this.aShortArray85[local16] * local14 - this.aShortArray76[local16] * local10 >> 16); this.aShortArray76[local16] = (short) local36; } - this.aClass5_1.aBoolean3 = false; - this.aClass127_4.aBoolean235 = false; + this.vertexBuffer.valid = false; + this.bounds.valid = false; if (this.aClass127_2 != null) { - this.aClass127_2.aBoolean235 = false; + this.aClass127_2.valid = false; } } @@ -3165,26 +3165,26 @@ public final class GlModel extends Model { if (this.anInt5296 == 0) { return null; } - if (!this.aClass5_1.aBoolean3) { + if (!this.vertexBuffer.valid) { this.method4108(); } @Pc(26) int local26; @Pc(40) int local40; if (Static161.anInt3920 > 0) { - local26 = this.aClass5_1.aShort6 - (this.aClass5_1.aShort3 * Static161.anInt3920 >> 8) >> 3; - local40 = this.aClass5_1.aShort5 - (this.aClass5_1.aShort2 * Static161.anInt3920 >> 8) >> 3; + local26 = this.vertexBuffer.aShort6 - (this.vertexBuffer.aShort3 * Static161.anInt3920 >> 8) >> 3; + local40 = this.vertexBuffer.aShort5 - (this.vertexBuffer.aShort2 * Static161.anInt3920 >> 8) >> 3; } else { - local26 = this.aClass5_1.aShort6 - (this.aClass5_1.aShort2 * Static161.anInt3920 >> 8) >> 3; - local40 = this.aClass5_1.aShort5 - (this.aClass5_1.aShort3 * Static161.anInt3920 >> 8) >> 3; + local26 = this.vertexBuffer.aShort6 - (this.vertexBuffer.aShort2 * Static161.anInt3920 >> 8) >> 3; + local40 = this.vertexBuffer.aShort5 - (this.vertexBuffer.aShort3 * Static161.anInt3920 >> 8) >> 3; } @Pc(85) int local85; @Pc(99) int local99; if (Static161.anInt3921 > 0) { - local85 = this.aClass5_1.aShort8 - (this.aClass5_1.aShort3 * Static161.anInt3921 >> 8) >> 3; - local99 = this.aClass5_1.aShort7 - (this.aClass5_1.aShort2 * Static161.anInt3921 >> 8) >> 3; + local85 = this.vertexBuffer.aShort8 - (this.vertexBuffer.aShort3 * Static161.anInt3921 >> 8) >> 3; + local99 = this.vertexBuffer.aShort7 - (this.vertexBuffer.aShort2 * Static161.anInt3921 >> 8) >> 3; } else { - local85 = this.aClass5_1.aShort8 - (this.aClass5_1.aShort2 * Static161.anInt3921 >> 8) >> 3; - local99 = this.aClass5_1.aShort7 - (this.aClass5_1.aShort3 * Static161.anInt3921 >> 8) >> 3; + local85 = this.vertexBuffer.aShort8 - (this.vertexBuffer.aShort2 * Static161.anInt3921 >> 8) >> 3; + local99 = this.vertexBuffer.aShort7 - (this.vertexBuffer.aShort3 * Static161.anInt3921 >> 8) >> 3; } @Pc(134) int local134 = local40 + 1 - local26; @Pc(140) int local140 = local99 + 1 - local85; @@ -3207,7 +3207,7 @@ public final class GlModel extends Model { @Pc(246) int local246; @Pc(248) int local248; @Pc(258) int local258; - for (local194 = 0; local194 < this.anInt5295; local194++) { + for (local194 = 0; local194 < this.vertexCount; local194++) { @Pc(216) int local216 = (this.anIntArray461[local194] - (this.anIntArray465[local194] * Static161.anInt3920 >> 8) >> 3) - local26; @Pc(234) int local234 = (this.anIntArray466[local194] - (this.anIntArray465[local194] * Static161.anInt3921 >> 8) >> 3) - local85; @Pc(239) int local239 = this.anIntArray462[local194]; @@ -3243,12 +3243,12 @@ public final class GlModel extends Model { @OriginalMember(owner = "client!td", name = "l", descriptor = "()V") @Override public final void method4578() { - for (@Pc(1) int local1 = 0; local1 < this.anInt5295; local1++) { + for (@Pc(1) int local1 = 0; local1 < this.vertexCount; local1++) { @Pc(10) int local10 = this.anIntArray466[local1]; this.anIntArray466[local1] = this.anIntArray461[local1]; this.anIntArray461[local1] = -local10; } - this.aClass5_1.aBoolean3 = false; - this.aClass127_4.aBoolean235 = false; + this.vertexBuffer.valid = false; + this.bounds.valid = false; } } diff --git a/client/src/main/java/GlRenderer.java b/client/src/main/java/GlRenderer.java index 9e4b44f..b363733 100644 --- a/client/src/main/java/GlRenderer.java +++ b/client/src/main/java/GlRenderer.java @@ -119,7 +119,7 @@ public final class GlRenderer { private static boolean fogEnabled = true; @OriginalMember(owner = "client!tf", name = "I", descriptor = "Lclient!na;") - private static final JagString RADEON = Static28.parse("radeon"); + private static final JagString RADEON = JagString.parse("radeon"); private static JAWTWindow window; @@ -485,7 +485,7 @@ public final class GlRenderer { } if (context != null) { - Static63.clear(); // GlCleaner + GlCleaner.clear(); // GlCleaner try { if (GLContext.getCurrent() == context) { context.release(); diff --git a/client/src/main/java/GlSolidColorTexture.java b/client/src/main/java/GlSolidColorTexture.java index 2876813..8eb71ef 100644 --- a/client/src/main/java/GlSolidColorTexture.java +++ b/client/src/main/java/GlSolidColorTexture.java @@ -23,7 +23,7 @@ public final class GlSolidColorTexture extends SecondaryNode { @Pc(12) int[] local12 = new int[1]; local9.glGenTextures(1, local12, 0); this.anInt5058 = local12[0]; - this.anInt5059 = Static63.contextId; + this.anInt5059 = GlCleaner.contextId; GlRenderer.setTextureId(this.anInt5058); @Pc(32) int local32 = Rasteriser.palette[arg0]; @Pc(58) byte[] local58 = new byte[] { (byte) (local32 >> 16), (byte) (local32 >> 8), (byte) local32, -1 }; @@ -31,7 +31,7 @@ public final class GlSolidColorTexture extends SecondaryNode { local9.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_RGBA, 1, 1, 0, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, local61); local9.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR); local9.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); - Static63.onCardTexture += local61.limit() - this.anInt5065; + GlCleaner.onCardTexture += local61.limit() - this.anInt5065; this.anInt5065 = local61.limit(); } @@ -39,7 +39,7 @@ public final class GlSolidColorTexture extends SecondaryNode { @Override public final void finalize() throws Throwable { if (this.anInt5058 != -1) { - Static63.method1485(this.anInt5058, this.anInt5065, this.anInt5059); + GlCleaner.method1485(this.anInt5058, this.anInt5065, this.anInt5059); this.anInt5058 = -1; this.anInt5065 = 0; } diff --git a/client/src/main/java/GlSprite.java b/client/src/main/java/GlSprite.java index 3f16e68..610d431 100644 --- a/client/src/main/java/GlSprite.java +++ b/client/src/main/java/GlSprite.java @@ -324,12 +324,12 @@ public class GlSprite extends Sprite { @Override public final void finalize() throws Throwable { if (this.textureId != -1) { - Static63.deleteTexture2d(this.textureId, this.anInt1869, this.anInt1875); + GlCleaner.deleteTexture2d(this.textureId, this.anInt1869, this.anInt1875); this.textureId = -1; this.anInt1869 = 0; } if (this.anInt1871 != -1) { - Static63.deleteList(this.anInt1871, this.anInt1875); + GlCleaner.deleteList(this.anInt1871, this.anInt1875); this.anInt1871 = -1; } super.finalize(); @@ -463,11 +463,11 @@ public class GlSprite extends Sprite { @Pc(100) int[] local100 = new int[1]; local93.glGenTextures(1, local100, 0); this.textureId = local100[0]; - this.anInt1875 = Static63.contextId; + this.anInt1875 = GlCleaner.contextId; } GlRenderer.setTextureId(this.textureId); local93.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_RGBA, this.powerOfTwoWidth, this.powerOfTwoHeight, 0, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, local91); - Static63.onCard2d += local91.limit() - this.anInt1869; + GlCleaner.onCard2d += local91.limit() - this.anInt1869; this.anInt1869 = local91.limit(); } @@ -493,7 +493,7 @@ public class GlSprite extends Sprite { @Pc(17) GL2 local17 = GlRenderer.gl; if (this.anInt1871 == -1) { this.anInt1871 = local17.glGenLists(1); - this.anInt1875 = Static63.contextId; + this.anInt1875 = GlCleaner.contextId; } local17.glNewList(this.anInt1871, GL2.GL_COMPILE); local17.glBegin(GL2.GL_TRIANGLE_FAN); diff --git a/client/src/main/java/GlTexture.java b/client/src/main/java/GlTexture.java index 382d86d..b020d16 100644 --- a/client/src/main/java/GlTexture.java +++ b/client/src/main/java/GlTexture.java @@ -178,7 +178,7 @@ public final class GlTexture extends SecondaryNode { if (this.textureId == -1) { @Pc(53) int[] temp = new int[1]; gl.glGenTextures(1, temp, 0); - this.anInt5492 = Static63.contextId; + this.anInt5492 = GlCleaner.contextId; this.textureId = temp[0]; GlRenderer.setTextureId(this.textureId); @Pc(82) ByteBuffer pixels = ByteBuffer.wrap(this.aClass88_1.method2728(size, size, this.aBoolean288, arg1, 0.7D, arg0)); @@ -215,7 +215,7 @@ public final class GlTexture extends SecondaryNode { // gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_GENERATE_MIPMAP, GL2.GL_TRUE); // gl.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_RGBA8, size, size, 0, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, pixels); - Static63.onCardTexture += pixels.limit() * 4 / 3 - this.textureSize; + GlCleaner.onCardTexture += pixels.limit() * 4 / 3 - this.textureSize; this.textureSize = pixels.limit() * 4 / 3; } else if (this.anInt5489 == 1) { @Pc(129) int local129 = 0; @@ -225,7 +225,7 @@ public final class GlTexture extends SecondaryNode { if (size == 0) { gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR_MIPMAP_LINEAR); gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); - Static63.onCardTexture += pixels.limit() * 4 / 3 - this.textureSize; + GlCleaner.onCardTexture += pixels.limit() * 4 / 3 - this.textureSize; this.textureSize = pixels.limit() * 4 / 3; break; } @@ -235,7 +235,7 @@ public final class GlTexture extends SecondaryNode { gl.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_RGBA, size, size, 0, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, pixels); gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR); gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); - Static63.onCardTexture += pixels.limit() - this.textureSize; + GlCleaner.onCardTexture += pixels.limit() - this.textureSize; this.textureSize = pixels.limit(); } gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_WRAP_S, this.aBoolean285 ? GL2.GL_REPEAT : GL2.GL_CLAMP_TO_EDGE); @@ -308,7 +308,7 @@ public final class GlTexture extends SecondaryNode { @Override public final void finalize() throws Throwable { if (this.textureId != -1) { - Static63.method1485(this.textureId, this.textureSize, this.anInt5492); + GlCleaner.method1485(this.textureId, this.textureSize, this.anInt5492); this.textureSize = 0; this.textureId = -1; } diff --git a/client/src/main/java/GlTile.java b/client/src/main/java/GlTile.java index 5cdbb67..beed432 100644 --- a/client/src/main/java/GlTile.java +++ b/client/src/main/java/GlTile.java @@ -298,7 +298,7 @@ public final class GlTile extends Node { this.aByteBuffer3.position(28); local257.glTexCoordPointer(2, GL2.GL_FLOAT, local282, this.aByteBuffer3); if (this.aBoolean139) { - local257.glClientActiveTexture(Static275.method4607()); + local257.glClientActiveTexture(UnderwaterMaterialRenderer.method4607()); this.aByteBuffer3.position(36); local257.glTexCoordPointer(1, GL2.GL_FLOAT, local282, this.aByteBuffer3); local257.glClientActiveTexture(GL2.GL_TEXTURE0); @@ -312,7 +312,7 @@ public final class GlTile extends Node { } local257.glTexCoordPointer(2, GL2.GL_FLOAT, local282, 28L); if (this.aBoolean139) { - local257.glClientActiveTexture(Static275.method4607()); + local257.glClientActiveTexture(UnderwaterMaterialRenderer.method4607()); local257.glTexCoordPointer(1, GL2.GL_FLOAT, local282, 36L); local257.glClientActiveTexture(GL2.GL_TEXTURE0); } diff --git a/client/src/main/java/GlVertexBufferObject.java b/client/src/main/java/GlVertexBufferObject.java index 2c908e9..9f73dd3 100644 --- a/client/src/main/java/GlVertexBufferObject.java +++ b/client/src/main/java/GlVertexBufferObject.java @@ -34,7 +34,7 @@ public final class GlVertexBufferObject { local9.glGenBuffers(1, local12, 0); this.aBoolean300 = arg0; this.anInt5760 = local12[0]; - this.anInt5761 = Static63.contextId; + this.anInt5761 = GlCleaner.contextId; } @OriginalMember(owner = "client!vi", name = "a", descriptor = "(Ljava/nio/ByteBuffer;)V") @@ -52,7 +52,7 @@ public final class GlVertexBufferObject { @Override public final void finalize() throws Throwable { if (this.anInt5760 != -1) { - Static63.method1489(this.anInt5760, this.anInt5762, this.anInt5761); + GlCleaner.method1489(this.anInt5760, this.anInt5762, this.anInt5761); this.anInt5760 = -1; this.anInt5762 = 0; } @@ -70,7 +70,7 @@ public final class GlVertexBufferObject { @Pc(1) GL2 local1 = GlRenderer.gl; local1.glBindBuffer(GL2.GL_ELEMENT_ARRAY_BUFFER, this.anInt5760); local1.glBufferData(GL2.GL_ELEMENT_ARRAY_BUFFER, arg0.limit(), arg0, this.aBoolean300 ? GL2.GL_STREAM_DRAW : GL2.GL_STATIC_DRAW); - Static63.anInt1945 += arg0.limit() - this.anInt5762; + GlCleaner.anInt1945 += arg0.limit() - this.anInt5762; this.anInt5762 = arg0.limit(); } @@ -85,7 +85,7 @@ public final class GlVertexBufferObject { @Pc(1) GL2 local1 = GlRenderer.gl; local1.glBindBuffer(GL2.GL_ARRAY_BUFFER, this.anInt5760); local1.glBufferData(GL2.GL_ARRAY_BUFFER, arg0.limit(), arg0, this.aBoolean300 ? GL2.GL_STREAM_DRAW : GL2.GL_STATIC_DRAW); - Static63.anInt1945 += arg0.limit() - this.anInt5762; + GlCleaner.anInt1945 += arg0.limit() - this.anInt5762; this.anInt5762 = arg0.limit(); } } diff --git a/client/src/main/java/HintArrowManager.java b/client/src/main/java/HintArrowManager.java new file mode 100644 index 0000000..eae495c --- /dev/null +++ b/client/src/main/java/HintArrowManager.java @@ -0,0 +1,65 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class HintArrowManager { + @OriginalMember(owner = "client!ih", name = "l", descriptor = "Lclient!n;") + public static final SoftLruHashTable HINT_ARROWS = new SoftLruHashTable(4); + + @OriginalMember(owner = "client!mh", name = "c", descriptor = "(II)V") + public static void clean() { + HINT_ARROWS.clean(5); + } + + @OriginalMember(owner = "client!og", name = "a", descriptor = "(I)V") + public static void method3329() { + HINT_ARROWS.method3103(); + } + + @OriginalMember(owner = "client!oi", name = "b", descriptor = "(I)V") + public static void clear() { + HINT_ARROWS.clear(); + } + + @OriginalMember(owner = "client!rm", name = "a", descriptor = "(ZIIIILclient!ak;I)Lclient!ak;") + public static Model getModel(@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; + @Pc(10) Model local10 = (Model) HINT_ARROWS.get(local4); + if (local10 == null) { + @Pc(22) RawModel local22 = Static77.create(client.js5Archive7, arg2); + if (local22 == null) { + return null; + } + local10 = local22.createModel(64, 768, -50, -10, -50); + HINT_ARROWS.put(local10, local4); + } + @Pc(42) int local42 = arg4.method4562(); + @Pc(45) int local45 = arg4.method4561(); + @Pc(48) int local48 = arg4.method4576(); + @Pc(51) int local51 = arg4.method4550(); + local10 = local10.method4560(true, true, true); + if (arg0 != 0) { + local10.method4554(arg0); + } + @Pc(94) int local94; + if (GlRenderer.enabled) { + @Pc(68) GlModel local68 = (GlModel) local10; + if (arg5 != SceneGraph.getTileHeight(Static55.level, arg3 + local42, arg1 + local48) || arg5 != SceneGraph.getTileHeight(Static55.level, arg3 + local45, local51 + arg1)) { + for (local94 = 0; local94 < local68.vertexCount; local94++) { + local68.anIntArray465[local94] += SceneGraph.getTileHeight(Static55.level, local68.anIntArray461[local94] + arg3, local68.anIntArray466[local94] + arg1) - arg5; + } + local68.bounds.valid = false; + local68.vertexBuffer.valid = false; + } + } else { + @Pc(142) SoftwareModel local142 = (SoftwareModel) local10; + if (arg5 != SceneGraph.getTileHeight(Static55.level, local42 + arg3, local48 + arg1) || arg5 != SceneGraph.getTileHeight(Static55.level, arg3 + local45, local51 + arg1)) { + for (local94 = 0; local94 < local142.vertexCount; local94++) { + local142.anIntArray527[local94] += SceneGraph.getTileHeight(Static55.level, arg3 + local142.anIntArray528[local94], local142.anIntArray531[local94] + arg1) - arg5; + } + local142.boundsValid = false; + } + } + return local10; + } +} diff --git a/client/src/main/java/HitBarList.java b/client/src/main/java/HitBarList.java new file mode 100644 index 0000000..00221aa --- /dev/null +++ b/client/src/main/java/HitBarList.java @@ -0,0 +1,6 @@ +import org.openrs2.deob.annotation.OriginalMember; + +public class HitBarList { + @OriginalMember(owner = "client!fm", name = "S", descriptor = "Lclient!n;") + public static final SoftLruHashTable hitBars = new SoftLruHashTable(4); +} diff --git a/client/src/main/java/IdkType.java b/client/src/main/java/IdkType.java index ae51deb..35f193f 100644 --- a/client/src/main/java/IdkType.java +++ b/client/src/main/java/IdkType.java @@ -36,7 +36,7 @@ public final class IdkType { @Pc(16) RawModel[] local16 = new RawModel[5]; for (@Pc(18) int local18 = 0; local18 < 5; local18++) { if (this.headModels[local18] != -1) { - local16[local13++] = Static77.create(Static14.modelsArchive, this.headModels[local18]); + local16[local13++] = Static77.create(IdkTypeList.modelsArchive, this.headModels[local18]); } } @Pc(52) RawModel local52 = new RawModel(local16, local13); @@ -61,7 +61,7 @@ public final class IdkType { } @Pc(13) boolean local13 = true; for (@Pc(22) int local22 = 0; local22 < this.bodyModels.length; local22++) { - if (!Static14.modelsArchive.isFileReady(0, this.bodyModels[local22])) { + if (!IdkTypeList.modelsArchive.isFileReady(0, this.bodyModels[local22])) { local13 = false; } } @@ -112,7 +112,7 @@ public final class IdkType { } @Pc(16) RawModel[] local16 = new RawModel[this.bodyModels.length]; for (@Pc(18) int local18 = 0; local18 < this.bodyModels.length; local18++) { - local16[local18] = Static77.create(Static14.modelsArchive, this.bodyModels[local18]); + local16[local18] = Static77.create(IdkTypeList.modelsArchive, this.bodyModels[local18]); } @Pc(56) RawModel local56; if (local16.length == 1) { @@ -138,7 +138,7 @@ public final class IdkType { public final boolean isHeadModelReady() { @Pc(3) boolean local3 = true; for (@Pc(12) int local12 = 0; local12 < 5; local12++) { - if (this.headModels[local12] != -1 && !Static14.modelsArchive.isFileReady(0, this.headModels[local12])) { + if (this.headModels[local12] != -1 && !IdkTypeList.modelsArchive.isFileReady(0, this.headModels[local12])) { local3 = false; } } diff --git a/client/src/main/java/IdkTypeList.java b/client/src/main/java/IdkTypeList.java new file mode 100644 index 0000000..d864a53 --- /dev/null +++ b/client/src/main/java/IdkTypeList.java @@ -0,0 +1,51 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class IdkTypeList { + @OriginalMember(owner = "client!fe", name = "jb", descriptor = "Lclient!n;") + public static final SoftLruHashTable types = new SoftLruHashTable(64); + @OriginalMember(owner = "client!bd", name = "g", descriptor = "Lclient!ve;") + public static Js5 modelsArchive; + @OriginalMember(owner = "client!ri", name = "c", descriptor = "Lclient!ve;") + public static Js5 archive; + @OriginalMember(owner = "client!ec", name = "z", descriptor = "I") + public static int anInt1716; + + @OriginalMember(owner = "client!jl", name = "a", descriptor = "(ILclient!ve;Lclient!ve;)V") + public static void init(@OriginalArg(1) Js5 arg0, @OriginalArg(2) Js5 arg1) { + modelsArchive = arg0; + archive = arg1; + anInt1716 = archive.getGroupCapacity(3); + } + + @OriginalMember(owner = "client!gg", name = "d", descriptor = "(II)Lclient!dm;") + public static IdkType get(@OriginalArg(0) int arg0) { + @Pc(10) IdkType local10 = (IdkType) types.get((long) arg0); + if (local10 != null) { + return local10; + } + @Pc(21) byte[] local21 = archive.getFile(3, arg0); + local10 = new IdkType(); + if (local21 != null) { + local10.decode(new Buffer(local21)); + } + types.put(local10, (long) arg0); + return local10; + } + + @OriginalMember(owner = "client!oi", name = "a", descriptor = "(I)V") + public static void method3342() { + types.method3103(); + } + + @OriginalMember(owner = "client!t", name = "b", descriptor = "(I)V") + public static void method3999() { + types.clear(); + } + + @OriginalMember(owner = "client!te", name = "a", descriptor = "(IZ)V") + public static void clean() { + types.clean(5); + } +} diff --git a/client/src/main/java/InterfaceList.java b/client/src/main/java/InterfaceList.java index 80fdbb4..dae7b91 100644 --- a/client/src/main/java/InterfaceList.java +++ b/client/src/main/java/InterfaceList.java @@ -1,12 +1,151 @@ +import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; 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!qj", name = "i", descriptor = "[I") + public static final int[] keyChars = new int[128]; + @OriginalMember(owner = "client!sg", name = "q", descriptor = "[I") + public static final int[] keyCodes = new int[128]; @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; + @OriginalMember(owner = "client!bm", name = "f", descriptor = "Lclient!ve;") + public static Js5 aClass153_12; + @OriginalMember(owner = "client!nd", name = "v", descriptor = "Lclient!ve;") + public static Js5 aClass153_64; + @OriginalMember(owner = "client!qg", name = "ab", descriptor = "Lclient!ve;") + public static Js5 aClass153_84; + @OriginalMember(owner = "client!qh", name = "g", descriptor = "Lclient!ve;") + public static Js5 aClass153_85; + @OriginalMember(owner = "client!th", name = "j", descriptor = "[[Lclient!be;") + public static Component[][] components; + @OriginalMember(owner = "client!sc", name = "m", descriptor = "[Z") + public static boolean[] aBooleanArray115; + @OriginalMember(owner = "client!oj", name = "y", descriptor = "I") + public static int keyQueueSize = 0; + @OriginalMember(owner = "client!je", name = "fb", descriptor = "I") + public static int transmitTimer = 1; + + @OriginalMember(owner = "client!ab", name = "a", descriptor = "(ZLclient!ve;Lclient!ve;Lclient!ve;Lclient!ve;)V") + public static void init(@OriginalArg(1) Js5 arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) Js5 arg2, @OriginalArg(4) Js5 arg3) { + aClass153_12 = arg1; + aClass153_64 = arg0; + aClass153_84 = arg2; + aClass153_85 = arg3; + components = new Component[aClass153_84.method4483()][]; + aBooleanArray115 = new boolean[aClass153_84.method4483()]; + } + + @OriginalMember(owner = "client!ig", name = "a", descriptor = "(BI)V") + public static void method2275(@OriginalArg(1) int arg0) { + if (arg0 == -1 || !aBooleanArray115[arg0]) { + return; + } + aClass153_84.method4490(arg0); + if (components[arg0] == null) { + return; + } + @Pc(27) boolean local27 = true; + for (@Pc(29) int local29 = 0; local29 < components[arg0].length; local29++) { + if (components[arg0][local29] != null) { + if (components[arg0][local29].type == 2) { + local27 = false; + } else { + components[arg0][local29] = null; + } + } + } + if (local27) { + components[arg0] = null; + } + aBooleanArray115[arg0] = false; + } + + @OriginalMember(owner = "client!tm", name = "b", descriptor = "(II)Z") + public static boolean load(@OriginalArg(0) int arg0) { + if (aBooleanArray115[arg0]) { + return true; + } else if (aClass153_84.method4479(arg0)) { + @Pc(25) int local25 = aClass153_84.getGroupCapacity(arg0); + if (local25 == 0) { + aBooleanArray115[arg0] = true; + return true; + } + if (components[arg0] == null) { + components[arg0] = new Component[local25]; + } + for (@Pc(46) int local46 = 0; local46 < local25; local46++) { + if (components[arg0][local46] == null) { + @Pc(62) byte[] local62 = aClass153_84.getFile(arg0, local46); + if (local62 != null) { + @Pc(74) Component local74 = components[arg0][local46] = new Component(); + local74.id = local46 + (arg0 << 16); + if (local62[0] == -1) { + local74.method490(new Buffer(local62)); + } else { + local74.method481(new Buffer(local62)); + } + } + } + } + aBooleanArray115[arg0] = true; + return true; + } else { + return false; + } + } + + @OriginalMember(owner = "client!eb", name = "d", descriptor = "(I)V") + public static void method1287() { + components = new Component[aClass153_84.method4483()][]; + aBooleanArray115 = new boolean[aClass153_84.method4483()]; + } + + @OriginalMember(owner = "client!i", name = "i", descriptor = "(Z)V") + public static void method2245() { + for (@Pc(6) Class3_Sub31 local6 = (Class3_Sub31) Static119.aClass133_9.head(); local6 != null; local6 = (Class3_Sub31) Static119.aClass133_9.next()) { + @Pc(14) int local14 = local6.anInt5878; + if (load(local14)) { + @Pc(21) boolean local21 = true; + @Pc(25) Component[] local25 = components[local14]; + @Pc(27) int local27; + for (local27 = 0; local27 < local25.length; local27++) { + if (local25[local27] != null) { + local21 = local25[local27].aBoolean32; + break; + } + } + if (!local21) { + local27 = (int) local6.key; + @Pc(60) Component local60 = getComponent(local27); + if (local60 != null) { + Static43.redraw(local60); + } + } + } + } + } + + @OriginalMember(owner = "client!af", name = "a", descriptor = "(BI)Lclient!be;") + public static Component getComponent(@OriginalArg(1) int id) { + @Pc(7) int interfaceId = id >> 16; + @Pc(18) int componentId = id & 0xFFFF; + if (components[interfaceId] == null || components[interfaceId][componentId] == null) { + @Pc(33) boolean success = load(interfaceId); + if (!success) { + return null; + } + // todo: this should not be necessary, data/server-related? + if (components.length <= interfaceId || components[interfaceId].length <= componentId) { + return null; + } + } + return components[interfaceId][componentId]; + } } diff --git a/client/src/main/java/InvTypeList.java b/client/src/main/java/InvTypeList.java new file mode 100644 index 0000000..36670ea --- /dev/null +++ b/client/src/main/java/InvTypeList.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 InvTypeList { + @OriginalMember(owner = "client!ha", name = "p", descriptor = "Lclient!gn;") + public static final LruHashTable types = new LruHashTable(64); + @OriginalMember(owner = "client!al", name = "q", descriptor = "Lclient!ve;") + public static Js5 archive; + + @OriginalMember(owner = "client!je", name = "a", descriptor = "(ILclient!ve;)V") + public static void init(@OriginalArg(1) Js5 arg0) { + archive = arg0; + } + + @OriginalMember(owner = "client!u", name = "a", descriptor = "(II)Lclient!md;") + public static InvType list(@OriginalArg(0) int id) { + @Pc(16) InvType invType = (InvType) types.get((long) id); + if (invType != null) { + return invType; + } + @Pc(27) byte[] data = archive.getFile(5, id); + invType = new InvType(); + if (data != null) { + invType.decode(new Buffer(data)); + } + types.put(invType, (long) id); + return invType; + } +} diff --git a/client/src/main/java/IsaacRandom.java b/client/src/main/java/IsaacRandom.java index c0c6313..e42b6b8 100644 --- a/client/src/main/java/IsaacRandom.java +++ b/client/src/main/java/IsaacRandom.java @@ -158,7 +158,7 @@ public final class IsaacRandom { } @OriginalMember(owner = "client!ij", name = "a", descriptor = "(I)I") - public final int method2295() { + public final int getNextKey() { if (GlobalConfig.USE_ISAAC) { if (this.anInt2916-- == 0) { this.method2296(); diff --git a/client/src/main/java/JagString.java b/client/src/main/java/JagString.java index 5cca1ec..0ee7847 100644 --- a/client/src/main/java/JagString.java +++ b/client/src/main/java/JagString.java @@ -13,7 +13,7 @@ import org.openrs2.deob.annotation.Pc; public final class JagString implements StringInterface { @OriginalMember(owner = "client!pa", name = "O", descriptor = "Lclient!na;") - public static final JagString EMPTY = Static28.parse(""); + public static final JagString EMPTY = parse(""); @OriginalMember(owner = "client!na", name = "T", descriptor = "[B") public byte[] chars; @@ -101,7 +101,30 @@ public final class JagString implements StringInterface { } } - @OriginalMember(owner = "client!na", name = "a", descriptor = "(Z)Ljava/net/URL;") + @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(); + @Pc(9) int local9 = local6.length; + @Pc(13) JagString local13 = new JagString(); + @Pc(15) int local15 = 0; + local13.chars = new byte[local9]; + while (local9 > local15) { + @Pc(29) int local29 = local6[local15++] & 0xFF; + if (local29 <= 45 && local29 >= 40) { + if (local15 >= local9) { + break; + } + @Pc(51) int local51 = local6[local15++] & 0xFF; + local13.chars[local13.length++] = (byte) (local51 + (local29 + -40) * 43 - 48); + } else if (local29 != 0) { + local13.chars[local13.length++] = (byte) local29; + } + } + local13.method3156(); + return local13.method3151(); + } + + @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)); } @@ -856,7 +879,7 @@ public final class JagString implements StringInterface { } @OriginalMember(owner = "client!na", name = "a", descriptor = "(ILjava/applet/Applet;)Ljava/lang/Object;") - public final Object method3157(@OriginalArg(1) Applet arg0) throws Throwable { + public final Object browserControlCall(@OriginalArg(1) Applet arg0) throws Throwable { @Pc(12) String local12 = new String(this.chars, 0, this.length); @Pc(17) Object local17 = Static287.method1757(local12, arg0); if (local17 instanceof String) { @@ -888,7 +911,7 @@ public final class JagString implements StringInterface { @OriginalMember(owner = "client!na", name = "k", descriptor = "(I)Lclient!na;") public final JagString method3159() { - @Pc(9) JagString local9 = Static79.decode37(this.encode37()); + @Pc(9) JagString local9 = Base37.decodeLowerCase(this.encode37()); return local9 == null ? Static228.aClass100_967 : local9; } diff --git a/client/src/main/java/Js5.java b/client/src/main/java/Js5.java index 76d83fc..58e4568 100644 --- a/client/src/main/java/Js5.java +++ b/client/src/main/java/Js5.java @@ -95,7 +95,7 @@ public final class Js5 { } @OriginalMember(owner = "client!ve", name = "b", descriptor = "(B)I") - public final int method4480() { + public final int getChecksum() { if (!this.method4484()) { throw new IllegalStateException(""); } @@ -460,7 +460,7 @@ public final class Js5 { } @OriginalMember(owner = "client!ve", name = "a", descriptor = "(BI)[I") - public final int[] method4503(@OriginalArg(1) int arg0) { + public final int[] getFileIds(@OriginalArg(1) int arg0) { if (!this.method4492(arg0)) { return null; } @@ -476,7 +476,7 @@ public final class Js5 { } @OriginalMember(owner = "client!ve", name = "a", descriptor = "(IB)I") - public final int method4504(@OriginalArg(0) int arg0) { + public final int getGroupCapacity(@OriginalArg(0) int arg0) { return this.method4492(arg0) ? this.aClass70_2.anIntArray270[arg0] : 0; } diff --git a/client/src/main/java/Js5CachedResourceProvider.java b/client/src/main/java/Js5CachedResourceProvider.java index 72746ec..32b0d45 100644 --- a/client/src/main/java/Js5CachedResourceProvider.java +++ b/client/src/main/java/Js5CachedResourceProvider.java @@ -164,7 +164,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider { } @OriginalMember(owner = "client!bg", name = "a", descriptor = "(Z)V") - public final void method528() { + public final void prefetchAll() { if (this.aClass49_2 != null) { this.aBoolean36 = true; if (this.aClass69_17 == null) { diff --git a/client/src/main/java/Js5MasterIndex.java b/client/src/main/java/Js5MasterIndex.java index 6689a43..79dc255 100644 --- a/client/src/main/java/Js5MasterIndex.java +++ b/client/src/main/java/Js5MasterIndex.java @@ -31,7 +31,7 @@ public final class Js5MasterIndex { } @OriginalMember(owner = "client!al", name = "b", descriptor = "(I)Z") - public final boolean method178() { + public final boolean isReady() { if (this.aClass3_Sub15_1 != null) { return true; } @@ -69,7 +69,7 @@ public final class Js5MasterIndex { } @OriginalMember(owner = "client!al", name = "a", descriptor = "(IILclient!ge;Lclient!ge;)Lclient!bg;") - public final Js5CachedResourceProvider method180(@OriginalArg(1) int arg0, @OriginalArg(2) Cache arg1, @OriginalArg(3) Cache arg2) { + public final Js5CachedResourceProvider getResourceProvider(@OriginalArg(1) int arg0, @OriginalArg(2) Cache arg1, @OriginalArg(3) Cache arg2) { return this.method188(arg2, arg0, arg1); } diff --git a/client/src/main/java/Js5NetQueue.java b/client/src/main/java/Js5NetQueue.java index 4452438..dd69506 100644 --- a/client/src/main/java/Js5NetQueue.java +++ b/client/src/main/java/Js5NetQueue.java @@ -223,7 +223,7 @@ public final class Js5NetQueue { } @OriginalMember(owner = "client!jb", name = "a", descriptor = "(ZZ)V") - public final void method2322(@OriginalArg(0) boolean arg0) { + public final void writeLoggedIn(@OriginalArg(0) boolean arg0) { if (this.aClass95_1 == null) { return; } @@ -261,7 +261,7 @@ public final class Js5NetQueue { } this.aClass95_1 = arg1; this.method2331(); - this.method2322(arg0); + this.writeLoggedIn(arg0); this.aClass3_Sub15_5.offset = 0; this.aClass3_Sub2_Sub5_Sub2_2 = null; while (true) { diff --git a/client/src/main/java/Js5QuickChatCommandDecoder.java b/client/src/main/java/Js5QuickChatCommandDecoder.java index e8349b8..c662a37 100644 --- a/client/src/main/java/Js5QuickChatCommandDecoder.java +++ b/client/src/main/java/Js5QuickChatCommandDecoder.java @@ -10,13 +10,13 @@ public final class Js5QuickChatCommandDecoder implements QuickChatCommandDecoder @Override public final JagString method30(@OriginalArg(0) int arg0, @OriginalArg(1) int[] arg1, @OriginalArg(3) long arg2) { if (arg0 == 0) { - @Pc(12) EnumType local12 = Static253.method4330(arg1[0]); + @Pc(12) EnumType local12 = EnumTypeList.get(arg1[0]); return local12.getString((int) arg2); } else if (arg0 == 1 || arg0 == 10) { - @Pc(31) ObjType local31 = Static71.get((int) arg2); + @Pc(31) ObjType local31 = ObjTypeList.get((int) arg2); return local31.name; } else if (arg0 == 6 || arg0 == 7 || arg0 == 11) { - return Static253.method4330(arg1[0]).getString((int) arg2); + return EnumTypeList.get(arg1[0]).getString((int) arg2); } else { return null; } diff --git a/client/src/main/java/LightType.java b/client/src/main/java/LightType.java index 3f65ea8..043c267 100644 --- a/client/src/main/java/LightType.java +++ b/client/src/main/java/LightType.java @@ -19,7 +19,7 @@ public final class LightType { public int anInt2873 = 2048; @OriginalMember(owner = "client!ic", name = "a", descriptor = "(ILclient!wa;I)V") - public final void method2257(@OriginalArg(1) Buffer arg0, @OriginalArg(2) int arg1) { + public final void decode(@OriginalArg(1) Buffer arg0, @OriginalArg(2) int arg1) { while (true) { @Pc(5) int local5 = arg0.g1(); if (local5 == 0) { diff --git a/client/src/main/java/LightTypeList.java b/client/src/main/java/LightTypeList.java new file mode 100644 index 0000000..914f7d7 --- /dev/null +++ b/client/src/main/java/LightTypeList.java @@ -0,0 +1,45 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class LightTypeList { + @OriginalMember(owner = "client!rm", name = "d", descriptor = "Lclient!n;") + public static final SoftLruHashTable types = new SoftLruHashTable(64); + @OriginalMember(owner = "client!gl", name = "a", descriptor = "Lclient!ve;") + public static Js5 archive; + + @OriginalMember(owner = "client!id", name = "a", descriptor = "(Lclient!ve;B)V") + public static void init(@OriginalArg(0) Js5 arg0) { + archive = arg0; + } + + @OriginalMember(owner = "client!la", name = "a", descriptor = "(II)Lclient!ic;") + public static LightType get(@OriginalArg(1) int arg0) { + @Pc(10) LightType local10 = (LightType) types.get((long) arg0); + if (local10 != null) { + return local10; + } + @Pc(26) byte[] local26 = archive.getFile(31, arg0); + local10 = new LightType(); + if (local26 != null) { + local10.decode(new Buffer(local26), arg0); + } + types.put(local10, (long) arg0); + return local10; + } + + @OriginalMember(owner = "client!c", name = "c", descriptor = "(II)V") + public static void clean() { + types.clean(5); + } + + @OriginalMember(owner = "client!gd", name = "b", descriptor = "(I)V") + public static void method1695() { + types.clear(); + } + + @OriginalMember(owner = "client!hd", name = "a", descriptor = "(I)V") + public static void method1882() { + types.method3103(); + } +} diff --git a/client/src/main/java/LiquidMaterialRenderer.java b/client/src/main/java/LiquidMaterialRenderer.java index 649bae8..74f9b5e 100644 --- a/client/src/main/java/LiquidMaterialRenderer.java +++ b/client/src/main/java/LiquidMaterialRenderer.java @@ -10,7 +10,9 @@ import org.openrs2.deob.annotation.Pc; @OriginalClass("client!rd") public final class LiquidMaterialRenderer implements MaterialRenderer { - @OriginalMember(owner = "client!rd", name = "a", descriptor = "I") + @OriginalMember(owner = "client!rd", name = "d", descriptor = "[F") + public static final float[] aFloatArray24 = new float[4]; + @OriginalMember(owner = "client!rd", name = "a", descriptor = "I") private int anInt4829 = -1; @OriginalMember(owner = "client!rd", name = "e", descriptor = "I") @@ -171,8 +173,8 @@ public final class LiquidMaterialRenderer implements MaterialRenderer { } local5.glActiveTexture(GL2.GL_TEXTURE0); if ((arg0 & 0x40) == 0) { - local5.glGetFloatv(GL2.GL_LIGHT_MODEL_AMBIENT, Static212.aFloatArray24, 0); - local5.glProgramLocalParameter4fvARB(GL2.GL_VERTEX_PROGRAM_ARB, 66, Static212.aFloatArray24, 0); + local5.glGetFloatv(GL2.GL_LIGHT_MODEL_AMBIENT, aFloatArray24, 0); + local5.glProgramLocalParameter4fvARB(GL2.GL_VERTEX_PROGRAM_ARB, 66, aFloatArray24, 0); } else { local5.glProgramLocalParameter4fARB(GL2.GL_VERTEX_PROGRAM_ARB, 66, 1.0F, 1.0F, 1.0F, 1.0F); } diff --git a/client/src/main/java/LoadingBar.java b/client/src/main/java/LoadingBar.java index 4a8519a..0c21256 100644 --- a/client/src/main/java/LoadingBar.java +++ b/client/src/main/java/LoadingBar.java @@ -17,14 +17,14 @@ public class LoadingBar { 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); + Static46.method1186(GameShell.canvasWidth / 2 - 150, local9 + 2, client.mainLoadPercentage * 3, 30, 9179409); + Static46.method1186(GameShell.canvasWidth / 2 + client.mainLoadPercentage * 3 - 150, local9 + 2, 300 - client.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); + SoftwareRaster.fillRect(GameShell.canvasWidth / 2 - 150, local9 + 2, client.mainLoadPercentage * 3, 30, 9179409); + SoftwareRaster.fillRect(client.mainLoadPercentage * 3 + GameShell.canvasWidth / 2 - 150, local9 + 2, 300 - client.mainLoadPercentage * 3, 30, 0); } - arg1.renderCenter(Static126.mainLoadSecondaryText, GameShell.canvasWidth / 2, GameShell.canvasHeight / 2 + 4, 16777215, -1); + arg1.renderCenter(client.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 index 8cfc551..b79f444 100644 --- a/client/src/main/java/LoadingBarAwt.java +++ b/client/src/main/java/LoadingBarAwt.java @@ -58,4 +58,11 @@ public class LoadingBarAwt { GameShell.canvas.repaint(); } } + + @OriginalMember(owner = "client!n", name = "a", descriptor = "(B)V") + public static void clear() { + Static240.aFontMetrics1 = null; + Static222.aFont1 = null; + Static149.anImage3 = null; + } } diff --git a/client/src/main/java/Loc.java b/client/src/main/java/Loc.java index 9be6833..d5bf4f2 100644 --- a/client/src/main/java/Loc.java +++ b/client/src/main/java/Loc.java @@ -82,7 +82,7 @@ public final class Loc extends Entity { if (arg8 instanceof Loc) { ((Loc) arg8).method1046(); } else { - local67 = Static271.get(this.anInt1299); + local67 = LocTypeList.get(this.anInt1299); if (local67.multiLocs != null) { local67 = local67.getMultiLoc(); } @@ -92,7 +92,7 @@ public final class Loc extends Entity { } } if (arg6 != -1) { - this.aClass144_2 = Static36.get(arg6); + this.aClass144_2 = SeqTypeList.get(arg6); this.anInt1297 = 0; if (this.aClass144_2.frames.length <= 1) { this.anInt1304 = 0; @@ -128,7 +128,7 @@ public final class Loc extends Entity { this.method1048(true); } if (arg8 == null) { - local67 = Static271.get(this.anInt1299); + local67 = LocTypeList.get(this.anInt1299); if (local67.multiLocs != null) { this.aBoolean80 = true; } @@ -222,7 +222,7 @@ public final class Loc extends Entity { @OriginalMember(owner = "client!dc", name = "a", descriptor = "(ZI)Lclient!th;") private Entity method1048(@OriginalArg(0) boolean arg0) { @Pc(12) boolean local12 = Static107.surfaceTileHeightMap != Static83.activeTileHeightMap; - @Pc(19) LocType local19 = Static271.get(this.anInt1299); + @Pc(19) LocType local19 = LocTypeList.get(this.anInt1299); @Pc(22) int local22 = local19.anInt4430; if (local19.multiLocs != null) { local19 = local19.getMultiLoc(); @@ -234,7 +234,7 @@ public final class Loc extends Entity { return null; } @Pc(69) int local69; - if (client.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.id != local19.anInt4430)) { local69 = local19.anInt4430; if (local19.anInt4430 == -1) { local69 = local22; @@ -242,7 +242,7 @@ public final class Loc extends Entity { if (local69 == -1) { this.aClass144_2 = null; } else { - this.aClass144_2 = Static36.get(local69); + this.aClass144_2 = SeqTypeList.get(local69); } if (this.aClass144_2 != null) { if (local19.aBoolean209 && this.aClass144_2.anInt5362 != -1) { @@ -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) && Preferences.sceneryShadowsType >= 2); + @Pc(256) boolean local256 = !local12 && local19.aBoolean212 && (local19.id != 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; } @@ -319,7 +319,7 @@ public final class Loc extends Entity { this.anInt1294 = local429; this.anInt1296 = local302; } - this.anInt1321 = local19.anInt4426; + this.anInt1321 = local19.id; this.anInt1322 = this.anInt1297; } return local389.aClass8_10; diff --git a/client/src/main/java/LocType.java b/client/src/main/java/LocType.java index b789754..3154d12 100644 --- a/client/src/main/java/LocType.java +++ b/client/src/main/java/LocType.java @@ -34,7 +34,7 @@ public final class LocType { public int[] multiLocs; @OriginalMember(owner = "client!pb", name = "hb", descriptor = "I") - public int anInt4426; + public int id; @OriginalMember(owner = "client!pb", name = "wb", descriptor = "[I") public int[] anIntArray381; @@ -188,7 +188,7 @@ public final class LocType { if (this.shapes != null) { for (@Pc(18) int local18 = 0; local18 < this.shapes.length; local18++) { if (arg0 == this.shapes[local18]) { - return Static121.modelsArchive.isFileReady(0, this.models[local18] & 0xFFFF); + return LocTypeList.modelsArchive.isFileReady(0, this.models[local18] & 0xFFFF); } } return true; @@ -197,7 +197,7 @@ public final class LocType { } else if (arg0 == 10) { @Pc(71) boolean local71 = true; for (@Pc(73) int local73 = 0; local73 < this.models.length; local73++) { - local71 &= Static121.modelsArchive.isFileReady(0, this.models[local73] & 0xFFFF); + local71 &= LocTypeList.modelsArchive.isFileReady(0, this.models[local73] & 0xFFFF); } return local71; } else { @@ -215,9 +215,9 @@ public final class LocType { } if (local26 < 0 || local26 >= this.multiLocs.length - 1 || this.multiLocs[local26] == -1) { @Pc(84) int local84 = this.multiLocs[this.multiLocs.length - 1]; - return local84 == -1 ? null : Static271.get(local84); + return local84 == -1 ? null : LocTypeList.get(local84); } else { - return Static271.get(this.multiLocs[local26]); + return LocTypeList.get(this.multiLocs[local26]); } } @@ -243,16 +243,16 @@ public final class LocType { if (local10) { local60 += 65536; } - local7 = (RawModel) Static169.aClass99_24.get((long) local60); + local7 = (RawModel) LocTypeList.aClass99_24.get((long) local60); if (local7 == null) { - local7 = Static77.create(Static121.modelsArchive, local60 & 0xFFFF); + local7 = Static77.create(LocTypeList.modelsArchive, local60 & 0xFFFF); if (local7 == null) { return null; } if (local10) { local7.method1673(); } - Static169.aClass99_24.put(local7, (long) local60); + LocTypeList.aClass99_24.put(local7, (long) local60); } if (local46 > 1) { Static274.tempModels[local48] = local7; @@ -276,16 +276,16 @@ public final class LocType { if (local10) { local48 += 65536; } - local7 = (RawModel) Static169.aClass99_24.get((long) local48); + local7 = (RawModel) LocTypeList.aClass99_24.get((long) local48); if (local7 == null) { - local7 = Static77.create(Static121.modelsArchive, local48 & 0xFFFF); + local7 = Static77.create(LocTypeList.modelsArchive, local48 & 0xFFFF); if (local7 == null) { return null; } if (local10) { local7.method1673(); } - Static169.aClass99_24.put(local7, (long) local48); + LocTypeList.aClass99_24.put(local7, (long) local48); } } @Pc(211) boolean local211; @@ -319,7 +319,7 @@ public final class LocType { if (this.aByteArray63 == null || this.aByteArray63.length <= local315) { local265.recolor(this.recolorSource[local315], this.recolorDestination[local315]); } else { - local265.recolor(this.recolorSource[local315], Static62.aShortArray19[this.aByteArray63[local315] & 0xFF]); + local265.recolor(this.recolorSource[local315], client.aShortArray19[this.aByteArray63[local315] & 0xFF]); } } } @@ -363,7 +363,7 @@ public final class LocType { } for (@Pc(44) int local44 = 0; local44 < this.multiLocs.length; local44++) { if (this.multiLocs[local44] != -1) { - @Pc(70) LocType local70 = Static271.get(this.multiLocs[local44]); + @Pc(70) LocType local70 = LocTypeList.get(this.multiLocs[local44]); if (local70.sound != -1 || local70.anIntArray381 != null) { return true; } @@ -609,7 +609,7 @@ public final class LocType { } @Pc(13) boolean local13 = true; for (@Pc(15) int local15 = 0; local15 < this.models.length; local15++) { - local13 &= Static121.modelsArchive.isFileReady(0, this.models[local15] & 0xFFFF); + local13 &= LocTypeList.modelsArchive.isFileReady(0, this.models[local15] & 0xFFFF); } return local13; } @@ -639,11 +639,11 @@ public final class LocType { if (arg1) { local135 = ~local135; } - local79 = (GlModel) Static169.aClass99_24.get(local135); + local79 = (GlModel) LocTypeList.aClass99_24.get(local135); if (local79 == null) { @Pc(175) RawModel local175 = null; for (local177 = 0; local177 < local24; local177++) { - local175 = Static77.create(Static121.modelsArchive, this.models[local177] & 0xFFFF); + local175 = Static77.create(LocTypeList.modelsArchive, this.models[local177] & 0xFFFF); if (local175 == null) { return null; } @@ -655,7 +655,7 @@ public final class LocType { local175 = new RawModel(Static274.tempModels, local24); } local79 = new GlModel(local175, local10, local17, arg1); - Static169.aClass99_24.put(local79, local135); + LocTypeList.aClass99_24.put(local79, local135); } } else { local24 = -1; @@ -673,14 +673,14 @@ public final class LocType { if (arg1) { local26 += 65536; } - local79 = (GlModel) Static169.aClass99_24.get((long) local26); + local79 = (GlModel) LocTypeList.aClass99_24.get((long) local26); if (local79 == null) { - @Pc(90) RawModel local90 = Static77.create(Static121.modelsArchive, local26 & 0xFFFF); + @Pc(90) RawModel local90 = Static77.create(LocTypeList.modelsArchive, local26 & 0xFFFF); if (local90 == null) { return null; } local79 = new GlModel(local90, local10, local17, arg1); - Static169.aClass99_24.put(local79, (long) local26); + LocTypeList.aClass99_24.put(local79, (long) local26); } } @Pc(236) boolean local236 = this.aBoolean217; @@ -735,11 +735,11 @@ public final class LocType { @Pc(29) long local29; if (GlRenderer.enabled) { if (this.shapes == null) { - local29 = (this.anInt4426 << 10) + arg0; + local29 = (this.id << 10) + arg0; } else { - local29 = arg0 + (this.anInt4426 << 10) + (arg3 << 3); + local29 = arg0 + (this.id << 10) + (arg3 << 3); } - @Pc(225) Class139 local225 = (Class139) Static93.aClass99_14.get(local29); + @Pc(225) Class139 local225 = (Class139) LocTypeList.aClass99_14.get(local29); @Pc(235) GlModel local235; @Pc(265) SoftwareIndexedSprite local265; if (local225 == null) { @@ -760,7 +760,7 @@ public final class LocType { local225 = new Class139(); local225.aClass8_10 = local235; local225.aClass36_Sub1_3 = local265; - Static93.aClass99_14.put(local225, local29); + LocTypeList.aClass99_14.put(local225, local29); } else { local235 = (GlModel) local225.aClass8_10; local265 = local225.aClass36_Sub1_3; @@ -777,9 +777,9 @@ public final class LocType { return Static171.aClass139_1; } if (this.shapes == null) { - local29 = (this.anInt4426 << 10) + arg0; + local29 = (this.id << 10) + arg0; } else { - local29 = (arg3 << 3) + ((this.anInt4426 << 10) + arg0); + local29 = (arg3 << 3) + ((this.id << 10) + arg0); } @Pc(50) boolean local50; if (arg6 && this.aBoolean219) { @@ -788,7 +788,7 @@ public final class LocType { } else { local50 = false; } - @Pc(60) Entity local60 = (Entity) Static93.aClass99_14.get(local29); + @Pc(60) Entity local60 = (Entity) LocTypeList.aClass99_14.get(local29); if (local60 == null) { @Pc(69) RawModel local69 = this.method3418(arg0, arg3); if (local69 == null) { @@ -807,7 +807,7 @@ public final class LocType { } else { local60 = new SoftwareModel(local69, this.anInt4407 + 64, this.anInt4405 * 5 + 768, -50, -10, -50); } - Static93.aClass99_14.put(local60, local29); + LocTypeList.aClass99_14.put(local60, local29); } if (local50) { local60 = ((RawModel) local60).method1675(); @@ -828,18 +828,18 @@ public final class LocType { @Pc(30) long local30; if (!GlRenderer.enabled) { if (this.shapes == null) { - local30 = (this.anInt4426 << 10) + arg5; + local30 = (this.id << 10) + arg5; } else { - local30 = arg5 + (this.anInt4426 << 10) + (arg11 << 3); + local30 = arg5 + (this.id << 10) + (arg11 << 3); } - @Pc(195) SoftwareModel local195 = (SoftwareModel) Static262.aClass99_36.get(local30); + @Pc(195) SoftwareModel local195 = (SoftwareModel) LocTypeList.aClass99_36.get(local30); if (local195 == null) { @Pc(204) RawModel local204 = this.method3418(arg5, arg11); if (local204 == null) { return null; } local195 = new SoftwareModel(local204, this.anInt4407 + 64, this.anInt4405 * 5 + 768, -50, -10, -50); - Static262.aClass99_36.put(local195, local30); + LocTypeList.aClass99_36.put(local195, local30); } @Pc(234) boolean local234 = false; if (arg4 != null) { @@ -863,11 +863,11 @@ public final class LocType { return Static171.aClass139_1; } if (this.shapes == null) { - local30 = arg5 + (this.anInt4426 << 10); + local30 = arg5 + (this.id << 10); } else { - local30 = (arg11 << 3) + ((this.anInt4426 << 10) + arg5); + local30 = (arg11 << 3) + ((this.id << 10) + arg5); } - @Pc(46) GlModel local46 = (GlModel) Static262.aClass99_36.get(local30); + @Pc(46) GlModel local46 = (GlModel) LocTypeList.aClass99_36.get(local30); if (local46 == null) { local46 = this.method3427(arg5, true, arg11); if (local46 == null) { @@ -875,7 +875,7 @@ public final class LocType { } local46.method4099(); local46.method4111(false, false, false, false, false, true); - Static262.aClass99_36.put(local46, local30); + LocTypeList.aClass99_36.put(local46, local30); } @Pc(80) boolean local80 = false; @Pc(82) GlModel local82 = local46; diff --git a/client/src/main/java/LocTypeList.java b/client/src/main/java/LocTypeList.java new file mode 100644 index 0000000..8255ab5 --- /dev/null +++ b/client/src/main/java/LocTypeList.java @@ -0,0 +1,93 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class LocTypeList { + @OriginalMember(owner = "client!oe", name = "j", descriptor = "Lclient!n;") + public static final SoftLruHashTable types = new SoftLruHashTable(64); + @OriginalMember(owner = "client!nf", name = "f", descriptor = "Lclient!n;") + public static final SoftLruHashTable aClass99_24 = new SoftLruHashTable(500); + @OriginalMember(owner = "client!he", name = "fb", descriptor = "Lclient!n;") + public static final SoftLruHashTable aClass99_14 = new SoftLruHashTable(30); + @OriginalMember(owner = "client!vf", name = "l", descriptor = "Lclient!n;") + public static final SoftLruHashTable aClass99_36 = new SoftLruHashTable(50); + @OriginalMember(owner = "client!cg", name = "c", descriptor = "Z") + public static boolean allowMembers; + @OriginalMember(owner = "client!lg", name = "g", descriptor = "Lclient!ve;") + public static Js5 locsArchive; + @OriginalMember(owner = "client!jg", name = "j", descriptor = "Lclient!ve;") + public static Js5 modelsArchive; + + @OriginalMember(owner = "client!wc", name = "a", descriptor = "(II)Lclient!pb;") + public static LocType get(@OriginalArg(1) int id) { + @Pc(15) LocType local15 = (LocType) types.get((long) id); + if (local15 != null) { + return local15; + } + @Pc(30) byte[] local30 = locsArchive.getFile(getGroupId(id), getFileId(id)); + local15 = new LocType(); + local15.id = id; + if (local30 != null) { + local15.decode(new Buffer(local30)); + } + local15.postDecode(); + if (!allowMembers && local15.members) { + local15.ops = null; + } + if (local15.aBoolean210) { + local15.anInt4435 = 0; + local15.aBoolean207 = false; + } + types.put(local15, (long) id); + return local15; + } + + @OriginalMember(owner = "client!ui", name = "c", descriptor = "(II)I") + public static int getGroupId(@OriginalArg(0) int arg0) { + return arg0 >>> 8; + } + + @OriginalMember(owner = "client!cj", name = "a", descriptor = "(IB)I") + public static int getFileId(@OriginalArg(0) int arg0) { + return arg0 & 0xFF; + } + + @OriginalMember(owner = "client!oi", name = "a", descriptor = "(ILclient!ve;Lclient!ve;Z)V") + public static void init(@OriginalArg(1) Js5 arg0, @OriginalArg(2) Js5 arg1) { + allowMembers = true; + modelsArchive = arg1; + locsArchive = arg0; + } + + @OriginalMember(owner = "client!oe", name = "b", descriptor = "(I)V") + public static void method3323() { + types.method3103(); + aClass99_24.method3103(); + aClass99_14.method3103(); + aClass99_36.method3103(); + } + + @OriginalMember(owner = "client!va", name = "b", descriptor = "(II)V") + public static void clean() { + types.clean(5); + aClass99_24.clean(5); + aClass99_14.clean(5); + aClass99_36.clean(5); + } + + @OriginalMember(owner = "client!hb", name = "c", descriptor = "(I)V") + public static void clear() { + types.clear(); + aClass99_24.clear(); + aClass99_14.clear(); + aClass99_36.clear(); + } + + @OriginalMember(owner = "client!pe", name = "a", descriptor = "(BZ)V") + public static void setAllowMembers(@OriginalArg(1) boolean arg0) { + if (arg0 != allowMembers) { + allowMembers = arg0; + clear(); + } + } +} diff --git a/client/src/main/java/LocalizedText.java b/client/src/main/java/LocalizedText.java index 5a8f8f7..6f89f85 100644 --- a/client/src/main/java/LocalizedText.java +++ b/client/src/main/java/LocalizedText.java @@ -4,265 +4,265 @@ import org.openrs2.deob.annotation.OriginalMember; public class LocalizedText { //region English Translations @OriginalMember(owner = "client!ui", name = "ob", descriptor = "Lclient!na;") - private static final JagString ENG_ATTACK = Static28.parse("Attack"); + private static final JagString ENG_ATTACK = JagString.parse("Attack"); @OriginalMember(owner = "client!vf", name = "d", descriptor = "Lclient!na;") - private static final JagString ENG_ATTEMPT_TO_REESTABLISH = Static28.parse("Please wait )2 attempting to reestablish)3"); + private static final JagString ENG_ATTEMPT_TO_REESTABLISH = JagString.parse("Please wait )2 attempting to reestablish)3"); @OriginalMember(owner = "client!wb", name = "i", descriptor = "Lclient!na;") - private static final JagString ENG_CANCEL = Static28.parse("Cancel"); + private static final JagString ENG_CANCEL = JagString.parse("Cancel"); @OriginalMember(owner = "client!bk", name = "I", descriptor = "Lclient!na;") - private static final JagString ENG_CHATCOL0 = Static28.parse("yellow:"); + private static final JagString ENG_CHATCOL0 = JagString.parse("yellow:"); @OriginalMember(owner = "client!lb", name = "x", descriptor = "Lclient!na;") - private static final JagString ENG_CHATCOL1 = Static28.parse("red:"); + private static final JagString ENG_CHATCOL1 = JagString.parse("red:"); @OriginalMember(owner = "client!h", name = "Bb", descriptor = "Lclient!na;") - private static final JagString ENG_CHATCOL2 = Static28.parse("green:"); + private static final JagString ENG_CHATCOL2 = JagString.parse("green:"); @OriginalMember(owner = "client!client", name = "eb", descriptor = "Lclient!na;") - private static final JagString ENG_CHATCOL3 = Static28.parse("cyan:"); + private static final JagString ENG_CHATCOL3 = JagString.parse("cyan:"); @OriginalMember(owner = "client!hd", name = "h", descriptor = "Lclient!na;") - private static final JagString ENG_CHATCOL4 = Static28.parse("purple:"); + private static final JagString ENG_CHATCOL4 = JagString.parse("purple:"); @OriginalMember(owner = "client!bf", name = "y", descriptor = "Lclient!na;") - private static final JagString ENG_CHATCOL5 = Static28.parse("white:"); + private static final JagString ENG_CHATCOL5 = JagString.parse("white:"); @OriginalMember(owner = "client!mg", name = "U", descriptor = "Lclient!na;") - private static final JagString ENG_CHATCOL6 = Static28.parse("flash1:"); + private static final JagString ENG_CHATCOL6 = JagString.parse("flash1:"); @OriginalMember(owner = "client!tm", name = "n", descriptor = "Lclient!na;") - private static final JagString ENG_CHATCOL7 = Static28.parse("flash2:"); + private static final JagString ENG_CHATCOL7 = JagString.parse("flash2:"); @OriginalMember(owner = "client!km", name = "Cc", descriptor = "Lclient!na;") - private static final JagString ENG_CHATCOL8 = Static28.parse("flash3:"); + private static final JagString ENG_CHATCOL8 = JagString.parse("flash3:"); @OriginalMember(owner = "client!aa", name = "r", descriptor = "Lclient!na;") - private static final JagString ENG_CHATCOL9 = Static28.parse("glow1:"); + private static final JagString ENG_CHATCOL9 = JagString.parse("glow1:"); @OriginalMember(owner = "client!vf", name = "j", descriptor = "Lclient!na;") - private static final JagString ENG_CHATCOL10 = Static28.parse("glow2:"); + private static final JagString ENG_CHATCOL10 = JagString.parse("glow2:"); @OriginalMember(owner = "client!ah", name = "m", descriptor = "Lclient!na;") - private static final JagString ENG_CHATCOL11 = Static28.parse("glow3:"); + private static final JagString ENG_CHATCOL11 = JagString.parse("glow3:"); @OriginalMember(owner = "client!dc", name = "E", descriptor = "Lclient!na;") - private static final JagString ENG_CHATEFFECT1 = Static28.parse("wave:"); + private static final JagString ENG_CHATEFFECT1 = JagString.parse("wave:"); @OriginalMember(owner = "client!pg", name = "ib", descriptor = "Lclient!na;") - private static final JagString ENG_CHATEFFECT2 = Static28.parse("wave2:"); + private static final JagString ENG_CHATEFFECT2 = JagString.parse("wave2:"); @OriginalMember(owner = "client!rm", name = "h", descriptor = "Lclient!na;") - private static final JagString ENG_CHATEFFECT3 = Static28.parse("shake:"); + private static final JagString ENG_CHATEFFECT3 = JagString.parse("shake:"); @OriginalMember(owner = "client!ef", name = "m", descriptor = "Lclient!na;") - private static final JagString ENG_CHATEFFECT4 = Static28.parse("scroll:"); + private static final JagString ENG_CHATEFFECT4 = JagString.parse("scroll:"); @OriginalMember(owner = "client!eg", name = "B", descriptor = "Lclient!na;") - private static final JagString ENG_CHATEFFECT5 = Static28.parse("slide:"); + private static final JagString ENG_CHATEFFECT5 = JagString.parse("slide:"); @OriginalMember(owner = "client!bm", name = "d", descriptor = "Lclient!na;") - private static final JagString ENG_CHECKING_FOR_UPDATES = Static28.parse("Checking for updates )2 "); + private static final JagString ENG_CHECKING_FOR_UPDATES = JagString.parse("Checking for updates )2 "); @OriginalMember(owner = "client!ta", name = "q", descriptor = "Lclient!na;") - private static final JagString ENG_CHOOSE_OPTION = Static28.parse("Choose Option"); + private static final JagString ENG_CHOOSE_OPTION = JagString.parse("Choose Option"); @OriginalMember(owner = "client!d", name = "fb", descriptor = "Lclient!na;") - private static final JagString ENG_CLOSE = Static28.parse("Close"); + private static final JagString ENG_CLOSE = JagString.parse("Close"); @OriginalMember(owner = "client!sm", name = "f", descriptor = "Lclient!na;") - private static final JagString ENG_CONLOST = Static28.parse("Connection lost)3"); + private static final JagString ENG_CONLOST = JagString.parse("Connection lost)3"); @OriginalMember(owner = "client!ig", name = "c", descriptor = "Lclient!na;") - private static final JagString ENG_CONTINUE = Static28.parse("Continue"); + private static final JagString ENG_CONTINUE = JagString.parse("Continue"); @OriginalMember(owner = "client!dc", name = "R", descriptor = "Lclient!na;") - private static final JagString ENG_DROP = Static28.parse("Drop"); + private static final JagString ENG_DROP = JagString.parse("Drop"); @OriginalMember(owner = "client!li", name = "u", descriptor = "Lclient!na;") - private static final JagString ENG_EXAMINE = Static28.parse("Examine"); + private static final JagString ENG_EXAMINE = JagString.parse("Examine"); @OriginalMember(owner = "client!sd", name = "M", descriptor = "Lclient!na;") - private static final JagString ENG_FACEHERE = Static28.parse("Face here"); + private static final JagString ENG_FACEHERE = JagString.parse("Face here"); @OriginalMember(owner = "client!ii", name = "g", descriptor = "Lclient!na;") - private static final JagString ENG_FRIENDCANTADDSELF = Static28.parse("You can(Wt add yourself to your own friend list)3"); + private static final JagString ENG_FRIENDCANTADDSELF = JagString.parse("You can(Wt add yourself to your own friend list)3"); @OriginalMember(owner = "client!lk", name = "S", descriptor = "Lclient!na;") - private static final JagString ENG_FRIENDLISTDUPE = Static28.parse(" is already on your friend list)3"); + private static final JagString ENG_FRIENDLISTDUPE = JagString.parse(" is already on your friend list)3"); @OriginalMember(owner = "client!t", name = "B", descriptor = "Lclient!na;") - private static final JagString ENG_FRIENDLISTFULL = Static28.parse("Your friend list is full)3 Max of 100 for free users)1 and 200 for members)3"); + private static final JagString ENG_FRIENDLISTFULL = JagString.parse("Your friend list is full)3 Max of 100 for free users)1 and 200 for members)3"); @OriginalMember(owner = "client!c", name = "W", descriptor = "Lclient!na;") - private static final JagString ENG_FRIENDLOGIN = Static28.parse(" has logged in)3"); + private static final JagString ENG_FRIENDLOGIN = JagString.parse(" has logged in)3"); @OriginalMember(owner = "client!hd", name = "o", descriptor = "Lclient!na;") - private static final JagString ENG_FRIENDLOGOUT = Static28.parse(" has logged out)3"); + private static final JagString ENG_FRIENDLOGOUT = JagString.parse(" has logged out)3"); @OriginalMember(owner = "client!ec", name = "r", descriptor = "Lclient!na;") - private static final JagString ENG_GAME0_LOADING = Static28.parse("RuneScape is loading )2 please wait)3)3)3"); + private static final JagString ENG_GAME0_LOADING = JagString.parse("RuneScape is loading )2 please wait)3)3)3"); @OriginalMember(owner = "client!an", name = "Z", descriptor = "Lclient!na;") - private static final JagString ENG_HIDDEN = Static28.parse("Hidden"); + private static final JagString ENG_HIDDEN = JagString.parse("Hidden"); @OriginalMember(owner = "client!nb", name = "b", descriptor = "Lclient!na;") - private static final JagString ENG_IGNORECANTADDSELF = Static28.parse("You can(Wt add yourself to your own ignore list)3"); + private static final JagString ENG_IGNORECANTADDSELF = JagString.parse("You can(Wt add yourself to your own ignore list)3"); @OriginalMember(owner = "client!ol", name = "X", descriptor = "Lclient!na;") - private static final JagString ENG_IGNORELISTDUPE = Static28.parse(" is already on your ignore list)3"); + private static final JagString ENG_IGNORELISTDUPE = JagString.parse(" is already on your ignore list)3"); @OriginalMember(owner = "client!u", name = "l", descriptor = "Lclient!na;") - private static final JagString ENG_IGNORELISTFULL = Static28.parse("Your ignore list is full)3 Max of 100 users)3"); + private static final JagString ENG_IGNORELISTFULL = JagString.parse("Your ignore list is full)3 Max of 100 users)3"); @OriginalMember(owner = "client!ck", name = "b", descriptor = "Lclient!na;") - private static final JagString ENG_LENT_ITEM_RETURN = Static28.parse("Discard"); + private static final JagString ENG_LENT_ITEM_RETURN = JagString.parse("Discard"); @OriginalMember(owner = "client!ef", name = "s", descriptor = "Lclient!na;") - private static final JagString ENG_LEVEL = Static28.parse("level: "); + private static final JagString ENG_LEVEL = JagString.parse("level: "); @OriginalMember(owner = "client!nh", name = "bb", descriptor = "Lclient!na;") - private static final JagString ENG_LOADING = Static28.parse("Loading )2 please wait)3"); + private static final JagString ENG_LOADING = JagString.parse("Loading )2 please wait)3"); @OriginalMember(owner = "client!dm", name = "B", descriptor = "Lclient!na;") - private static final JagString ENG_LOADINGDOTDOTDOT = Static28.parse("Loading)3)3)3"); + private static final JagString ENG_LOADINGDOTDOTDOT = JagString.parse("Loading)3)3)3"); @OriginalMember(owner = "client!kd", name = "kb", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD0 = Static28.parse("Allocating memory"); + private static final JagString ENG_MAINLOAD0 = JagString.parse("Allocating memory"); @OriginalMember(owner = "client!na", name = "ob", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD0B = Static28.parse("Allocated memory"); + private static final JagString ENG_MAINLOAD0B = JagString.parse("Allocated memory"); @OriginalMember(owner = "client!il", name = "J", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD10B = Static28.parse("Created gameworld"); + private static final JagString ENG_MAINLOAD10B = JagString.parse("Created gameworld"); @OriginalMember(owner = "client!vj", name = "h", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD30 = Static28.parse("Connecting to update server"); + private static final JagString ENG_MAINLOAD30 = JagString.parse("Connecting to update server"); @OriginalMember(owner = "client!od", name = "b", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD30B = Static28.parse("Connected to update server"); + private static final JagString ENG_MAINLOAD30B = JagString.parse("Connected to update server"); @OriginalMember(owner = "client!ba", name = "s", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD40B = Static28.parse("Loaded update list"); + private static final JagString ENG_MAINLOAD40B = JagString.parse("Loaded update list"); @OriginalMember(owner = "client!se", name = "b", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD45B = Static28.parse("Prepared sound engine"); + private static final JagString ENG_MAINLOAD45B = JagString.parse("Prepared sound engine"); @OriginalMember(owner = "client!lk", name = "P", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD50 = Static28.parse("Loading fonts )2 "); + private static final JagString ENG_MAINLOAD50 = JagString.parse("Loading fonts )2 "); @OriginalMember(owner = "client!tl", name = "e", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD50B = Static28.parse("Loaded fonts"); + private static final JagString ENG_MAINLOAD50B = JagString.parse("Loaded fonts"); @OriginalMember(owner = "client!dm", name = "v", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD60 = Static28.parse("Loading title screen )2 "); + private static final JagString ENG_MAINLOAD60 = JagString.parse("Loading title screen )2 "); @OriginalMember(owner = "client!cb", name = "gb", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD60B = Static28.parse("Loaded title screen"); + private static final JagString ENG_MAINLOAD60B = JagString.parse("Loaded title screen"); @OriginalMember(owner = "client!dl", name = "j", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD65B = Static28.parse("Opened title screen"); + private static final JagString ENG_MAINLOAD65B = JagString.parse("Opened title screen"); @OriginalMember(owner = "client!bk", name = "K", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD70 = Static28.parse("Loading config )2 "); + private static final JagString ENG_MAINLOAD70 = JagString.parse("Loading config )2 "); @OriginalMember(owner = "client!fn", name = "P", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD70B = Static28.parse("Loaded config"); + private static final JagString ENG_MAINLOAD70B = JagString.parse("Loaded config"); @OriginalMember(owner = "client!vc", name = "X", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD80 = Static28.parse("Loading sprites )2 "); + private static final JagString ENG_MAINLOAD80 = JagString.parse("Loading sprites )2 "); @OriginalMember(owner = "client!sc", name = "w", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD80B = Static28.parse("Loaded sprites"); + private static final JagString ENG_MAINLOAD80B = JagString.parse("Loaded sprites"); @OriginalMember(owner = "client!ub", name = "n", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD90 = Static28.parse("Loading textures )2 "); + private static final JagString ENG_MAINLOAD90 = JagString.parse("Loading textures )2 "); @OriginalMember(owner = "client!gm", name = "fb", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD90B = Static28.parse("Loaded textures"); + private static final JagString ENG_MAINLOAD90B = JagString.parse("Loaded textures"); @OriginalMember(owner = "client!ni", name = "p", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD110B = Static28.parse("Loaded input handler"); + private static final JagString ENG_MAINLOAD110B = JagString.parse("Loaded input handler"); @OriginalMember(owner = "client!li", name = "b", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD120 = Static28.parse("Loading wordpack )2 "); + private static final JagString ENG_MAINLOAD120 = JagString.parse("Loading wordpack )2 "); @OriginalMember(owner = "client!pl", name = "b", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD120B = Static28.parse("Loaded wordpack"); + private static final JagString ENG_MAINLOAD120B = JagString.parse("Loaded wordpack"); @OriginalMember(owner = "client!bg", name = "O", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD130 = Static28.parse("Loading interfaces )2 "); + private static final JagString ENG_MAINLOAD130 = JagString.parse("Loading interfaces )2 "); @OriginalMember(owner = "client!wa", name = "D", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD130B = Static28.parse("Loaded interfaces"); + private static final JagString ENG_MAINLOAD130B = JagString.parse("Loaded interfaces"); @OriginalMember(owner = "client!r", name = "c", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD135 = Static28.parse("Loading world list data"); + private static final JagString ENG_MAINLOAD135 = JagString.parse("Loading world list data"); @OriginalMember(owner = "client!ck", name = "o", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD135B = Static28.parse("Loaded world list data"); + private static final JagString ENG_MAINLOAD135B = JagString.parse("Loaded world list data"); @OriginalMember(owner = "client!cn", name = "J", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD140 = Static28.parse("Starting 3d Library"); + private static final JagString ENG_MAINLOAD140 = JagString.parse("Starting 3d Library"); @OriginalMember(owner = "client!rg", name = "u", descriptor = "Lclient!na;") - private static final JagString ENG_MAINLOAD150B = Static28.parse("Started 3d Library"); + private static final JagString ENG_MAINLOAD150B = JagString.parse("Started 3d Library"); @OriginalMember(owner = "client!qc", name = "Z", descriptor = "Lclient!na;") - private static final JagString ENG_MEMBERS_OBJECT = Static28.parse("Members object"); + private static final JagString ENG_MEMBERS_OBJECT = JagString.parse("Members object"); @OriginalMember(owner = "client!fh", name = "W", descriptor = "Lclient!na;") - private static final JagString ENG_MILLION_SUFFIX = Static28.parse("M"); + private static final JagString ENG_MILLION_SUFFIX = JagString.parse("M"); @OriginalMember(owner = "client!qk", name = "l", descriptor = "Lclient!na;") - private static final JagString ENG_MINISEPARATOR = Static28.parse(" "); + private static final JagString ENG_MINISEPARATOR = JagString.parse(" "); @OriginalMember(owner = "client!ui", name = "ab", descriptor = "Lclient!na;") - private static final JagString ENG_MOREOPTIONS = Static28.parse(" more options"); + private static final JagString ENG_MOREOPTIONS = JagString.parse(" more options"); @OriginalMember(owner = "client!ph", name = "c", descriptor = "Lclient!na;") - private static final JagString ENG_OK = Static28.parse("Ok"); + private static final JagString ENG_OK = JagString.parse("Ok"); @OriginalMember(owner = "client!bj", name = "z", descriptor = "Lclient!na;") - private static final JagString ENG_PLEASEWAIT = Static28.parse("Please wait)3)3)3"); + private static final JagString ENG_PLEASEWAIT = JagString.parse("Please wait)3)3)3"); @OriginalMember(owner = "client!mf", name = "T", descriptor = "Lclient!na;") - private static final JagString ENG_RATING = Static28.parse("rating: "); + private static final JagString ENG_RATING = JagString.parse("rating: "); @OriginalMember(owner = "client!pm", name = "gb", descriptor = "Lclient!na;") - private static final JagString ENG_REMOVEFRIEND = Static28.parse(" from your friend list first)3"); + private static final JagString ENG_REMOVEFRIEND = JagString.parse(" from your friend list first)3"); @OriginalMember(owner = "client!rc", name = "v", descriptor = "Lclient!na;") - private static final JagString ENG_REMOVEIGNORE = Static28.parse(" from your ignore list first)3"); + private static final JagString ENG_REMOVEIGNORE = JagString.parse(" from your ignore list first)3"); @OriginalMember(owner = "client!fk", name = "b", descriptor = "Lclient!na;") - private static final JagString ENG_REMOVESOCIAL = Static28.parse("Please remove "); + private static final JagString ENG_REMOVESOCIAL = JagString.parse("Please remove "); @OriginalMember(owner = "client!se", name = "o", descriptor = "Lclient!na;") - private static final JagString ENG_SELECT = Static28.parse("Select"); + private static final JagString ENG_SELECT = JagString.parse("Select"); @OriginalMember(owner = "client!ef", name = "k", descriptor = "Lclient!na;") - private static final JagString ENG_SKILL = Static28.parse("skill: "); + private static final JagString ENG_SKILL = JagString.parse("skill: "); @OriginalMember(owner = "client!si", name = "hb", descriptor = "Lclient!na;") - private static final JagString ENG_TAKE = Static28.parse("Take"); + private static final JagString ENG_TAKE = JagString.parse("Take"); @OriginalMember(owner = "client!cl", name = "N", descriptor = "Lclient!na;") - private static final JagString ENG_THOUSAND_SUFFIX = Static28.parse("K"); + private static final JagString ENG_THOUSAND_SUFFIX = JagString.parse("K"); @OriginalMember(owner = "client!ea", name = "q", descriptor = "Lclient!na;") - private static final JagString ENG_TRADEREQ = Static28.parse("wishes to trade with you)3"); + private static final JagString ENG_TRADEREQ = JagString.parse("wishes to trade with you)3"); @OriginalMember(owner = "client!gi", name = "f", descriptor = "Lclient!na;") - private static final JagString ENG_UNABLETOFIND = Static28.parse("Unable to find "); + private static final JagString ENG_UNABLETOFIND = JagString.parse("Unable to find "); @OriginalMember(owner = "client!sa", name = "U", descriptor = "Lclient!na;") - private static final JagString ENG_USE = Static28.parse("Use"); + private static final JagString ENG_USE = JagString.parse("Use"); @OriginalMember(owner = "client!ib", name = "m", descriptor = "Lclient!na;") - private static final JagString ENG_WALKHERE = Static28.parse("Walk here"); + private static final JagString ENG_WALKHERE = JagString.parse("Walk here"); //endregion //region Stable Translations (chat effects/colors) @@ -594,265 +594,265 @@ public class LocalizedText { // TODO: unsorted //region German Translations @OriginalMember(owner = "client!vk", name = "l", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD135 = Static28.parse("Lade Liste der Welten"); + public static final JagString GER_MAINLOAD135 = JagString.parse("Lade Liste der Welten"); @OriginalMember(owner = "client!eg", name = "A", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD80B = Static28.parse("Sprites geladen)3"); + public static final JagString GER_MAINLOAD80B = JagString.parse("Sprites geladen)3"); @OriginalMember(owner = "client!eh", name = "h", descriptor = "Lclient!na;") - public static final JagString GER_TRADEREQ = Static28.parse("m-Ochte mit Ihnen handeln)3"); + public static final JagString GER_TRADEREQ = JagString.parse("m-Ochte mit Ihnen handeln)3"); @OriginalMember(owner = "client!eh", name = "i", descriptor = "Lclient!na;") - public static final JagString GER_REMOVEFRIEND = Static28.parse(" zuerst von Ihrer Freunde)2Liste(Q"); + public static final JagString GER_REMOVEFRIEND = JagString.parse(" zuerst von Ihrer Freunde)2Liste(Q"); @OriginalMember(owner = "client!ed", name = "r", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD120B = Static28.parse("Wordpack geladen)3"); + public static final JagString GER_MAINLOAD120B = JagString.parse("Wordpack geladen)3"); @OriginalMember(owner = "client!dk", name = "i", descriptor = "Lclient!na;") - public static final JagString GER_CHATCOL6 = Static28.parse("blinken1:"); + public static final JagString GER_CHATCOL6 = JagString.parse("blinken1:"); @OriginalMember(owner = "client!dm", name = "h", descriptor = "Lclient!na;") - public static final JagString GER_REMOVESOCIAL = Static28.parse("Bitte entfernen Sie "); + public static final JagString GER_REMOVESOCIAL = JagString.parse("Bitte entfernen Sie "); @OriginalMember(owner = "client!ck", name = "c", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD70 = Static28.parse("Lade Konfiguration )2 "); + public static final JagString GER_MAINLOAD70 = JagString.parse("Lade Konfiguration )2 "); @OriginalMember(owner = "client!cm", name = "h", descriptor = "Lclient!na;") - public static final JagString GER_CONLOST = Static28.parse("Verbindung abgebrochen)3"); + public static final JagString GER_CONLOST = JagString.parse("Verbindung abgebrochen)3"); @OriginalMember(owner = "client!cn", name = "s", descriptor = "Lclient!na;") - public static final JagString GER_CHATCOL4 = Static28.parse("lila:"); + public static final JagString GER_CHATCOL4 = JagString.parse("lila:"); @OriginalMember(owner = "client!cn", name = "C", descriptor = "Lclient!na;") - public static final JagString GER_CHATCOL1 = Static28.parse("rot:"); + public static final JagString GER_CHATCOL1 = JagString.parse("rot:"); @OriginalMember(owner = "client!cd", name = "y", descriptor = "Lclient!na;") - public static final JagString GER_CHECKING_FOR_UPDATES = Static28.parse("Suche nach Updates )2 "); + public static final JagString GER_CHECKING_FOR_UPDATES = JagString.parse("Suche nach Updates )2 "); @OriginalMember(owner = "client!cd", name = "D", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD120 = Static28.parse("Lade Wordpack )2 "); + public static final JagString GER_MAINLOAD120 = JagString.parse("Lade Wordpack )2 "); @OriginalMember(owner = "client!ce", name = "m", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD90 = Static28.parse("Lade Texturen )2 "); + public static final JagString GER_MAINLOAD90 = JagString.parse("Lade Texturen )2 "); @OriginalMember(owner = "client!cg", name = "d", descriptor = "Lclient!na;") - public static final JagString GER_LENT_ITEM_RETURN = Static28.parse("Ablegen"); + public static final JagString GER_LENT_ITEM_RETURN = JagString.parse("Ablegen"); @OriginalMember(owner = "client!bj", name = "p", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD70B = Static28.parse("Konfig geladen)3"); + public static final JagString GER_MAINLOAD70B = JagString.parse("Konfig geladen)3"); @OriginalMember(owner = "client!bj", name = "U", descriptor = "Lclient!na;") - public static final JagString GER_CHATEFFECT2 = Static28.parse("welle2:"); + public static final JagString GER_CHATEFFECT2 = JagString.parse("welle2:"); @OriginalMember(owner = "client!bk", name = "P", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD0 = Static28.parse("Speicher wird zugewiesen)3"); + public static final JagString GER_MAINLOAD0 = JagString.parse("Speicher wird zugewiesen)3"); @OriginalMember(owner = "client!bd", name = "d", descriptor = "Lclient!na;") - public static final JagString GER_SELECT = Static28.parse("Ausw-=hlen"); + public static final JagString GER_SELECT = JagString.parse("Ausw-=hlen"); @OriginalMember(owner = "client!bb", name = "N", descriptor = "Lclient!na;") - public static final JagString GER_CHATCOL0 = Static28.parse("gelb:"); + public static final JagString GER_CHATCOL0 = JagString.parse("gelb:"); @OriginalMember(owner = "client!an", name = "eb", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD50 = Static28.parse("Lade Schrifts-=tze )2 "); + public static final JagString GER_MAINLOAD50 = JagString.parse("Lade Schrifts-=tze )2 "); @OriginalMember(owner = "client!ba", name = "E", descriptor = "Lclient!na;") - public static final JagString GER_LEVEL = Static28.parse("Stufe: "); + public static final JagString GER_LEVEL = JagString.parse("Stufe: "); @OriginalMember(owner = "client!af", name = "f", descriptor = "Lclient!na;") - public static final JagString GER_MEMBERS_OBJECT = Static28.parse("Gegenstand f-Ur Mitglieder"); + public static final JagString GER_MEMBERS_OBJECT = JagString.parse("Gegenstand f-Ur Mitglieder"); @OriginalMember(owner = "client!be", name = "Zc", descriptor = "Lclient!na;") - public static final JagString GER_TAKE = Static28.parse("Nehmen"); + public static final JagString GER_TAKE = JagString.parse("Nehmen"); @OriginalMember(owner = "client!se", name = "s", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD110B = Static28.parse("Eingabeprozedur geladen)3"); + public static final JagString GER_MAINLOAD110B = JagString.parse("Eingabeprozedur geladen)3"); @OriginalMember(owner = "client!gm", name = "eb", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD80 = Static28.parse("Lade Sprites )2 "); + public static final JagString GER_MAINLOAD80 = JagString.parse("Lade Sprites )2 "); @OriginalMember(owner = "client!qj", name = "h", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD90B = Static28.parse("Texturen geladen)3"); + public static final JagString GER_MAINLOAD90B = JagString.parse("Texturen geladen)3"); @OriginalMember(owner = "client!rb", name = "e", descriptor = "Lclient!na;") - public static final JagString GER_HIDDEN = Static28.parse("Versteckt"); + public static final JagString GER_HIDDEN = JagString.parse("Versteckt"); @OriginalMember(owner = "client!tk", name = "x", descriptor = "Lclient!na;") - public static final JagString GER_FRIENDLISTDUPE = Static28.parse(" steht bereits auf Ihrer Freunde)2Liste(Q"); + public static final JagString GER_FRIENDLISTDUPE = JagString.parse(" steht bereits auf Ihrer Freunde)2Liste(Q"); @OriginalMember(owner = "client!nk", name = "o", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD65B = Static28.parse("Titelbild ge-Offnet)3"); + public static final JagString GER_MAINLOAD65B = JagString.parse("Titelbild ge-Offnet)3"); @OriginalMember(owner = "client!nm", name = "R", descriptor = "Lclient!na;") - public static final JagString GER_CLOSE = Static28.parse("Schlie-8en"); + public static final JagString GER_CLOSE = JagString.parse("Schlie-8en"); @OriginalMember(owner = "client!s", name = "j", descriptor = "Lclient!na;") - public static final JagString GER_FRIENDCANTADDSELF = Static28.parse("Sie k-Onnen sich selbst nicht auf Ihre Freunde)2Liste setzen(Q"); + public static final JagString GER_FRIENDCANTADDSELF = JagString.parse("Sie k-Onnen sich selbst nicht auf Ihre Freunde)2Liste setzen(Q"); @OriginalMember(owner = "client!oe", name = "k", descriptor = "Lclient!na;") - public static final JagString GER_CHATCOL11 = Static28.parse("leuchten3:"); + public static final JagString GER_CHATCOL11 = JagString.parse("leuchten3:"); @OriginalMember(owner = "client!pg", name = "W", descriptor = "Lclient!na;") - public static final JagString GER_FRIENDLOGIN = Static28.parse(" loggt sich ein)3"); + public static final JagString GER_FRIENDLOGIN = JagString.parse(" loggt sich ein)3"); @OriginalMember(owner = "client!pg", name = "Y", descriptor = "Lclient!na;") - public static final JagString GER_CHATCOL9 = Static28.parse("leuchten1:"); + public static final JagString GER_CHATCOL9 = JagString.parse("leuchten1:"); @OriginalMember(owner = "client!g", name = "b", descriptor = "Lclient!na;") - public static final JagString GER_FRIENDLISTFULL = Static28.parse("Ihre Freunde)2Liste ist voll(Q Maximale Eintr-=ge: Mitglieder 200)4freie Spieler 100"); + public static final JagString GER_FRIENDLISTFULL = JagString.parse("Ihre Freunde)2Liste ist voll(Q Maximale Eintr-=ge: Mitglieder 200)4freie Spieler 100"); @OriginalMember(owner = "client!ui", name = "hb", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD50B = Static28.parse("Schrifts-=tze geladen)3"); + public static final JagString GER_MAINLOAD50B = JagString.parse("Schrifts-=tze geladen)3"); @OriginalMember(owner = "client!na", name = "p", descriptor = "Lclient!na;") - public static final JagString GER_ATTEMPT_TO_REESTABLISH = Static28.parse("Bitte warten Sie )2 es wird versucht)1 die Verbindung wiederherzustellen)3"); + public static final JagString GER_ATTEMPT_TO_REESTABLISH = JagString.parse("Bitte warten Sie )2 es wird versucht)1 die Verbindung wiederherzustellen)3"); @OriginalMember(owner = "client!fc", name = "d", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD130 = Static28.parse("Lade Benutzeroberfl-=che )2 "); + public static final JagString GER_MAINLOAD130 = JagString.parse("Lade Benutzeroberfl-=che )2 "); @OriginalMember(owner = "client!em", name = "A", descriptor = "Lclient!na;") - public static final JagString GER_CHATCOL8 = Static28.parse("blinken3:"); + public static final JagString GER_CHATCOL8 = JagString.parse("blinken3:"); @OriginalMember(owner = "client!q", name = "b", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD30B = Static28.parse("Verbindung zum Update)2Server hergestellt)3"); + public static final JagString GER_MAINLOAD30B = JagString.parse("Verbindung zum Update)2Server hergestellt)3"); @OriginalMember(owner = "client!gi", name = "l", descriptor = "Lclient!na;") - public static final JagString GER_CHATCOL3 = Static28.parse("blaugr-Un:"); + public static final JagString GER_CHATCOL3 = JagString.parse("blaugr-Un:"); @OriginalMember(owner = "client!jm", name = "w", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD150B = Static28.parse("3D)2Softwarebibliothek gestartet)3"); + public static final JagString GER_MAINLOAD150B = JagString.parse("3D)2Softwarebibliothek gestartet)3"); @OriginalMember(owner = "client!ig", name = "e", descriptor = "Lclient!na;") - public static final JagString GER_LOADING = Static28.parse("Ladevorgang )2 bitte warten Sie)3"); + public static final JagString GER_LOADING = JagString.parse("Ladevorgang )2 bitte warten Sie)3"); @OriginalMember(owner = "client!ta", name = "m", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD0B = Static28.parse("Zugewiesener Speicher)3"); + public static final JagString GER_MAINLOAD0B = JagString.parse("Zugewiesener Speicher)3"); @OriginalMember(owner = "client!sc", name = "k", descriptor = "Lclient!na;") - public static final JagString GER_FACEHERE = Static28.parse("Hierhin drehen"); + public static final JagString GER_FACEHERE = JagString.parse("Hierhin drehen"); @OriginalMember(owner = "client!ub", name = "a", descriptor = "Lclient!na;") - public static final JagString GER_CHATCOL7 = Static28.parse("blinken2:"); + public static final JagString GER_CHATCOL7 = JagString.parse("blinken2:"); @OriginalMember(owner = "client!h", name = "yb", descriptor = "Lclient!na;") - public static final JagString GER_REMOVEIGNORE = Static28.parse(" zuerst von Ihrer Ignorieren)2Liste(Q"); + public static final JagString GER_REMOVEIGNORE = JagString.parse(" zuerst von Ihrer Ignorieren)2Liste(Q"); @OriginalMember(owner = "client!nh", name = "S", descriptor = "Lclient!na;") - public static final JagString GER_LOADINGDOTDOTDOT = Static28.parse("Lade)3)3)3"); + public static final JagString GER_LOADINGDOTDOTDOT = JagString.parse("Lade)3)3)3"); @OriginalMember(owner = "client!nh", name = "V", descriptor = "Lclient!na;") - public static final JagString GER_CHATEFFECT3 = Static28.parse("sch-Utteln:"); + public static final JagString GER_CHATEFFECT3 = JagString.parse("sch-Utteln:"); @OriginalMember(owner = "client!pi", name = "bb", descriptor = "Lclient!na;") - public static final JagString GER_IGNORECANTADDSELF = Static28.parse("Sie k-Onnen sich selbst nicht selbst auf Ihre Ignorieren)2Liste setzen(Q"); + public static final JagString GER_IGNORECANTADDSELF = JagString.parse("Sie k-Onnen sich selbst nicht selbst auf Ihre Ignorieren)2Liste setzen(Q"); @OriginalMember(owner = "client!ug", name = "f", descriptor = "Lclient!na;") - public static final JagString GER_CHATCOL5 = Static28.parse("weiss:"); + public static final JagString GER_CHATCOL5 = JagString.parse("weiss:"); @OriginalMember(owner = "client!nc", name = "d", descriptor = "Lclient!na;") - public static final JagString GER_RATING = Static28.parse("Kampfstufe: "); + public static final JagString GER_RATING = JagString.parse("Kampfstufe: "); @OriginalMember(owner = "client!pk", name = "eb", descriptor = "Lclient!na;") - public static final JagString GER_ATTACK = Static28.parse("Angreifen"); + public static final JagString GER_ATTACK = JagString.parse("Angreifen"); @OriginalMember(owner = "client!pf", name = "l", descriptor = "Lclient!na;") - public static final JagString GER_MOREOPTIONS = Static28.parse(" weitere Optionen"); + public static final JagString GER_MOREOPTIONS = JagString.parse(" weitere Optionen"); @OriginalMember(owner = "client!la", name = "g", descriptor = "Lclient!na;") - public static final JagString GER_IGNORELISTDUPE = Static28.parse(" steht bereits auf Ihrer Ignorieren)2Liste(Q"); + public static final JagString GER_IGNORELISTDUPE = JagString.parse(" steht bereits auf Ihrer Ignorieren)2Liste(Q"); @OriginalMember(owner = "client!jg", name = "k", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD60B = Static28.parse("Titelbild geladen)3"); + public static final JagString GER_MAINLOAD60B = JagString.parse("Titelbild geladen)3"); @OriginalMember(owner = "client!lg", name = "j", descriptor = "Lclient!na;") - public static final JagString GER_CHATCOL2 = Static28.parse("gr-Un:"); + public static final JagString GER_CHATCOL2 = JagString.parse("gr-Un:"); @OriginalMember(owner = "client!nd", name = "u", descriptor = "Lclient!na;") - public static final JagString GER_CANCEL = Static28.parse("Abbrechen"); + public static final JagString GER_CANCEL = JagString.parse("Abbrechen"); @OriginalMember(owner = "client!uh", name = "fb", descriptor = "Lclient!na;") - public static final JagString GER_GAME0_LOADING = Static28.parse("RuneScape wird geladen )2 bitte warten)3)3)3"); + public static final JagString GER_GAME0_LOADING = JagString.parse("RuneScape wird geladen )2 bitte warten)3)3)3"); @OriginalMember(owner = "client!hb", name = "p", descriptor = "Lclient!na;") - public static final JagString GER_MILLION_SUFFIX = Static28.parse("M"); + public static final JagString GER_MILLION_SUFFIX = JagString.parse("M"); @OriginalMember(owner = "client!hb", name = "x", descriptor = "Lclient!na;") - public static final JagString GER_PLEASEWAIT = Static28.parse("Bitte warten Sie)3)3)3"); + public static final JagString GER_PLEASEWAIT = JagString.parse("Bitte warten Sie)3)3)3"); @OriginalMember(owner = "client!lj", name = "q", descriptor = "Lclient!na;") - public static final JagString GER_DROP = Static28.parse("Fallen lassen"); + public static final JagString GER_DROP = JagString.parse("Fallen lassen"); @OriginalMember(owner = "client!uh", name = "O", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD130B = Static28.parse("Benutzeroberfl-=che geladen)3"); + public static final JagString GER_MAINLOAD130B = JagString.parse("Benutzeroberfl-=che geladen)3"); @OriginalMember(owner = "client!pe", name = "q", descriptor = "Lclient!na;") - public static final JagString GER_MINISEPARATOR = Static28.parse(": "); + public static final JagString GER_MINISEPARATOR = JagString.parse(": "); @OriginalMember(owner = "client!pe", name = "d", descriptor = "Lclient!na;") - public static final JagString GER_CHATEFFECT1 = Static28.parse("welle:"); + public static final JagString GER_CHATEFFECT1 = JagString.parse("welle:"); @OriginalMember(owner = "client!si", name = "ib", descriptor = "Lclient!na;") - public static final JagString GER_CONTINUE = Static28.parse("Weiter"); + public static final JagString GER_CONTINUE = JagString.parse("Weiter"); @OriginalMember(owner = "client!ic", name = "i", descriptor = "Lclient!na;") - public static final JagString GER_IGNORELISTFULL = Static28.parse("Ihre Ignorieren)2Liste ist voll)1 Sie k-Onnen nur 100 Spieler darauf eintragen)3"); + public static final JagString GER_IGNORELISTFULL = JagString.parse("Ihre Ignorieren)2Liste ist voll)1 Sie k-Onnen nur 100 Spieler darauf eintragen)3"); @OriginalMember(owner = "client!mf", name = "S", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD140 = Static28.parse("Starte 3D)2Softwarebibliothek)3"); + public static final JagString GER_MAINLOAD140 = JagString.parse("Starte 3D)2Softwarebibliothek)3"); @OriginalMember(owner = "client!lh", name = "x", descriptor = "Lclient!na;") - public static final JagString GER_CHATEFFECT4 = Static28.parse("scrollen:"); + public static final JagString GER_CHATEFFECT4 = JagString.parse("scrollen:"); @OriginalMember(owner = "client!sk", name = "cb", descriptor = "Lclient!na;") - public static final JagString GER_EXAMINE = Static28.parse("Untersuchen"); + public static final JagString GER_EXAMINE = JagString.parse("Untersuchen"); @OriginalMember(owner = "client!sk", name = "eb", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD45B = Static28.parse("Musik)2Engine vorbereitet)3"); + public static final JagString GER_MAINLOAD45B = JagString.parse("Musik)2Engine vorbereitet)3"); @OriginalMember(owner = "client!sd", name = "P", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD135B = Static28.parse("Liste der Welten geladen"); + public static final JagString GER_MAINLOAD135B = JagString.parse("Liste der Welten geladen"); @OriginalMember(owner = "client!vh", name = "i", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD30 = Static28.parse("Verbindung mit Update)2Server)3)3)3"); + public static final JagString GER_MAINLOAD30 = JagString.parse("Verbindung mit Update)2Server)3)3)3"); @OriginalMember(owner = "client!re", name = "r", descriptor = "Lclient!na;") - public static final JagString GER_WALKHERE = Static28.parse("Hierhin gehen"); + public static final JagString GER_WALKHERE = JagString.parse("Hierhin gehen"); @OriginalMember(owner = "client!qf", name = "U", descriptor = "Lclient!na;") - public static final JagString GER_CHOOSE_OPTION = Static28.parse("W-=hlen Sie eine Option"); + public static final JagString GER_CHOOSE_OPTION = JagString.parse("W-=hlen Sie eine Option"); @OriginalMember(owner = "client!hj", name = "i", descriptor = "Lclient!na;") - public static final JagString GER_USE = Static28.parse("Benutzen"); + public static final JagString GER_USE = JagString.parse("Benutzen"); @OriginalMember(owner = "client!ql", name = "k", descriptor = "Lclient!na;") - public static final JagString GER_CHATEFFECT5 = Static28.parse("gleiten:"); + public static final JagString GER_CHATEFFECT5 = JagString.parse("gleiten:"); @OriginalMember(owner = "client!ok", name = "g", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD60 = Static28.parse("Lade Titelbild )2 "); + public static final JagString GER_MAINLOAD60 = JagString.parse("Lade Titelbild )2 "); @OriginalMember(owner = "client!gk", name = "a", descriptor = "Lclient!na;") - public static final JagString GER_CHATCOL10 = Static28.parse("leuchten2:"); + public static final JagString GER_CHATCOL10 = JagString.parse("leuchten2:"); @OriginalMember(owner = "client!wd", name = "c", descriptor = "Lclient!na;") - public static final JagString GER_UNABLETOFIND = Static28.parse("Spieler kann nicht gefunden werden: "); + public static final JagString GER_UNABLETOFIND = JagString.parse("Spieler kann nicht gefunden werden: "); @OriginalMember(owner = "client!og", name = "h", descriptor = "Lclient!na;") - public static final JagString GER_FRIENDLOGOUT = Static28.parse(" loggt sich aus)3"); + public static final JagString GER_FRIENDLOGOUT = JagString.parse(" loggt sich aus)3"); @OriginalMember(owner = "client!ml", name = "S", descriptor = "Lclient!na;") - public static final JagString GER_THOUSAND_SUFFIX = Static28.parse("T"); + public static final JagString GER_THOUSAND_SUFFIX = JagString.parse("T"); @OriginalMember(owner = "client!va", name = "v", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD10B = Static28.parse("Spielwelt erstellt)3"); + public static final JagString GER_MAINLOAD10B = JagString.parse("Spielwelt erstellt)3"); @OriginalMember(owner = "client!mf", name = "q", descriptor = "Lclient!na;") - public static final JagString GER_OK = Static28.parse("Okay"); + public static final JagString GER_OK = JagString.parse("Okay"); @OriginalMember(owner = "client!ob", name = "c", descriptor = "Lclient!na;") - public static final JagString GER_SKILL = Static28.parse("Fertigkeit: "); + public static final JagString GER_SKILL = JagString.parse("Fertigkeit: "); @OriginalMember(owner = "client!wf", name = "h", descriptor = "Lclient!na;") - public static final JagString GER_MAINLOAD40B = Static28.parse("Update)2Liste geladen)3"); + public static final JagString GER_MAINLOAD40B = JagString.parse("Update)2Liste geladen)3"); @OriginalMember(owner = "client!lk", name = "a", descriptor = "(Z)V") public static void switchToGerman() { @@ -952,265 +952,265 @@ public class LocalizedText { // TODO: unsorted //region French Translations @OriginalMember(owner = "client!kc", name = "r", descriptor = "Lclient!na;") - public static final JagString FR_THOUSAND_SUFFIX = Static28.parse("K"); + public static final JagString FR_THOUSAND_SUFFIX = JagString.parse("K"); @OriginalMember(owner = "client!qj", name = "g", descriptor = "Lclient!na;") - public static final JagString FR_CHATCOL1 = Static28.parse("rouge:"); + public static final JagString FR_CHATCOL1 = JagString.parse("rouge:"); @OriginalMember(owner = "client!oe", name = "m", descriptor = "Lclient!na;") - public static final JagString FR_GAME0_LOADING = Static28.parse("Chargement de RuneScape en cours )2 veuillez patienter)3)3)3"); + public static final JagString FR_GAME0_LOADING = JagString.parse("Chargement de RuneScape en cours )2 veuillez patienter)3)3)3"); @OriginalMember(owner = "client!ii", name = "j", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD130B = Static28.parse("Interfaces charg-Bes"); + public static final JagString FR_MAINLOAD130B = JagString.parse("Interfaces charg-Bes"); @OriginalMember(owner = "client!pl", name = "d", descriptor = "Lclient!na;") - public static final JagString FR_RATING = Static28.parse("classement "); + public static final JagString FR_RATING = JagString.parse("classement "); @OriginalMember(owner = "client!ol", name = "S", descriptor = "Lclient!na;") - public static final JagString FR_CONLOST = Static28.parse("Connexion perdue)3"); + public static final JagString FR_CONLOST = JagString.parse("Connexion perdue)3"); @OriginalMember(owner = "client!ui", name = "nb", descriptor = "Lclient!na;") - public static final JagString FR_CHATCOL0 = Static28.parse("jaune:"); + public static final JagString FR_CHATCOL0 = JagString.parse("jaune:"); @OriginalMember(owner = "client!fm", name = "T", descriptor = "Lclient!na;") - public static final JagString FR_MINISEPARATOR = Static28.parse(" "); + public static final JagString FR_MINISEPARATOR = JagString.parse(" "); @OriginalMember(owner = "client!fk", name = "c", descriptor = "Lclient!na;") - public static final JagString FR_CHECKING_FOR_UPDATES = Static28.parse("V-Brification des mises -9 jour )2 "); + public static final JagString FR_CHECKING_FOR_UPDATES = JagString.parse("V-Brification des mises -9 jour )2 "); @OriginalMember(owner = "client!fk", name = "p", descriptor = "Lclient!na;") - public static final JagString FR_CHATEFFECT2 = Static28.parse("ondulation2:"); + public static final JagString FR_CHATEFFECT2 = JagString.parse("ondulation2:"); @OriginalMember(owner = "client!fh", name = "V", descriptor = "Lclient!na;") - public static final JagString FR_CHATCOL2 = Static28.parse("vert:"); + public static final JagString FR_CHATCOL2 = JagString.parse("vert:"); @OriginalMember(owner = "client!fc", name = "g", descriptor = "Lclient!na;") - public static final JagString FR_USE = Static28.parse("Utiliser"); + public static final JagString FR_USE = JagString.parse("Utiliser"); @OriginalMember(owner = "client!ab", name = "m", descriptor = "Lclient!na;") - public static final JagString FR_MEMBERS_OBJECT = Static28.parse("Objet d(Wabonn-Bs"); + public static final JagString FR_MEMBERS_OBJECT = JagString.parse("Objet d(Wabonn-Bs"); @OriginalMember(owner = "client!ah", name = "u", descriptor = "Lclient!na;") - public static final JagString FR_REMOVESOCIAL = Static28.parse("Veuillez commencer par supprimer "); + public static final JagString FR_REMOVESOCIAL = JagString.parse("Veuillez commencer par supprimer "); @OriginalMember(owner = "client!bf", name = "A", descriptor = "Lclient!na;") - public static final JagString FR_CHATCOL10 = Static28.parse("brillant2:"); + public static final JagString FR_CHATCOL10 = JagString.parse("brillant2:"); @OriginalMember(owner = "client!bg", name = "n", descriptor = "Lclient!na;") - public static final JagString FR_FRIENDLISTFULL = Static28.parse("Votre liste d(Wamis est pleine (X100 noms maximum pour la version gratuite et 200 pour les abonn-Bs(Y)3"); + public static final JagString FR_FRIENDLISTFULL = JagString.parse("Votre liste d(Wamis est pleine (X100 noms maximum pour la version gratuite et 200 pour les abonn-Bs(Y)3"); @OriginalMember(owner = "client!bm", name = "h", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD60B = Static28.parse(",Mcran)2titre charg-B"); + public static final JagString FR_MAINLOAD60B = JagString.parse(",Mcran)2titre charg-B"); @OriginalMember(owner = "client!ca", name = "bb", descriptor = "Lclient!na;") - public static final JagString FR_EXAMINE = Static28.parse("Examiner"); + public static final JagString FR_EXAMINE = JagString.parse("Examiner"); @OriginalMember(owner = "client!cd", name = "v", descriptor = "Lclient!na;") - public static final JagString FR_WALKHERE = Static28.parse("Atteindre"); + public static final JagString FR_WALKHERE = JagString.parse("Atteindre"); @OriginalMember(owner = "client!cj", name = "b", descriptor = "Lclient!na;") - public static final JagString FR_CHATCOL5 = Static28.parse("blanc:"); + public static final JagString FR_CHATCOL5 = JagString.parse("blanc:"); @OriginalMember(owner = "client!cl", name = "P", descriptor = "Lclient!na;") - public static final JagString FR_CHATCOL11 = Static28.parse("brillant3:"); + public static final JagString FR_CHATCOL11 = JagString.parse("brillant3:"); @OriginalMember(owner = "client!cl", name = "R", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD65B = Static28.parse(",Mcran)2titre ouvert"); + public static final JagString FR_MAINLOAD65B = JagString.parse(",Mcran)2titre ouvert"); @OriginalMember(owner = "client!cm", name = "e", descriptor = "Lclient!na;") - public static final JagString FR_FRIENDCANTADDSELF = Static28.parse("Vous ne pouvez pas ajouter votre nom -9 votre liste d(Wamis)3"); + public static final JagString FR_FRIENDCANTADDSELF = JagString.parse("Vous ne pouvez pas ajouter votre nom -9 votre liste d(Wamis)3"); @OriginalMember(owner = "client!cm", name = "i", descriptor = "Lclient!na;") - public static final JagString FR_SKILL = Static28.parse("comp-Btence "); + public static final JagString FR_SKILL = JagString.parse("comp-Btence "); @OriginalMember(owner = "client!cn", name = "x", descriptor = "Lclient!na;") - public static final JagString FR_IGNORECANTADDSELF = Static28.parse("Vous ne pouvez pas ajouter votre nom -9 votre liste noire)3"); + public static final JagString FR_IGNORECANTADDSELF = JagString.parse("Vous ne pouvez pas ajouter votre nom -9 votre liste noire)3"); @OriginalMember(owner = "client!e", name = "vc", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD110B = Static28.parse("Gestionnaire de saisie charg-B"); + public static final JagString FR_MAINLOAD110B = JagString.parse("Gestionnaire de saisie charg-B"); @OriginalMember(owner = "client!ef", name = "l", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD130 = Static28.parse("Chargement des interfaces )2 "); + public static final JagString FR_MAINLOAD130 = JagString.parse("Chargement des interfaces )2 "); @OriginalMember(owner = "client!eg", name = "y", descriptor = "Lclient!na;") - public static final JagString FR_LENT_ITEM_RETURN = Static28.parse("Jeter"); + public static final JagString FR_LENT_ITEM_RETURN = JagString.parse("Jeter"); @OriginalMember(owner = "client!ej", name = "cb", descriptor = "Lclient!na;") - public static final JagString FR_CHATCOL7 = Static28.parse("clignotant2:"); + public static final JagString FR_CHATCOL7 = JagString.parse("clignotant2:"); @OriginalMember(owner = "client!fb", name = "k", descriptor = "Lclient!na;") - public static final JagString FR_MILLION_SUFFIX = Static28.parse("M"); + public static final JagString FR_MILLION_SUFFIX = JagString.parse("M"); @OriginalMember(owner = "client!rc", name = "D", descriptor = "Lclient!na;") - public static final JagString FR_FRIENDLOGOUT = Static28.parse(" s(West d-Bconnect-B)3"); + public static final JagString FR_FRIENDLOGOUT = JagString.parse(" s(West d-Bconnect-B)3"); @OriginalMember(owner = "client!tm", name = "o", descriptor = "Lclient!na;") - public static final JagString FR_CANCEL = Static28.parse("Annuler"); + public static final JagString FR_CANCEL = JagString.parse("Annuler"); @OriginalMember(owner = "client!wa", name = "tb", descriptor = "Lclient!na;") - public static final JagString FR_CHATEFFECT4 = Static28.parse("d-Broulement:"); + public static final JagString FR_CHATEFFECT4 = JagString.parse("d-Broulement:"); @OriginalMember(owner = "client!wa", name = "H", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD50B = Static28.parse("Polices charg-Bes"); + public static final JagString FR_MAINLOAD50B = JagString.parse("Polices charg-Bes"); @OriginalMember(owner = "client!il", name = "Q", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD90B = Static28.parse("Textures charg-Bes"); + public static final JagString FR_MAINLOAD90B = JagString.parse("Textures charg-Bes"); @OriginalMember(owner = "client!il", name = "R", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD135B = Static28.parse("Liste des serveurs charg-Be"); + public static final JagString FR_MAINLOAD135B = JagString.parse("Liste des serveurs charg-Be"); @OriginalMember(owner = "client!u", name = "d", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD150B = Static28.parse("Librairie 3D d-Bmarr-Be"); + public static final JagString FR_MAINLOAD150B = JagString.parse("Librairie 3D d-Bmarr-Be"); @OriginalMember(owner = "client!kd", name = "tb", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD30B = Static28.parse("Connect-B au serveur de mise -9 jour"); + public static final JagString FR_MAINLOAD30B = JagString.parse("Connect-B au serveur de mise -9 jour"); @OriginalMember(owner = "client!mg", name = "Y", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD0B = Static28.parse("M-Bmoire attribu-Be"); + public static final JagString FR_MAINLOAD0B = JagString.parse("M-Bmoire attribu-Be"); @OriginalMember(owner = "client!km", name = "Ic", descriptor = "Lclient!na;") - public static final JagString FR_CHATEFFECT1 = Static28.parse("ondulation:"); + public static final JagString FR_CHATEFFECT1 = JagString.parse("ondulation:"); @OriginalMember(owner = "client!tl", name = "g", descriptor = "Lclient!na;") - public static final JagString FR_CHATEFFECT3 = Static28.parse("tremblement:"); + public static final JagString FR_CHATEFFECT3 = JagString.parse("tremblement:"); @OriginalMember(owner = "client!gm", name = "hb", descriptor = "Lclient!na;") - public static final JagString FR_FACEHERE = Static28.parse("Regarder dans cette direction"); + public static final JagString FR_FACEHERE = JagString.parse("Regarder dans cette direction"); @OriginalMember(owner = "client!li", name = "e", descriptor = "Lclient!na;") - public static final JagString FR_PLEASEWAIT = Static28.parse("Veuillez patienter)3)3)3"); + public static final JagString FR_PLEASEWAIT = JagString.parse("Veuillez patienter)3)3)3"); @OriginalMember(owner = "client!gi", name = "o", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD135 = Static28.parse("Chargement de la liste des serveurs"); + public static final JagString FR_MAINLOAD135 = JagString.parse("Chargement de la liste des serveurs"); @OriginalMember(owner = "client!jm", name = "t", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD120B = Static28.parse("Module texte charg-B"); + public static final JagString FR_MAINLOAD120B = JagString.parse("Module texte charg-B"); @OriginalMember(owner = "client!pb", name = "J", descriptor = "Lclient!na;") - public static final JagString FR_CHOOSE_OPTION = Static28.parse("Choisir une option"); + public static final JagString FR_CHOOSE_OPTION = JagString.parse("Choisir une option"); @OriginalMember(owner = "client!pb", name = "K", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD90 = Static28.parse("Chargement des textures )2 "); + public static final JagString FR_MAINLOAD90 = JagString.parse("Chargement des textures )2 "); @OriginalMember(owner = "client!pb", name = "cb", descriptor = "Lclient!na;") - public static final JagString FR_LOADING = Static28.parse("Chargement en cours)3 Veuillez patienter)3"); + public static final JagString FR_LOADING = JagString.parse("Chargement en cours)3 Veuillez patienter)3"); @OriginalMember(owner = "client!gi", name = "k", descriptor = "Lclient!na;") - public static final JagString FR_CHATCOL8 = Static28.parse("clignotant3:"); + public static final JagString FR_CHATCOL8 = JagString.parse("clignotant3:"); @OriginalMember(owner = "client!q", name = "f", descriptor = "Lclient!na;") - public static final JagString FR_HIDDEN = Static28.parse("Cach-B"); + public static final JagString FR_HIDDEN = JagString.parse("Cach-B"); @OriginalMember(owner = "client!q", name = "g", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD50 = Static28.parse("Chargement des polices )2 "); + public static final JagString FR_MAINLOAD50 = JagString.parse("Chargement des polices )2 "); @OriginalMember(owner = "client!gl", name = "c", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD10B = Static28.parse("Monde de jeu cr-B-B"); + public static final JagString FR_MAINLOAD10B = JagString.parse("Monde de jeu cr-B-B"); @OriginalMember(owner = "client!me", name = "T", descriptor = "Lclient!na;") - public static final JagString FR_CHATCOL4 = Static28.parse("violet:"); + public static final JagString FR_CHATCOL4 = JagString.parse("violet:"); @OriginalMember(owner = "client!me", name = "kb", descriptor = "Lclient!na;") - public static final JagString FR_IGNORELISTFULL = Static28.parse("Votre liste noire est pleine (X100 noms maximum(Y)3"); + public static final JagString FR_IGNORELISTFULL = JagString.parse("Votre liste noire est pleine (X100 noms maximum(Y)3"); @OriginalMember(owner = "client!ud", name = "I", descriptor = "Lclient!na;") - public static final JagString FR_LOADINGDOTDOTDOT = Static28.parse("Chargement en cours)3)3)3"); + public static final JagString FR_LOADINGDOTDOTDOT = JagString.parse("Chargement en cours)3)3)3"); @OriginalMember(owner = "client!ud", name = "L", descriptor = "Lclient!na;") - public static final JagString FR_CHATCOL6 = Static28.parse("clignotant1:"); + public static final JagString FR_CHATCOL6 = JagString.parse("clignotant1:"); @OriginalMember(owner = "client!ja", name = "o", descriptor = "Lclient!na;") - public static final JagString FR_TRADEREQ = Static28.parse("voudrait faire un -Bchange avec vous)3"); + public static final JagString FR_TRADEREQ = JagString.parse("voudrait faire un -Bchange avec vous)3"); @OriginalMember(owner = "client!ja", name = "p", descriptor = "Lclient!na;") - public static final JagString FR_FRIENDSLISTDUPE = Static28.parse(" est d-Bj-9 dans votre liste d(Wamis)3"); + public static final JagString FR_FRIENDSLISTDUPE = JagString.parse(" est d-Bj-9 dans votre liste d(Wamis)3"); @OriginalMember(owner = "client!ja", name = "b", descriptor = "Lclient!na;") - public static final JagString FR_SELECT = Static28.parse("S-Blectionner"); + public static final JagString FR_SELECT = JagString.parse("S-Blectionner"); @OriginalMember(owner = "client!ja", name = "d", descriptor = "Lclient!na;") - public static final JagString FR_LEVEL = Static28.parse("niveau "); + public static final JagString FR_LEVEL = JagString.parse("niveau "); @OriginalMember(owner = "client!md", name = "X", descriptor = "Lclient!na;") - public static final JagString FR_UNABLETOFIND = Static28.parse("Impossible de trouver "); + public static final JagString FR_UNABLETOFIND = JagString.parse("Impossible de trouver "); @OriginalMember(owner = "client!md", name = "J", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD140 = Static28.parse("D-Bmarrage de la librairie 3D"); + public static final JagString FR_MAINLOAD140 = JagString.parse("D-Bmarrage de la librairie 3D"); @OriginalMember(owner = "client!md", name = "O", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD70B = Static28.parse("Fichiers config charg-Bs"); + public static final JagString FR_MAINLOAD70B = JagString.parse("Fichiers config charg-Bs"); @OriginalMember(owner = "client!md", name = "P", descriptor = "Lclient!na;") - public static final JagString FR_CLOSE = Static28.parse("Fermer"); + public static final JagString FR_CLOSE = JagString.parse("Fermer"); @OriginalMember(owner = "client!vj", name = "l", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD70 = Static28.parse("Chargement des fichiers config )2 "); + public static final JagString FR_MAINLOAD70 = JagString.parse("Chargement des fichiers config )2 "); @OriginalMember(owner = "client!sd", name = "J", descriptor = "Lclient!na;") - public static final JagString FR_ATTEMPT_TO_REESTABLISH = Static28.parse("Veuillez patienter )2 tentative de r-Btablissement)3"); + public static final JagString FR_ATTEMPT_TO_REESTABLISH = JagString.parse("Veuillez patienter )2 tentative de r-Btablissement)3"); @OriginalMember(owner = "client!k", name = "n", descriptor = "Lclient!na;") - public static final JagString FR_CHATCOL9 = Static28.parse("brillant1:"); + public static final JagString FR_CHATCOL9 = JagString.parse("brillant1:"); @OriginalMember(owner = "client!k", name = "u", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD80 = Static28.parse("Chargement des sprites )2 "); + public static final JagString FR_MAINLOAD80 = JagString.parse("Chargement des sprites )2 "); @OriginalMember(owner = "client!ij", name = "n", descriptor = "Lclient!na;") - public static final JagString FR_REMOVEIGNORE = Static28.parse(" de votre liste noire)3"); + public static final JagString FR_REMOVEIGNORE = JagString.parse(" de votre liste noire)3"); @OriginalMember(owner = "client!ic", name = "d", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD40B = Static28.parse("Liste des mises -9 jour charg-Be"); + public static final JagString FR_MAINLOAD40B = JagString.parse("Liste des mises -9 jour charg-Be"); @OriginalMember(owner = "client!ic", name = "m", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD80B = Static28.parse("Sprites charg-Bs"); + public static final JagString FR_MAINLOAD80B = JagString.parse("Sprites charg-Bs"); @OriginalMember(owner = "client!mf", name = "K", descriptor = "Lclient!na;") - public static final JagString FR_DROP = Static28.parse("Poser"); + public static final JagString FR_DROP = JagString.parse("Poser"); @OriginalMember(owner = "client!rh", name = "q", descriptor = "Lclient!na;") - public static final JagString FR_OK = Static28.parse("OK"); + public static final JagString FR_OK = JagString.parse("OK"); @OriginalMember(owner = "client!pk", name = "Q", descriptor = "Lclient!na;") - public static final JagString FR_CHATEFFECT5 = Static28.parse("glissement:"); + public static final JagString FR_CHATEFFECT5 = JagString.parse("glissement:"); @OriginalMember(owner = "client!kh", name = "a", descriptor = "Lclient!na;") - public static final JagString FR_ATTACK = Static28.parse("Attaquer"); + public static final JagString FR_ATTACK = JagString.parse("Attaquer"); @OriginalMember(owner = "client!tc", name = "b", descriptor = "Lclient!na;") - public static final JagString FR_TAKE = Static28.parse("Prendre"); + public static final JagString FR_TAKE = JagString.parse("Prendre"); @OriginalMember(owner = "client!tc", name = "c", descriptor = "Lclient!na;") - public static final JagString FR_REMOVEFRIEND = Static28.parse(" de votre liste d(Wamis)3"); + public static final JagString FR_REMOVEFRIEND = JagString.parse(" de votre liste d(Wamis)3"); @OriginalMember(owner = "client!hm", name = "lb", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD45B = Static28.parse("Moteur son pr-Bpar-B"); + public static final JagString FR_MAINLOAD45B = JagString.parse("Moteur son pr-Bpar-B"); @OriginalMember(owner = "client!kk", name = "a", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD0 = Static28.parse("M-Bmoire en cours d(Wattribution"); + public static final JagString FR_MAINLOAD0 = JagString.parse("M-Bmoire en cours d(Wattribution"); @OriginalMember(owner = "client!wj", name = "k", descriptor = "Lclient!na;") - public static final JagString FR_CONTINUE = Static28.parse("Continuer"); + public static final JagString FR_CONTINUE = JagString.parse("Continuer"); @OriginalMember(owner = "client!oi", name = "k", descriptor = "Lclient!na;") - public static final JagString FR_CHATCOL3 = Static28.parse("cyan:"); + public static final JagString FR_CHATCOL3 = JagString.parse("cyan:"); @OriginalMember(owner = "client!sj", name = "x", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD30 = Static28.parse("Connexion au serveur de mise -9 jour en cours"); + public static final JagString FR_MAINLOAD30 = JagString.parse("Connexion au serveur de mise -9 jour en cours"); @OriginalMember(owner = "client!la", name = "k", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOLAD120 = Static28.parse("Chargement du module texte )2 "); + public static final JagString FR_MAINLOLAD120 = JagString.parse("Chargement du module texte )2 "); @OriginalMember(owner = "client!hi", name = "h", descriptor = "Lclient!na;") - public static final JagString FR_MAINLOAD60 = Static28.parse("Chargement de l(W-Bcran)2titre )2 "); + public static final JagString FR_MAINLOAD60 = JagString.parse("Chargement de l(W-Bcran)2titre )2 "); @OriginalMember(owner = "client!gg", name = "jb", descriptor = "Lclient!na;") - public static final JagString FR_IGNORELISTDUPE = Static28.parse(" est d-Bj-9 dans votre liste noire)3"); + public static final JagString FR_IGNORELISTDUPE = JagString.parse(" est d-Bj-9 dans votre liste noire)3"); @OriginalMember(owner = "client!uf", name = "d", descriptor = "Lclient!na;") - public static final JagString FR_MOREOPTIONS = Static28.parse(" autres options"); + public static final JagString FR_MOREOPTIONS = JagString.parse(" autres options"); @OriginalMember(owner = "client!gg", name = "Q", descriptor = "Lclient!na;") - public static final JagString FR_FRIENDLOGIN = Static28.parse(" s(West connect-B)3"); + public static final JagString FR_FRIENDLOGIN = JagString.parse(" s(West connect-B)3"); @OriginalMember(owner = "client!bb", name = "a", descriptor = "(B)V") public static void switchToFrench() { diff --git a/client/src/main/java/LoginManager.java b/client/src/main/java/LoginManager.java new file mode 100644 index 0000000..63ae413 --- /dev/null +++ b/client/src/main/java/LoginManager.java @@ -0,0 +1,457 @@ +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +import java.io.IOException; +import java.net.Socket; + +public class LoginManager { + @OriginalMember(owner = "client!bg", name = "g", descriptor = "Lclient!i;") + public static final Packet buffer = new Packet(5000); + @OriginalMember(owner = "client!nd", name = "r", descriptor = "Lclient!na;") + public static final JagString ZAP = JagString.parse("zap"); + @OriginalMember(owner = "client!ef", name = "h", descriptor = "Lclient!na;") + public static final JagString UNZAP = JagString.parse("unzap"); + @OriginalMember(owner = "client!rl", name = "X", descriptor = "I") + public static int anInt4937 = 0; + @OriginalMember(owner = "client!sd", name = "X", descriptor = "Z") + public static boolean aBoolean247 = false; + @OriginalMember(owner = "client!sk", name = "ib", descriptor = "I") + public static int hopTime = 0; + @OriginalMember(owner = "client!vk", name = "b", descriptor = "I") + public static int reply = -2; + @OriginalMember(owner = "client!hd", name = "a", descriptor = "I") + public static int loops = 0; + @OriginalMember(owner = "client!ol", name = "V", descriptor = "I") + public static int step = 0; + @OriginalMember(owner = "client!qi", name = "A", descriptor = "I") + public static int disallowResult = -1; + @OriginalMember(owner = "client!wh", name = "s", descriptor = "I") + public static int errors = 0; + @OriginalMember(owner = "client!bj", name = "Y", descriptor = "I") + public static int anInt673 = 0; + @OriginalMember(owner = "client!pl", name = "i", descriptor = "I") + public static int anInt4587 = 0; + @OriginalMember(owner = "client!pi", name = "P", descriptor = "J") + public static long serverKey = 0L; + @OriginalMember(owner = "client!af", name = "c", descriptor = "I") + public static int anInt39 = -1; + @OriginalMember(owner = "client!pg", name = "S", descriptor = "I") + public static int staffModLevel = 0; + @OriginalMember(owner = "client!ud", name = "O", descriptor = "I") + public static int playerModLevel = 0; + @OriginalMember(owner = "client!jk", name = "G", descriptor = "Z") + public static boolean playerUnderage = false; + @OriginalMember(owner = "client!ql", name = "c", descriptor = "Z") + public static boolean parentalChatConsent = false; + @OriginalMember(owner = "client!qg", name = "W", descriptor = "Z") + public static boolean playerMember = false; + @OriginalMember(owner = "client!aa", name = "l", descriptor = "Z") + public static boolean mapMembers = false; + @OriginalMember(owner = "client!gm", name = "bb", descriptor = "Z") + public static boolean mapQuickChat = false; + @OriginalMember(owner = "client!c", name = "hb", descriptor = "Z") + public static boolean parentalAdvertConsent = false; + + @OriginalMember(owner = "client!dm", name = "d", descriptor = "(I)V") + public static void clear() { + aBoolean247 = false; + hopTime = 0; + reply = -3; + loops = 0; + step = 1; + errors = 0; + disallowResult = -1; + } + + @OriginalMember(owner = "client!ch", name = "b", descriptor = "(B)V") + public static void loopAuto() { + if (anInt4937 == 0) { + return; + } + try { + if (++anInt673 > 1500) { + if (Protocol.socket != null) { + Protocol.socket.close(); + Protocol.socket = null; + } + if (anInt4587 >= 1) { + reply = -5; + anInt4937 = 0; + return; + } + anInt673 = 0; + anInt4587++; + anInt4937 = 1; + if (client.worldListPort == client.worldListDefaultPort) { + client.worldListPort = client.worldListAlternatePort; + } else { + client.worldListPort = client.worldListDefaultPort; + } + } + if (anInt4937 == 1) { + Protocol.socketRequest = GameShell.signLink.openSocket(client.worldListHostname, client.worldListPort); + anInt4937 = 2; + } + @Pc(126) int local126; + if (anInt4937 == 2) { + if (Protocol.socketRequest.status == 2) { + throw new IOException(); + } + if (Protocol.socketRequest.status != 1) { + return; + } + Protocol.socket = new BufferedSocket((Socket) Protocol.socketRequest.result, GameShell.signLink); + Protocol.socketRequest = null; + Protocol.socket.write(Protocol.outboundBuffer.data, Protocol.outboundBuffer.offset); + if (client.musicChannel != null) { + client.musicChannel.method3571(); + } + if (client.soundChannel != null) { + client.soundChannel.method3571(); + } + local126 = Protocol.socket.read(); + if (client.musicChannel != null) { + client.musicChannel.method3571(); + } + if (client.soundChannel != null) { + client.soundChannel.method3571(); + } + if (local126 != 101) { + reply = local126; + anInt4937 = 0; + Protocol.socket.close(); + Protocol.socket = null; + return; + } + anInt4937 = 3; + } + if (anInt4937 == 3) { + if (Protocol.socket.available() < 2) { + return; + } + local126 = Protocol.socket.read() << 8 | Protocol.socket.read(); + Static176.hopWorld(local126); + if (Static125.worldId == -1) { + anInt4937 = 0; + reply = 6; + Protocol.socket.close(); + Protocol.socket = null; + return; + } + anInt4937 = 0; + Protocol.socket.close(); + Protocol.socket = null; + clear(); + } + } catch (@Pc(210) IOException local210) { + if (Protocol.socket != null) { + Protocol.socket.close(); + Protocol.socket = null; + } + if (anInt4587 < 1) { + if (client.worldListPort == client.worldListDefaultPort) { + client.worldListPort = client.worldListAlternatePort; + } else { + client.worldListPort = client.worldListDefaultPort; + } + anInt4937 = 1; + anInt673 = 0; + anInt4587++; + } else { + reply = -4; + anInt4937 = 0; + } + } + } + + @OriginalMember(owner = "client!ri", name = "a", descriptor = "(B)V") + public static void loop() { + if (step == 0 || step == 5) { + return; + } + try { + if (++loops > 2000) { + if (Protocol.socket != null) { + Protocol.socket.close(); + Protocol.socket = null; + } + if (errors >= 1) { + reply = -5; + step = 0; + return; + } + loops = 0; + if (client.port == client.defaultPort) { + client.port = client.alternatePort; + } else { + client.port = client.defaultPort; + } + step = 1; + errors++; + } + if (step == 1) { + Protocol.socketRequest = GameShell.signLink.openSocket(client.hostname, client.port); + step = 2; + } + if (step == 2) { + if (Protocol.socketRequest.status == 2) { + throw new IOException(); + } + if (Protocol.socketRequest.status != 1) { + return; + } + Protocol.socket = new BufferedSocket((Socket) Protocol.socketRequest.result, GameShell.signLink); + Protocol.socketRequest = null; + @Pc(106) long local106 = Static101.aLong98 = Player.username.encode37(); + Protocol.outboundBuffer.offset = 0; + Protocol.outboundBuffer.p1(14); + @Pc(120) int local120 = (int) (local106 >> 16 & 0x1FL); + Protocol.outboundBuffer.p1(local120); + Protocol.socket.write(Protocol.outboundBuffer.data, 2); + if (client.musicChannel != null) { + client.musicChannel.method3571(); + } + if (client.soundChannel != null) { + client.soundChannel.method3571(); + } + @Pc(150) int local150 = Protocol.socket.read(); + if (client.musicChannel != null) { + client.musicChannel.method3571(); + } + if (client.soundChannel != null) { + client.soundChannel.method3571(); + } + if (local150 != 0) { + reply = local150; + step = 0; + Protocol.socket.close(); + Protocol.socket = null; + return; + } + step = 3; + } + if (step == 3) { + if (Protocol.socket.available() < 8) { + return; + } + Protocol.socket.read(0, 8, Protocol.inboundBuffer.data); + Protocol.inboundBuffer.offset = 0; + serverKey = Protocol.inboundBuffer.g8(); + @Pc(210) int[] key = new int[4]; + Protocol.outboundBuffer.offset = 0; + key[2] = (int) (serverKey >> 32); + key[3] = (int) serverKey; + key[1] = (int) (Math.random() * 9.9999999E7D); + key[0] = (int) (Math.random() * 9.9999999E7D); + Protocol.outboundBuffer.p1(10); + Protocol.outboundBuffer.p4(key[0]); + Protocol.outboundBuffer.p4(key[1]); + Protocol.outboundBuffer.p4(key[2]); + Protocol.outboundBuffer.p4(key[3]); + Protocol.outboundBuffer.p8(Player.username.encode37()); + Protocol.outboundBuffer.pjstr(Player.password); + if (GlobalConfig.LOGIN_EXTRA_INFO) { + Protocol.outboundBuffer.pjstr(JagString.parse("")); + Protocol.outboundBuffer.pjstr(JagString.parse("")); + Protocol.outboundBuffer.pjstr(JagString.parse("")); + } + Protocol.outboundBuffer.encryptRsa(GlobalConfig.RSA_EXPONENT, GlobalConfig.RSA_MODULUS); + buffer.offset = 0; + if (client.gameState == 40) { + buffer.p1(18); + } else { + buffer.p1(16); + } + int offset = 0; + if (GlobalConfig.LOGIN_FAKE_IDX28) { + // pretend that we're loading the archive so we don't throw the packet size off + offset = 4; + } + buffer.p2(Protocol.outboundBuffer.offset + Buffer.getStringLength(client.settings) + (159 + offset)); + buffer.p4(530); + buffer.p1(anInt39); + buffer.p1(client.advertSuppressed ? 1 : 0); + buffer.p1(1); + buffer.p1(Static144.getWindowMode()); + buffer.p2(GameShell.canvasWidth); + buffer.p2(GameShell.canvasHeight); + buffer.p1(Preferences.antiAliasingMode); + client.writeUid(buffer); + buffer.pjstr(client.settings); + buffer.p4(client.affiliate); + buffer.p4(Preferences.toInt()); + Preferences.sentToServer = true; + buffer.p2(Protocol.verifyId); + buffer.p4(client.js5Archive0.getChecksum()); + buffer.p4(client.js5Archive1.getChecksum()); + buffer.p4(client.js5Archive2.getChecksum()); + buffer.p4(client.js5Archive3.getChecksum()); + buffer.p4(client.js5Archive4.getChecksum()); + buffer.p4(client.js5Archive5.getChecksum()); + buffer.p4(client.js5Archive6.getChecksum()); + buffer.p4(client.js5Archive7.getChecksum()); + buffer.p4(client.js5Archive8.getChecksum()); + buffer.p4(client.js5Archive9.getChecksum()); + buffer.p4(client.js5Archive10.getChecksum()); + buffer.p4(client.js5Archive11.getChecksum()); + buffer.p4(client.js5Archive12.getChecksum()); + buffer.p4(client.js5Archive13.getChecksum()); + buffer.p4(client.js5Archive14.getChecksum()); + buffer.p4(client.js5Archive15.getChecksum()); + buffer.p4(client.js5Archive16.getChecksum()); + buffer.p4(client.js5Archive17.getChecksum()); + buffer.p4(client.js5Archive18.getChecksum()); + buffer.p4(client.js5Archive19.getChecksum()); + buffer.p4(client.js5Archive20.getChecksum()); + buffer.p4(client.js5Archive21.getChecksum()); + buffer.p4(client.js5Archive22.getChecksum()); + buffer.p4(client.js5Archive23.getChecksum()); + buffer.p4(client.js5Archive24.getChecksum()); + buffer.p4(client.js5Archive25.getChecksum()); + buffer.p4(client.js5Archive26.getChecksum()); + buffer.p4(client.js5Archive27.getChecksum()); + if (GlobalConfig.LOGIN_FAKE_IDX28) { + buffer.p4(0); + } + buffer.pBytes(Protocol.outboundBuffer.data, Protocol.outboundBuffer.offset); + Protocol.socket.write(buffer.data, buffer.offset); + Protocol.outboundBuffer.setKey(key); + for (@Pc(583) int local583 = 0; local583 < 4; local583++) { + key[local583] += 50; + } + Protocol.inboundBuffer.setKey(key); + step = 4; + } + if (step == 4) { + if (Protocol.socket.available() < 1) { + return; + } + @Pc(623) int local623 = Protocol.socket.read(); + if (local623 == 21) { + step = 7; + } else if (local623 == 29) { + step = 10; + } else if (local623 == 1) { + step = 5; + reply = local623; + return; + } else if (local623 == 2) { + step = 8; + } else if (local623 == 15) { + step = 0; + reply = local623; + return; + } else if (local623 == 23 && errors < 1) { + step = 1; + errors++; + loops = 0; + Protocol.socket.close(); + Protocol.socket = null; + return; + } else { + reply = local623; + step = 0; + Protocol.socket.close(); + Protocol.socket = null; + return; + } + } + if (step == 6) { + Protocol.outboundBuffer.offset = 0; + Protocol.outboundBuffer.p1isaac(17); + Protocol.socket.write(Protocol.outboundBuffer.data, Protocol.outboundBuffer.offset); + step = 4; + return; + } + if (step == 7) { + if (Protocol.socket.available() >= 1) { + hopTime = (Protocol.socket.read() + 3) * 60; + step = 0; + reply = 21; + Protocol.socket.close(); + Protocol.socket = null; + return; + } + return; + } + if (step == 10) { + if (Protocol.socket.available() >= 1) { + disallowResult = Protocol.socket.read(); + step = 0; + reply = 29; + Protocol.socket.close(); + Protocol.socket = null; + return; + } + return; + } + if (step == 8) { + if (Protocol.socket.available() < 14) { + return; + } + Protocol.socket.read(0, 14, Protocol.inboundBuffer.data); + Protocol.inboundBuffer.offset = 0; + staffModLevel = Protocol.inboundBuffer.g1(); + playerModLevel = Protocol.inboundBuffer.g1(); + playerUnderage = Protocol.inboundBuffer.g1() == 1; + parentalChatConsent = Protocol.inboundBuffer.g1() == 1; + parentalAdvertConsent = Protocol.inboundBuffer.g1() == 1; + mapQuickChat = Protocol.inboundBuffer.g1() == 1; + MouseRecorder.enabled = Protocol.inboundBuffer.g1() == 1; + PlayerList.selfId = Protocol.inboundBuffer.g2(); + playerMember = Protocol.inboundBuffer.g1() == 1; + mapMembers = Protocol.inboundBuffer.g1() == 1; + LocTypeList.setAllowMembers(mapMembers); + ObjTypeList.setAllowMembers(mapMembers); + if (!client.advertSuppressed) { + if (playerUnderage && !parentalAdvertConsent || playerMember) { + try { + ZAP.browserControlCall(GameShell.signLink.applet); + } catch (@Pc(910) Throwable local910) { + } + } else { + try { + UNZAP.browserControlCall(GameShell.signLink.applet); + } catch (@Pc(920) Throwable local920) { + } + } + } + Protocol.opcode = Protocol.inboundBuffer.g1isaac(); + Protocol.length = Protocol.inboundBuffer.g2(); + step = 9; + } + if (step == 9) { + if (Protocol.socket.available() < Protocol.length) { + return; + } + Protocol.inboundBuffer.offset = 0; + Protocol.socket.read(0, Protocol.length, Protocol.inboundBuffer.data); + reply = 2; + step = 0; + Static243.method4221(); + Static80.centralZoneX = -1; + Protocol.readRebuildPacket(false); + Protocol.opcode = -1; + return; + } + } catch (@Pc(977) IOException ex) { + if (Protocol.socket != null) { + Protocol.socket.close(); + Protocol.socket = null; + } + if (errors >= 1) { + step = 0; + reply = -4; + } else { + step = 1; + loops = 0; + errors++; + if (client.defaultPort == client.port) { + client.port = client.alternatePort; + } else { + client.port = client.defaultPort; + } + } + } + } +} diff --git a/client/src/main/java/Map.java b/client/src/main/java/Map.java index 511737e..9a52809 100644 --- a/client/src/main/java/Map.java +++ b/client/src/main/java/Map.java @@ -40,7 +40,7 @@ public final class Map extends SecondaryNode { public final int anInt769; @OriginalMember(owner = "client!bn", name = "ab", descriptor = "Lclient!ih;") - public final LinkedList aClass69_23; + public final LinkedList chunks; @OriginalMember(owner = "client!bn", name = "", descriptor = "(Lclient!na;Lclient!na;IIIZI)V") public Map(@OriginalArg(0) JagString arg0, @OriginalArg(1) JagString arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) boolean arg5, @OriginalArg(6) int arg6) { @@ -54,15 +54,26 @@ public final class Map extends SecondaryNode { if (this.defaultZoom == 255) { this.defaultZoom = 0; } - this.aClass69_23 = new LinkedList(); + this.chunks = new LinkedList(); } - @OriginalMember(owner = "client!bn", name = "a", descriptor = "(IBI)Z") + @OriginalMember(owner = "client!rb", name = "a", descriptor = "(Lclient!wa;Z)Lclient!bn;") + public static Map create(@OriginalArg(0) Buffer arg0) { + @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.chunks.addTail(new MapChunk(arg0.g2(), arg0.g2(), arg0.g2(), arg0.g2())); + } + local35.computeBounds(); + return local35; + } + + @OriginalMember(owner = "client!bn", name = "a", descriptor = "(IBI)Z") public final boolean method664(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { if (this.anInt763 > arg1 || arg1 > this.anInt770 || arg0 < this.anInt771 || arg0 > this.anInt758) { return false; } - for (@Pc(33) Class3_Sub24 local33 = (Class3_Sub24) this.aClass69_23.method2289(); local33 != null; local33 = (Class3_Sub24) this.aClass69_23.method2288()) { + for (@Pc(33) MapChunk local33 = (MapChunk) this.chunks.method2289(); local33 != null; local33 = (MapChunk) this.chunks.method2288()) { if (local33.method2760(arg0, arg1)) { return true; } @@ -71,12 +82,12 @@ public final class Map extends SecondaryNode { } @OriginalMember(owner = "client!bn", name = "f", descriptor = "(B)V") - public final void method665() { + public final void computeBounds() { this.anInt771 = 12800; this.anInt770 = 0; this.anInt758 = 0; this.anInt763 = 12800; - for (@Pc(29) Class3_Sub24 local29 = (Class3_Sub24) this.aClass69_23.method2289(); local29 != null; local29 = (Class3_Sub24) this.aClass69_23.method2288()) { + for (@Pc(29) MapChunk local29 = (MapChunk) this.chunks.method2289(); local29 != null; local29 = (MapChunk) this.chunks.method2288()) { if (local29.anInt3522 < this.anInt771) { this.anInt771 = local29.anInt3522; } diff --git a/client/src/main/java/Class3_Sub24.java b/client/src/main/java/MapChunk.java similarity index 85% rename from client/src/main/java/Class3_Sub24.java rename to client/src/main/java/MapChunk.java index e4a6515..a939457 100644 --- a/client/src/main/java/Class3_Sub24.java +++ b/client/src/main/java/MapChunk.java @@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!lh") -public final class Class3_Sub24 extends Node { +public final class MapChunk extends Node { @OriginalMember(owner = "client!lh", name = "y", descriptor = "I") public final int anInt3524; @@ -18,7 +18,7 @@ public final class Class3_Sub24 extends Node { public final int anInt3520; @OriginalMember(owner = "client!lh", name = "", descriptor = "(IIII)V") - public Class3_Sub24(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { + public MapChunk(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { this.anInt3524 = arg3; this.anInt3522 = arg1; this.anInt3523 = arg2; diff --git a/client/src/main/java/MapElementList.java b/client/src/main/java/MapElementList.java index 9136061..e61df6c 100644 --- a/client/src/main/java/MapElementList.java +++ b/client/src/main/java/MapElementList.java @@ -40,7 +40,7 @@ public final class MapElementList { if (local10 == -1) { return new MapElementList(0); } - @Pc(29) int[] local29 = arg1.method4503(local10); + @Pc(29) int[] local29 = arg1.getFileIds(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])); diff --git a/client/src/main/java/MapList.java b/client/src/main/java/MapList.java index f724bfc..f026375 100644 --- a/client/src/main/java/MapList.java +++ b/client/src/main/java/MapList.java @@ -1,6 +1,27 @@ +import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; public class MapList { + @OriginalMember(owner = "client!sh", name = "a", descriptor = "Lclient!ih;") + public static final LinkedList aClass69_120 = new LinkedList(); @OriginalMember(owner = "client!je", name = "W", descriptor = "Lclient!ve;") public static Js5 archive; + @OriginalMember(owner = "client!th", name = "p", descriptor = "[Lclient!mm;") + public static SoftwareSprite[] sprites; + @OriginalMember(owner = "client!va", name = "G", descriptor = "[Z") + public static boolean[] aBooleanArray130; + + @OriginalMember(owner = "client!ta", name = "a", descriptor = "([Lclient!mm;ILclient!ve;)V") + public static void init(@OriginalArg(0) SoftwareSprite[] arg0, @OriginalArg(2) Js5 arg1) { + archive = arg1; + sprites = arg0; + aBooleanArray130 = new boolean[sprites.length]; + aClass69_120.clear(); + @Pc(25) int local25 = archive.getGroupId(Static54.aClass100_374); + @Pc(30) int[] local30 = archive.getFileIds(local25); + for (@Pc(32) int local32 = 0; local32 < local30.length; local32++) { + aClass69_120.addTail(Map.create(new Buffer(archive.getFile(local25, local30[local32])))); + } + } } diff --git a/client/src/main/java/MidiPlayer.java b/client/src/main/java/MidiPlayer.java index db1f15b..f404dc8 100644 --- a/client/src/main/java/MidiPlayer.java +++ b/client/src/main/java/MidiPlayer.java @@ -1,3 +1,4 @@ +import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @@ -39,4 +40,68 @@ public class MidiPlayer { } return false; } + + @OriginalMember(owner = "client!ce", name = "a", descriptor = "(II)V") + public static void method801() { + Static253.anInt5527 = 0; + Static226.anInt5085 = -1; + Static14.anInt441 = 1; + Static57.anInt1757 = 2; + Static72.aBoolean116 = false; + Static172.aClass153_70 = null; + Static277.anInt5853 = -1; + } + + @OriginalMember(owner = "client!v", name = "a", descriptor = "(ZIILclient!ve;ZII)V") + public static void playFadeOut(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1, @OriginalArg(5) int arg2) { + Static172.aClass153_70 = arg1; + Static226.anInt5085 = 0; + Static277.anInt5853 = arg0; + Static72.aBoolean116 = false; + Static14.anInt441 = 1; + Static57.anInt1757 = 2; + Static253.anInt5527 = arg2; + } + + @OriginalMember(owner = "client!ck", name = "a", descriptor = "(ILclient!va;Lclient!ve;Lclient!ve;Lclient!ve;)Z") + public static boolean init(@OriginalArg(1) MidiPcmStream arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) Js5 arg2, @OriginalArg(4) Js5 arg3) { + Static210.aClass153_87 = arg1; + Static78.aClass153_32 = arg3; + Static252.aClass153_103 = arg2; + Static172.aClass3_Sub3_Sub4_2 = arg0; + return true; + } + + @OriginalMember(owner = "client!sj", name = "a", descriptor = "(Z)V") + public static void loop() { + try { + if (Static14.anInt441 == 1) { + @Pc(16) int local16 = Static172.aClass3_Sub3_Sub4_2.method4440(); + if (local16 > 0 && Static172.aClass3_Sub3_Sub4_2.method4414()) { + local16 -= Static57.anInt1757; + if (local16 < 0) { + local16 = 0; + } + Static172.aClass3_Sub3_Sub4_2.method4447(local16); + return; + } + Static172.aClass3_Sub3_Sub4_2.method4446(); + Static172.aClass3_Sub3_Sub4_2.method4426(); + Static144.aClass3_Sub29_1 = null; + Static27.aClass89_1 = null; + if (Static172.aClass153_70 == null) { + Static14.anInt441 = 0; + } else { + Static14.anInt441 = 2; + } + } + } catch (@Pc(62) Exception local62) { + local62.printStackTrace(); + Static172.aClass3_Sub3_Sub4_2.method4446(); + Static172.aClass153_70 = null; + Static144.aClass3_Sub29_1 = null; + Static14.anInt441 = 0; + Static27.aClass89_1 = null; + } + } } diff --git a/client/src/main/java/MiniMenu.java b/client/src/main/java/MiniMenu.java index bc904a4..965e0bf 100644 --- a/client/src/main/java/MiniMenu.java +++ b/client/src/main/java/MiniMenu.java @@ -2,5 +2,5 @@ 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(""); + public static final JagString COLOR_GREEN = JagString.parse(""); } diff --git a/client/src/main/java/Model.java b/client/src/main/java/Model.java index b4f209a..7d499b4 100644 --- a/client/src/main/java/Model.java +++ b/client/src/main/java/Model.java @@ -9,7 +9,21 @@ public abstract class Model extends Entity { @OriginalMember(owner = "client!ak", name = "s", descriptor = "Z") public boolean aBoolean303 = false; - @OriginalMember(owner = "client!ak", name = "c", descriptor = "()I") + @OriginalMember(owner = "client!ak", name = "a", descriptor = "([[III)I") + public static int method4556(@OriginalArg(0) int[][] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { + @Pc(3) int local3 = arg1 >> 7; + @Pc(7) int local7 = arg2 >> 7; + if (local3 < 0 || local7 < 0 || local3 >= arg0.length || local7 >= arg0[0].length) { + return 0; + } + @Pc(27) int local27 = arg1 & 0x7F; + @Pc(31) int local31 = arg2 & 0x7F; + @Pc(53) int local53 = arg0[local3][local7] * (128 - local27) + arg0[local3 + 1][local7] * local27 >> 7; + @Pc(79) int local79 = arg0[local3][local7 + 1] * (128 - local27) + arg0[local3 + 1][local7 + 1] * local27 >> 7; + return local53 * (128 - local31) + local79 * local31 >> 7; + } + + @OriginalMember(owner = "client!ak", name = "c", descriptor = "()I") public abstract int method4550(); @OriginalMember(owner = "client!ak", name = "b", descriptor = "()I") @@ -307,16 +321,16 @@ public abstract class Model extends Entity { protected final void method4573(@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(10) int local10 = -arg4 / 2; @Pc(15) int local15 = -arg5 / 2; - @Pc(24) int local24 = Static282.method4556(arg0, arg1 + local10, arg3 + local15); + @Pc(24) int local24 = method4556(arg0, arg1 + local10, arg3 + local15); @Pc(28) int local28 = arg4 / 2; @Pc(33) int local33 = -arg5 / 2; - @Pc(42) int local42 = Static282.method4556(arg0, arg1 + local28, arg3 + local33); + @Pc(42) int local42 = method4556(arg0, arg1 + local28, arg3 + local33); @Pc(47) int local47 = -arg4 / 2; @Pc(51) int local51 = arg5 / 2; - @Pc(60) int local60 = Static282.method4556(arg0, arg1 + local47, arg3 + local51); + @Pc(60) int local60 = method4556(arg0, arg1 + local47, arg3 + local51); @Pc(64) int local64 = arg4 / 2; @Pc(68) int local68 = arg5 / 2; - @Pc(77) int local77 = Static282.method4556(arg0, arg1 + local64, arg3 + local68); + @Pc(77) int local77 = method4556(arg0, arg1 + local64, arg3 + local68); @Pc(84) int local84 = local24 < local42 ? local24 : local42; @Pc(91) int local91 = local60 < local77 ? local60 : local77; @Pc(98) int local98 = local42 < local77 ? local42 : local77; diff --git a/client/src/main/java/Mouse.java b/client/src/main/java/Mouse.java index 31b8d1b..7aae83a 100644 --- a/client/src/main/java/Mouse.java +++ b/client/src/main/java/Mouse.java @@ -35,7 +35,30 @@ public final class Mouse implements MouseListener, MouseMotionListener, FocusLis } } - @OriginalMember(owner = "client!ug", name = "mouseMoved", descriptor = "(Ljava/awt/event/MouseEvent;)V") + @OriginalMember(owner = "client!ii", name = "b", descriptor = "(I)V") + public static void loop() { + @Pc(2) Mouse local2 = Static93.instance; + synchronized (Static93.instance) { + Static22.anInt723 = Static57.anInt1759; + Static215.anInt4873 = Static147.anInt3521; + Static223.anInt5032 = Static165.anInt4039; + Static150.clickButton = Static41.anInt1313; + Static7.clickX = Static34.anInt1034; + Static93.anInt2467++; + Static60.clickY = Static222.anInt4973; + Static133.clickTime = Static209.aLong161; + Static41.anInt1313 = 0; + } + } + + @OriginalMember(owner = "client!h", name = "a", descriptor = "(Ljava/awt/Component;Z)V") + public static void start(@OriginalArg(0) Component arg0) { + arg0.addMouseListener(Static93.instance); + arg0.addMouseMotionListener(Static93.instance); + arg0.addFocusListener(Static93.instance); + } + + @OriginalMember(owner = "client!ug", name = "mouseMoved", descriptor = "(Ljava/awt/event/MouseEvent;)V") @Override public final synchronized void mouseMoved(@OriginalArg(0) MouseEvent arg0) { if (Static93.instance != null) { diff --git a/client/src/main/java/MouseRecorder.java b/client/src/main/java/MouseRecorder.java index eeb3247..2a3b44e 100644 --- a/client/src/main/java/MouseRecorder.java +++ b/client/src/main/java/MouseRecorder.java @@ -7,6 +7,8 @@ public final class MouseRecorder implements Runnable { @OriginalMember(owner = "client!od", name = "f", descriptor = "Lclient!jd;") public static MouseRecorder instance; + @OriginalMember(owner = "client!tm", name = "e", descriptor = "Z") + public static boolean enabled = false; @OriginalMember(owner = "client!jd", name = "e", descriptor = "Z") public boolean running = true; diff --git a/client/src/main/java/MouseWheel.java b/client/src/main/java/MouseWheel.java index dba8d7f..ee03740 100644 --- a/client/src/main/java/MouseWheel.java +++ b/client/src/main/java/MouseWheel.java @@ -2,11 +2,21 @@ import java.awt.Component; 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!uc") public abstract class MouseWheel { - @OriginalMember(owner = "client!uc", name = "a", descriptor = "(I)I") + @OriginalMember(owner = "client!dh", name = "a", descriptor = "(B)Lclient!uc;") + public static MouseWheel create() { + try { + return (MouseWheel) Class.forName("JavaMouseWheel").getDeclaredConstructor().newInstance(); + } catch (@Pc(15) Throwable local15) { + return null; + } + } + + @OriginalMember(owner = "client!uc", name = "a", descriptor = "(I)I") public abstract int getRotation(); @OriginalMember(owner = "client!uc", name = "a", descriptor = "(ZLjava/awt/Component;)V") diff --git a/client/src/main/java/MsiType.java b/client/src/main/java/MsiType.java index 03277c9..b6464c5 100644 --- a/client/src/main/java/MsiType.java +++ b/client/src/main/java/MsiType.java @@ -28,20 +28,20 @@ public final class MsiType { @OriginalMember(owner = "client!aa", name = "a", descriptor = "(IB)Lclient!ek;") public final SoftwareIndexedSprite getSprite(@OriginalArg(0) int arg0) { - @Pc(17) SoftwareIndexedSprite local17 = (SoftwareIndexedSprite) Static219.sprites.get((long) (arg0 << 16 | this.spriteId)); + @Pc(17) SoftwareIndexedSprite local17 = (SoftwareIndexedSprite) MsiTypeList.sprites.get((long) (arg0 << 16 | this.spriteId)); if (local17 != null) { return local17; } - Static250.spritesArchive.isFileReady(this.spriteId); - local17 = Static164.loadSoftwareIndexedSprite(this.spriteId, Static250.spritesArchive); + MsiTypeList.spritesArchive.isFileReady(this.spriteId); + local17 = Static164.loadSoftwareIndexedSprite(this.spriteId, MsiTypeList.spritesArchive); if (local17 != null) { - local17.adjustPalette(Static173.redDelta, Static85.greenDelta, Static266.blueDelta); + local17.adjustPalette(MsiTypeList.redDelta, MsiTypeList.greenDelta, MsiTypeList.blueDelta); local17.innerWidth = local17.width; local17.innerHeight = local17.height; for (@Pc(59) int local59 = 0; local59 < arg0; local59++) { local17.flipVertical(); } - Static219.sprites.put(local17, (long) (arg0 << 16 | this.spriteId)); + MsiTypeList.sprites.put(local17, (long) (arg0 << 16 | this.spriteId)); } return local17; } diff --git a/client/src/main/java/MsiTypeList.java b/client/src/main/java/MsiTypeList.java index b595419..6d28690 100644 --- a/client/src/main/java/MsiTypeList.java +++ b/client/src/main/java/MsiTypeList.java @@ -3,18 +3,65 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; public class MsiTypeList { + @OriginalMember(owner = "client!sk", name = "hb", descriptor = "Lclient!n;") + public static final SoftLruHashTable types = new SoftLruHashTable(64); + @OriginalMember(owner = "client!rl", name = "P", descriptor = "Lclient!n;") + public static final SoftLruHashTable sprites = new SoftLruHashTable(64); + @OriginalMember(owner = "client!hj", name = "m", descriptor = "Lclient!ve;") + public static Js5 archive; + @OriginalMember(owner = "client!uf", name = "r", descriptor = "Lclient!ve;") + public static Js5 spritesArchive; + @OriginalMember(owner = "client!vk", name = "o", descriptor = "I") + public static int blueDelta; + @OriginalMember(owner = "client!gl", name = "e", descriptor = "I") + public static int greenDelta; + @OriginalMember(owner = "client!nk", name = "E", descriptor = "I") + public static int redDelta; + @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); + @Pc(10) MsiType local10 = (MsiType) types.get((long) arg0); if (local10 != null) { return local10; } - @Pc(20) byte[] local20 = Static98.aClass153_42.getFile(34, arg0); + @Pc(20) byte[] local20 = archive.getFile(34, arg0); local10 = new MsiType(); if (local20 != null) { local10.decode(new Buffer(local20), arg0); } - Static231.aClass99_29.put(local10, (long) arg0); + types.put(local10, (long) arg0); return local10; } + + @OriginalMember(owner = "client!og", name = "a", descriptor = "(Lclient!ve;Lclient!ve;B)V") + public static void init(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1) { + spritesArchive = arg1; + @Pc(12) int local12 = (int) (Math.random() * 21.0D) - 10; + archive = arg0; + @Pc(21) int local21 = (int) (Math.random() * 21.0D) - 10; + archive.getGroupCapacity(34); + @Pc(33) int local33 = (int) (Math.random() * 21.0D) - 10; + @Pc(40) int local40 = (int) (Math.random() * 41.0D) - 20; + blueDelta = local40 + local21; + greenDelta = local12 + local40; + redDelta = local40 + local33; + } + + @OriginalMember(owner = "client!qg", name = "h", descriptor = "(I)V") + public static void method3653() { + types.clear(); + sprites.clear(); + } + + @OriginalMember(owner = "client!vl", name = "b", descriptor = "(I)V") + public static void method4529() { + types.method3103(); + sprites.method3103(); + } + + @OriginalMember(owner = "client!wh", name = "a", descriptor = "(II)V") + public static void clean() { + types.clean(5); + sprites.clean(5); + } } diff --git a/client/src/main/java/MusicPlayer.java b/client/src/main/java/MusicPlayer.java new file mode 100644 index 0000000..d953b61 --- /dev/null +++ b/client/src/main/java/MusicPlayer.java @@ -0,0 +1,8 @@ +import org.openrs2.deob.annotation.OriginalMember; + +public class MusicPlayer { + @OriginalMember(owner = "client!s", name = "c", descriptor = "I") + public static int groupId = -1; + @OriginalMember(owner = "client!uf", name = "m", descriptor = "I") + public static int titleSong; +} diff --git a/client/src/main/java/Npc.java b/client/src/main/java/Npc.java index 334c3d4..5c7c686 100644 --- a/client/src/main/java/Npc.java +++ b/client/src/main/java/Npc.java @@ -26,8 +26,8 @@ public final class Npc extends PathingEntity { if (this.type == null) { return; } - @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(29) SeqType local29 = this.seqId != -1 && this.anInt3420 == 0 ? SeqTypeList.get(this.seqId) : null; + @Pc(53) SeqType local53 = this.anInt3366 == -1 || this.anInt3366 == this.method2681().idleAnimationId && local29 != null ? null : SeqTypeList.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) { return; @@ -39,7 +39,7 @@ public final class Npc extends PathingEntity { } @Pc(140) Model local140; 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); + local140 = ShadowModelList.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(); @Pc(146) float local146 = GlRenderer.method4166(); @@ -56,7 +56,7 @@ public final class Npc extends PathingEntity { this.method2685(local74, arg0); local140 = null; if (this.anInt3432 != -1 && this.anInt3399 != -1) { - @Pc(211) SpotAnimType local211 = Static34.method877(this.anInt3432); + @Pc(211) SpotAnimType local211 = SpotAnimTypeList.get(this.anInt3432); local140 = local211.method1319(this.anInt3418, this.anInt3399, this.anInt3361); if (local140 != null) { local140.method4575(0, -this.anInt3394, 0); diff --git a/client/src/main/java/NpcType.java b/client/src/main/java/NpcType.java index c031924..7f6bd9e 100644 --- a/client/src/main/java/NpcType.java +++ b/client/src/main/java/NpcType.java @@ -163,9 +163,9 @@ public final class NpcType { } if (local5 < 0 || local5 >= this.multiNpcs.length - 1 || this.multiNpcs[local5] == -1) { @Pc(55) int local55 = this.multiNpcs[this.multiNpcs.length - 1]; - return local55 == -1 ? null : Static214.get(local55); + return local55 == -1 ? null : NpcTypeList.get(local55); } else { - return Static214.get(this.multiNpcs[local5]); + return NpcTypeList.get(this.multiNpcs[local5]); } } @@ -195,7 +195,7 @@ public final class NpcType { } for (@Pc(35) int local35 = 0; local35 < this.multiNpcs.length; local35++) { if (this.multiNpcs[local35] != -1) { - @Pc(60) NpcType local60 = Static214.get(this.multiNpcs[local35]); + @Pc(60) NpcType local60 = NpcTypeList.get(this.multiNpcs[local35]); if (local60.idleSound != -1 || local60.walkSound != -1 || local60.runSound != -1) { return true; } @@ -220,7 +220,7 @@ public final class NpcType { @Pc(13) NpcType local13 = this.getMultiNpc(); return local13 == null ? null : local13.getBodyModel(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); } - @Pc(40) Model local40 = (Model) Static125.aClass99_18.get((long) this.id); + @Pc(40) Model local40 = (Model) NpcTypeList.aClass99_18.get((long) this.id); @Pc(46) boolean local46; @Pc(173) int local173; @Pc(235) int local235; @@ -236,7 +236,7 @@ public final class NpcType { if (local40 == null) { local46 = false; for (@Pc(48) int local48 = 0; local48 < this.anIntArray356.length; local48++) { - if (this.anIntArray356[local48] != -1 && !Static86.modelsArchive.isFileReady(0, this.anIntArray356[local48])) { + if (this.anIntArray356[local48] != -1 && !NpcTypeList.modelsArchive.isFileReady(0, this.anIntArray356[local48])) { local46 = true; } } @@ -246,7 +246,7 @@ public final class NpcType { @Pc(84) RawModel[] local84 = new RawModel[this.anIntArray356.length]; for (@Pc(86) int local86 = 0; local86 < this.anIntArray356.length; local86++) { if (this.anIntArray356[local86] != -1) { - local84[local86] = Static77.create(Static86.modelsArchive, this.anIntArray356[local86]); + local84[local86] = Static77.create(NpcTypeList.modelsArchive, this.anIntArray356[local86]); if (this.anIntArrayArray29 != null && this.anIntArrayArray29[local86] != null && local84[local86] != null) { local84[local86].translate(this.anIntArrayArray29[local86][0], this.anIntArrayArray29[local86][1], this.anIntArrayArray29[local86][2]); } @@ -254,7 +254,7 @@ public final class NpcType { } @Pc(156) BasType local156 = null; if (this.basId != -1) { - local156 = Static90.method1856(this.basId); + local156 = BasTypeList.get(this.basId); } if (local156 != null && local156.modelRotateTranslate != null) { for (local173 = 0; local173 < local156.modelRotateTranslate.length; local173++) { @@ -321,7 +321,7 @@ public final class NpcType { if (this.aByteArray51 == null || this.aByteArray51.length <= local173) { local593.recolor(this.recolorDestination[local173], this.recolorSource[local173]); } else { - local593.recolor(this.recolorDestination[local173], Static232.aShortArray74[this.aByteArray51[local173] & 0xFF]); + local593.recolor(this.recolorDestination[local173], client.aShortArray74[this.aByteArray51[local173] & 0xFF]); } } } @@ -334,7 +334,7 @@ public final class NpcType { if (GlRenderer.enabled) { ((GlModel) local40).method4111(false, false, false, false, false, true); } - Static125.aClass99_18.put(local40, (long) this.id); + NpcTypeList.aClass99_18.put(local40, (long) this.id); } local46 = false; @Pc(721) boolean local721 = false; @@ -343,7 +343,7 @@ public final class NpcType { local173 = arg0 == null ? 0 : arg0.length; for (local235 = 0; local235 < local173; local235++) { if (arg0[local235] != null) { - @Pc(753) SeqType local753 = Static36.get(arg0[local235].anInt5396); + @Pc(753) SeqType local753 = SeqTypeList.get(arg0[local235].anInt5396); if (local753.frames != null) { Static146.aClass144Array1[local235] = local753; local207 = arg0[local235].anInt5398; @@ -507,11 +507,11 @@ public final class NpcType { } else if (this.anIntArray354 == null) { return null; } else { - @Pc(41) Model local41 = (Model) Static262.headModels.get((long) this.id); + @Pc(41) Model local41 = (Model) NpcTypeList.headModels.get((long) this.id); if (local41 == null) { @Pc(46) boolean local46 = false; for (@Pc(48) int local48 = 0; local48 < this.anIntArray354.length; local48++) { - if (!Static86.modelsArchive.isFileReady(0, this.anIntArray354[local48])) { + if (!NpcTypeList.modelsArchive.isFileReady(0, this.anIntArray354[local48])) { local46 = true; } } @@ -520,7 +520,7 @@ public final class NpcType { } @Pc(82) RawModel[] local82 = new RawModel[this.anIntArray354.length]; for (@Pc(84) int local84 = 0; local84 < this.anIntArray354.length; local84++) { - local82[local84] = Static77.create(Static86.modelsArchive, this.anIntArray354[local84]); + local82[local84] = Static77.create(NpcTypeList.modelsArchive, this.anIntArray354[local84]); } @Pc(119) RawModel local119; if (local82.length == 1) { @@ -534,7 +534,7 @@ public final class NpcType { if (this.aByteArray51 == null || local130 >= this.aByteArray51.length) { local119.recolor(this.recolorDestination[local130], this.recolorSource[local130]); } else { - local119.recolor(this.recolorDestination[local130], Static232.aShortArray74[this.aByteArray51[local130] & 0xFF]); + local119.recolor(this.recolorDestination[local130], client.aShortArray74[this.aByteArray51[local130] & 0xFF]); } } } @@ -544,7 +544,7 @@ public final class NpcType { } } local41 = local119.createModel(64, 768, -50, -10, -50); - Static262.headModels.put(local41, (long) this.id); + NpcTypeList.headModels.put(local41, (long) this.id); } if (arg0 != null) { local41 = arg0.method4215(local41, arg2, arg1, arg3); diff --git a/client/src/main/java/NpcTypeList.java b/client/src/main/java/NpcTypeList.java new file mode 100644 index 0000000..23ce665 --- /dev/null +++ b/client/src/main/java/NpcTypeList.java @@ -0,0 +1,60 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class NpcTypeList { + @OriginalMember(owner = "client!he", name = "V", descriptor = "Lclient!n;") + public static final SoftLruHashTable types = new SoftLruHashTable(64); + @OriginalMember(owner = "client!jl", name = "x", descriptor = "Lclient!n;") + public static final SoftLruHashTable aClass99_18 = new SoftLruHashTable(50); + @OriginalMember(owner = "client!vf", name = "k", descriptor = "Lclient!n;") + public static final SoftLruHashTable headModels = new SoftLruHashTable(5); + @OriginalMember(owner = "client!gm", name = "ib", descriptor = "Lclient!ve;") + public static Js5 modelsArchive; + @OriginalMember(owner = "client!eh", name = "f", descriptor = "Lclient!ve;") + public static Js5 archive; + + @OriginalMember(owner = "client!h", name = "a", descriptor = "(Lclient!ve;Lclient!ve;Z)V") + public static void init(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1) { + modelsArchive = arg0; + archive = arg1; + } + + @OriginalMember(owner = "client!rg", name = "b", descriptor = "(II)Lclient!me;") + public static NpcType get(@OriginalArg(0) int arg0) { + @Pc(10) NpcType local10 = (NpcType) types.get((long) arg0); + if (local10 != null) { + return local10; + } + @Pc(26) byte[] local26 = archive.getFile(Static60.method1447(arg0), Static179.method3322(arg0)); + local10 = new NpcType(); + local10.id = arg0; + if (local26 != null) { + local10.decode(new Buffer(local26)); + } + local10.method2942(); + types.put(local10, (long) arg0); + return local10; + } + + @OriginalMember(owner = "client!t", name = "b", descriptor = "(B)V") + public static void method4001() { + types.method3103(); + aClass99_18.method3103(); + headModels.method3103(); + } + + @OriginalMember(owner = "client!qi", name = "e", descriptor = "(B)V") + public static void method3673() { + types.clear(); + aClass99_18.clear(); + headModels.clear(); + } + + @OriginalMember(owner = "client!ra", name = "c", descriptor = "(BI)V") + public static void clean() { + types.clean(5); + aClass99_18.clean(5); + headModels.clean(5); + } +} diff --git a/client/src/main/java/ObjStack.java b/client/src/main/java/ObjStack.java index fecd8f5..45eff77 100644 --- a/client/src/main/java/ObjStack.java +++ b/client/src/main/java/ObjStack.java @@ -23,7 +23,7 @@ public final class ObjStack extends Entity { @OriginalMember(owner = "client!uj", 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) { - @Pc(16) Model local16 = Static71.get(this.anInt5555).getModel(-1, 0, null, this.anInt5550, 0); + @Pc(16) Model local16 = ObjTypeList.get(this.anInt5555).getModel(-1, 0, null, this.anInt5550, 0); if (local16 != null) { local16.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10); this.anInt5553 = local16.method4549(); diff --git a/client/src/main/java/ObjType.java b/client/src/main/java/ObjType.java index a507331..48f2346 100644 --- a/client/src/main/java/ObjType.java +++ b/client/src/main/java/ObjType.java @@ -193,10 +193,10 @@ public final class ObjType { return true; } @Pc(33) boolean local33 = true; - if (!Static230.modelsArchive.isFileReady(0, local6)) { + if (!ObjTypeList.modelsArchive.isFileReady(0, local6)) { local33 = false; } - if (local9 != -1 && !Static230.modelsArchive.isFileReady(0, local9)) { + if (local9 != -1 && !ObjTypeList.modelsArchive.isFileReady(0, local9)) { local33 = false; } return local33; @@ -222,7 +222,7 @@ public final class ObjType { } } if (local23 != -1) { - return Static71.get(local23); + return ObjTypeList.get(local23); } } return this; @@ -242,13 +242,13 @@ public final class ObjType { return true; } @Pc(41) boolean local41 = true; - if (!Static230.modelsArchive.isFileReady(0, local9)) { + if (!ObjTypeList.modelsArchive.isFileReady(0, local9)) { local41 = false; } - if (local6 != -1 && !Static230.modelsArchive.isFileReady(0, local6)) { + if (local6 != -1 && !ObjTypeList.modelsArchive.isFileReady(0, local6)) { local41 = false; } - if (local20 != -1 && !Static230.modelsArchive.isFileReady(0, local20)) { + if (local20 != -1 && !ObjTypeList.modelsArchive.isFileReady(0, local20)) { local41 = false; } return local41; @@ -309,12 +309,12 @@ public final class ObjType { } } if (local22 != -1) { - return Static71.get(local22).getModel(arg0, arg1, arg2, 1, arg4); + return ObjTypeList.get(local22).getModel(arg0, arg1, arg2, 1, arg4); } } - @Pc(76) Model local76 = (Model) Static244.models.get((long) this.anInt2354); + @Pc(76) Model local76 = (Model) ObjTypeList.models.get((long) this.anInt2354); if (local76 == null) { - @Pc(85) RawModel local85 = Static77.create(Static230.modelsArchive, this.model); + @Pc(85) RawModel local85 = Static77.create(ObjTypeList.modelsArchive, this.model); if (local85 == null) { return null; } @@ -324,7 +324,7 @@ public final class ObjType { if (this.recolorDestinationPalette == null || local97 >= this.recolorDestinationPalette.length) { local85.recolor(this.recolorDestination[local97], this.recolorSource[local97]); } else { - local85.recolor(this.recolorDestination[local97], Static259.aShortArray87[this.recolorDestinationPalette[local97] & 0xFF]); + local85.recolor(this.recolorDestination[local97], client.aShortArray87[this.recolorDestinationPalette[local97] & 0xFF]); } } } @@ -341,7 +341,7 @@ public final class ObjType { if (GlRenderer.enabled) { ((GlModel) local76).method4111(false, false, false, false, false, true); } - Static244.models.put(local76, (long) this.anInt2354); + ObjTypeList.models.put(local76, (long) this.anInt2354); } if (arg2 != null) { local76 = arg2.method4215(local76, arg0, arg1, arg4); @@ -539,9 +539,9 @@ public final class ObjType { if (local17 == -1) { return null; } - @Pc(36) RawModel local36 = Static77.create(Static230.modelsArchive, local17); + @Pc(36) RawModel local36 = Static77.create(ObjTypeList.modelsArchive, local17); if (local4 != -1) { - @Pc(44) RawModel local44 = Static77.create(Static230.modelsArchive, local4); + @Pc(44) RawModel local44 = Static77.create(ObjTypeList.modelsArchive, local4); @Pc(55) RawModel[] local55 = new RawModel[] { local36, local44 }; local36 = new RawModel(local55, 2); } @@ -572,14 +572,14 @@ public final class ObjType { if (local4 == -1) { return null; } - @Pc(43) RawModel local43 = Static77.create(Static230.modelsArchive, local4); + @Pc(43) RawModel local43 = Static77.create(ObjTypeList.modelsArchive, local4); if (local18 != -1) { - @Pc(54) RawModel local54 = Static77.create(Static230.modelsArchive, local18); + @Pc(54) RawModel local54 = Static77.create(ObjTypeList.modelsArchive, local18); if (local21 == -1) { @Pc(68) RawModel[] local68 = new RawModel[] { local43, local54 }; local43 = new RawModel(local68, 2); } else { - @Pc(81) RawModel local81 = Static77.create(Static230.modelsArchive, local21); + @Pc(81) RawModel local81 = Static77.create(ObjTypeList.modelsArchive, local21); @Pc(96) RawModel[] local96 = new RawModel[] { local43, local54, local81 }; local43 = new RawModel(local96, 3); } @@ -626,7 +626,7 @@ public final class ObjType { @OriginalMember(owner = "client!h", name = "d", descriptor = "(I)Lclient!w;") public final SoftwareModel getInvModel() { - @Pc(11) RawModel local11 = Static77.create(Static230.modelsArchive, this.model); + @Pc(11) RawModel local11 = Static77.create(ObjTypeList.modelsArchive, this.model); if (local11 == null) { return null; } @@ -636,7 +636,7 @@ public final class ObjType { if (this.recolorDestinationPalette == null || local21 >= this.recolorDestinationPalette.length) { local11.recolor(this.recolorDestination[local21], this.recolorSource[local21]); } else { - local11.recolor(this.recolorDestination[local21], Static259.aShortArray87[this.recolorDestinationPalette[local21] & 0xFF]); + local11.recolor(this.recolorDestination[local21], client.aShortArray87[this.recolorDestinationPalette[local21] & 0xFF]); } } } diff --git a/client/src/main/java/ObjTypeList.java b/client/src/main/java/ObjTypeList.java new file mode 100644 index 0000000..1882625 --- /dev/null +++ b/client/src/main/java/ObjTypeList.java @@ -0,0 +1,97 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class ObjTypeList { + @OriginalMember(owner = "client!cb", name = "Y", descriptor = "Lclient!n;") + public static final SoftLruHashTable types = new SoftLruHashTable(64); + @OriginalMember(owner = "client!tl", name = "c", descriptor = "Lclient!n;") + public static final SoftLruHashTable models = new SoftLruHashTable(50); + @OriginalMember(owner = "client!jd", name = "c", descriptor = "Lclient!n;") + public static final SoftLruHashTable objectSpriteCache = new SoftLruHashTable(100); + @OriginalMember(owner = "client!tg", name = "f", descriptor = "Z") + public static boolean aBoolean276; + @OriginalMember(owner = "client!sj", name = "r", descriptor = "Lclient!ve;") + public static Js5 modelsArchive; + @OriginalMember(owner = "client!um", name = "U", descriptor = "Lclient!dd;") + public static SoftwareFont aClass3_Sub2_Sub9_Sub1_1; + @OriginalMember(owner = "client!wa", name = "X", descriptor = "[Lclient!na;") + public static JagString[] aClass100Array87 = null; + @OriginalMember(owner = "client!ld", name = "g", descriptor = "[Lclient!na;") + public static JagString[] aClass100Array104 = null; + @OriginalMember(owner = "client!nh", name = "eb", descriptor = "I") + public static int anInt3245; + @OriginalMember(owner = "client!nd", name = "n", descriptor = "Lclient!ve;") + public static Js5 archive; + + @OriginalMember(owner = "client!th", name = "a", descriptor = "(ZBLclient!ve;Lclient!dd;Lclient!ve;)V") + public static void init(@OriginalArg(2) Js5 arg0, @OriginalArg(3) SoftwareFont arg1, @OriginalArg(4) Js5 arg2) { + aBoolean276 = true; + modelsArchive = arg2; + archive = arg0; + @Pc(23) int local23 = archive.method4483() - 1; + anInt3245 = archive.getGroupCapacity(local23) + local23 * 256; + aClass100Array104 = new JagString[] { null, null, null, null, LocalizedText.DROP}; + aClass100Array87 = new JagString[] { null, null, LocalizedText.TAKE, null, null }; + aClass3_Sub2_Sub9_Sub1_1 = arg1; + } + + @OriginalMember(owner = "client!fk", name = "a", descriptor = "(IB)Lclient!h;") + public static ObjType get(@OriginalArg(0) int arg0) { + @Pc(6) ObjType local6 = (ObjType) types.get((long) arg0); + if (local6 != null) { + return local6; + } + @Pc(25) byte[] local25 = archive.getFile(Static18.method554(arg0), Static247.method4247(arg0)); + local6 = new ObjType(); + local6.anInt2354 = arg0; + if (local25 != null) { + local6.decode(new Buffer(local25)); + } + local6.method1826(); + if (local6.certificateTemplate != -1) { + local6.generateCertificate(get(local6.certificateLink), get(local6.certificateTemplate)); + } + if (local6.lentTemplate != -1) { + local6.method1823(get(local6.lentLink), get(local6.lentTemplate)); + } + if (!aBoolean276 && local6.members) { + local6.name = LocalizedText.MEMBERS_OBJECT; + local6.team = 0; + local6.inventoryOps = aClass100Array104; + local6.stockMarket = false; + local6.ops = aClass100Array87; + } + types.put(local6, (long) arg0); + return local6; + } + + @OriginalMember(owner = "client!i", name = "r", descriptor = "(I)V") + public static void method2239() { + types.method3103(); + models.method3103(); + objectSpriteCache.method3103(); + } + + @OriginalMember(owner = "client!ob", name = "a", descriptor = "(B)V") + public static void method3302() { + types.clear(); + models.clear(); + objectSpriteCache.clear(); + } + + @OriginalMember(owner = "client!pf", name = "c", descriptor = "(II)V") + public static void clean() { + types.clean(5); + models.clean(5); + objectSpriteCache.clean(5); + } + + @OriginalMember(owner = "client!al", name = "a", descriptor = "(ZI)V") + public static void setAllowMembers(@OriginalArg(0) boolean arg0) { + if (arg0 != aBoolean276) { + aBoolean276 = arg0; + method3302(); + } + } +} diff --git a/client/src/main/java/Packet.java b/client/src/main/java/Packet.java index 09e28b1..b1ec6f7 100644 --- a/client/src/main/java/Packet.java +++ b/client/src/main/java/Packet.java @@ -25,7 +25,7 @@ public final class Packet extends Buffer { @OriginalMember(owner = "client!i", name = "a", descriptor = "(BI[BI)V") public final void method2237(@OriginalArg(2) byte[] arg0, @OriginalArg(3) int arg1) { for (@Pc(17) int local17 = 0; local17 < arg1; local17++) { - arg0[local17] = (byte) (this.data[this.offset++] - this.aClass71_1.method2295()); + arg0[local17] = (byte) (this.data[this.offset++] - this.aClass71_1.getNextKey()); } } @@ -49,7 +49,7 @@ public final class Packet extends Buffer { } @OriginalMember(owner = "client!i", name = "a", descriptor = "([IZ)V") - public final void method2240(@OriginalArg(0) int[] arg0) { + public final void setKey(@OriginalArg(0) int[] arg0) { this.aClass71_1 = new IsaacRandom(arg0); } @@ -60,12 +60,12 @@ public final class Packet extends Buffer { @OriginalMember(owner = "client!i", name = "r", descriptor = "(II)V") public final void p1isaac(@OriginalArg(1) int arg0) { - this.data[this.offset++] = (byte) (arg0 + this.aClass71_1.method2295()); + this.data[this.offset++] = (byte) (arg0 + this.aClass71_1.getNextKey()); } @OriginalMember(owner = "client!i", name = "s", descriptor = "(I)I") - public final int method2243() { - return this.data[this.offset++] - this.aClass71_1.method2295() & 0xFF; + public final int g1isaac() { + return this.data[this.offset++] - this.aClass71_1.getNextKey() & 0xFF; } @OriginalMember(owner = "client!i", name = "h", descriptor = "(Z)V") diff --git a/client/src/main/java/ParamTypeList.java b/client/src/main/java/ParamTypeList.java new file mode 100644 index 0000000..3aa156e --- /dev/null +++ b/client/src/main/java/ParamTypeList.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 ParamTypeList { + @OriginalMember(owner = "client!wd", name = "a", descriptor = "Lclient!gn;") + public static final LruHashTable types = new LruHashTable(64); + @OriginalMember(owner = "client!d", name = "hb", descriptor = "Lclient!ve;") + public static Js5 archive; + + @OriginalMember(owner = "client!sf", name = "a", descriptor = "(BLclient!ve;)V") + public static void init(@OriginalArg(1) Js5 arg0) { + archive = arg0; + } + + @OriginalMember(owner = "client!ih", name = "a", descriptor = "(II)Lclient!hn;") + public static ParamType get(@OriginalArg(1) int arg0) { + @Pc(6) ParamType local6 = (ParamType) types.get((long) arg0); + if (local6 != null) { + return local6; + } + @Pc(30) byte[] local30 = archive.getFile(11, arg0); + local6 = new ParamType(); + if (local30 != null) { + local6.decode(new Buffer(local30)); + } + types.put(local6, (long) arg0); + return local6; + } +} diff --git a/client/src/main/java/PathFinder.java b/client/src/main/java/PathFinder.java new file mode 100644 index 0000000..dd85f91 --- /dev/null +++ b/client/src/main/java/PathFinder.java @@ -0,0 +1,6 @@ +import org.openrs2.deob.annotation.OriginalMember; + +public class PathFinder { + @OriginalMember(owner = "client!li", name = "h", descriptor = "[Lclient!mj;") + public static final CollisionMap[] collisionMaps = new CollisionMap[4]; +} diff --git a/client/src/main/java/PathingEntity.java b/client/src/main/java/PathingEntity.java index 2a3e5f6..e78fd3d 100644 --- a/client/src/main/java/PathingEntity.java +++ b/client/src/main/java/PathingEntity.java @@ -255,7 +255,7 @@ public abstract class PathingEntity extends Entity { @OriginalMember(owner = "client!fe", name = "b", descriptor = "(Z)Lclient!ck;") public final BasType method2681() { @Pc(7) int local7 = this.method2688(); - return local7 == -1 ? Static4.aClass20_1 : Static90.method1856(local7); + return local7 == -1 ? Static4.aClass20_1 : BasTypeList.get(local7); } @OriginalMember(owner = "client!fe", name = "a", descriptor = "(B)Z") @@ -265,7 +265,7 @@ 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.seqId != -1 && Static36.get(this.seqId).anInt5349 == 1) { + if (this.seqId != -1 && SeqTypeList.get(this.seqId).anInt5349 == 1) { this.seqId = -1; } if (!arg3) { @@ -306,7 +306,7 @@ public abstract class PathingEntity extends Entity { local10--; local15++; } - if (this.seqId != -1 && Static36.get(this.seqId).anInt5349 == 1) { + if (this.seqId != -1 && SeqTypeList.get(this.seqId).anInt5349 == 1) { this.seqId = -1; } if (this.movementQueueSize < 9) { @@ -363,13 +363,13 @@ public abstract class PathingEntity extends Entity { @Pc(53) int local53 = -local27 / 2; @Pc(64) int local64 = local53 * local43 - local48 * local39 >> 16; @Pc(75) int local75 = local39 * local53 + local43 * local48 >> 16; - @Pc(87) int local87 = Static207.method3685(Static55.level, local75 + this.xFine, this.zFine + local64); + @Pc(87) int local87 = SceneGraph.getTileHeight(Static55.level, local75 + this.xFine, this.zFine + local64); @Pc(91) int local91 = local24 / 2; @Pc(96) int local96 = -local27 / 2; @Pc(106) int local106 = local91 * local43 + local96 * local39 >> 16; @Pc(110) int local110 = local27 / 2; @Pc(121) int local121 = local96 * local43 - local91 * local39 >> 16; - @Pc(134) int local134 = Static207.method3685(Static55.level, local106 + this.xFine, this.zFine - -local121); + @Pc(134) int local134 = SceneGraph.getTileHeight(Static55.level, local106 + this.xFine, this.zFine - -local121); @Pc(139) int local139 = -local24 / 2; @Pc(150) int local150 = local110 * local43 - local39 * local139 >> 16; @Pc(154) int local154 = local27 / 2; @@ -377,9 +377,9 @@ public abstract class PathingEntity extends Entity { @Pc(169) int local169 = local39 * local110 + local43 * local139 >> 16; @Pc(179) int local179 = local154 * local43 - local39 * local158 >> 16; @Pc(189) int local189 = local39 * local154 + local43 * local158 >> 16; - @Pc(201) int local201 = Static207.method3685(Static55.level, this.xFine + local169, local150 + this.zFine); + @Pc(201) int local201 = SceneGraph.getTileHeight(Static55.level, this.xFine + local169, local150 + this.zFine); @Pc(212) int local212 = local134 > local87 ? local87 : local134; - @Pc(224) int local224 = Static207.method3685(Static55.level, local189 + this.xFine, local179 + this.zFine); + @Pc(224) int local224 = SceneGraph.getTileHeight(Static55.level, local189 + this.xFine, local179 + this.zFine); @Pc(231) int local231 = local224 > local201 ? local201 : local224; @Pc(238) int local238 = local224 > local134 ? local134 : local224; @Pc(245) int local245 = local201 <= local87 ? local201 : local87; diff --git a/client/src/main/java/Player.java b/client/src/main/java/Player.java index 2ad8ced..b15f57c 100644 --- a/client/src/main/java/Player.java +++ b/client/src/main/java/Player.java @@ -61,7 +61,7 @@ public final class Player extends PathingEntity { @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(89) SeqType local89 = SeqTypeList.get(arg1); @Pc(92) int local92 = local89.anInt5347; if (local92 == 1) { arg2.anInt3420 = arg0; @@ -74,7 +74,7 @@ public final class Player extends PathingEntity { if (local92 == 2) { arg2.anInt3371 = 0; } - } else if (arg1 == -1 || arg2.seqId == -1 || Static36.get(arg1).anInt5355 >= Static36.get(arg2.seqId).anInt5355) { + } else if (arg1 == -1 || arg2.seqId == -1 || SeqTypeList.get(arg1).anInt5355 >= SeqTypeList.get(arg2.seqId).anInt5355) { arg2.anInt3373 = 1; arg2.anInt3425 = 0; arg2.anInt3420 = arg0; @@ -83,7 +83,7 @@ public final class Player extends PathingEntity { 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); + SoundPlayer.playSeqSound(arg2.zFine, SeqTypeList.get(arg2.seqId), arg2.xFine, arg2 == PlayerList.self, arg2.anInt3425); } } } @@ -91,7 +91,7 @@ public final class Player extends PathingEntity { @OriginalMember(owner = "client!e", name = "c", descriptor = "(B)I") @Override public final int getSize() { - return this.appearance == null || this.appearance.anInt2492 == -1 ? super.getSize() : Static214.get(this.appearance.anInt2492).soze; + return this.appearance == null || this.appearance.anInt2492 == -1 ? super.getSize() : NpcTypeList.get(this.appearance.anInt2492).soze; } @OriginalMember(owner = "client!e", name = "b", descriptor = "(I)I") @@ -133,9 +133,9 @@ public final class Player extends PathingEntity { break; } if (local134 >= 32768) { - local134 = Static234.anIntArray455[local134 - 32768]; + local134 = Equipment.anIntArray455[local134 - 32768]; local44[local102] = local134 | 0x40000000; - local175 = Static71.get(local134).team; + local175 = ObjTypeList.get(local134).team; if (local175 != 0) { this.anInt1650 = local175; } @@ -147,14 +147,14 @@ public final class Player extends PathingEntity { @Pc(197) int[] local197 = new int[5]; for (local111 = 0; local111 < 5; local111++) { local127 = arg0.g1(); - if (local127 < 0 || local127 >= Static33.aShortArrayArray2[local111].length) { + if (local127 < 0 || local127 >= PlayerAppearance.aShortArrayArray2[local111].length) { local127 = 0; } local197[local111] = local127; } this.anInt3365 = arg0.g2(); @Pc(236) long local236 = arg0.g8(); - this.aClass100_364 = Static79.decode37(local236).method3125(); + this.aClass100_364 = Base37.decodeLowerCase(local236).method3125(); this.anInt1652 = arg0.g1(); if (local37) { this.anInt1671 = arg0.g2(); @@ -205,8 +205,8 @@ public final class Player extends PathingEntity { if (this.appearance == null) { return; } - @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(25) SeqType local25 = this.seqId != -1 && this.anInt3420 == 0 ? SeqTypeList.get(this.seqId) : null; + @Pc(54) SeqType local54 = this.anInt3366 == -1 || this.aBoolean98 || this.anInt3366 == this.method2681().idleAnimationId && local25 != null ? null : SeqTypeList.get(this.anInt3366); @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) { @@ -229,8 +229,8 @@ public final class Player extends PathingEntity { } this.anInt3413 = local76.method4549(); @Pc(184) Model local184; - 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 (Preferences.characterShadowsOn && (this.appearance.anInt2492 == -1 || NpcTypeList.get(this.appearance.anInt2492).shadow)) { + local184 = ShadowModelList.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(); @Pc(190) float local190 = GlRenderer.method4166(); @@ -277,7 +277,7 @@ public final class Player extends PathingEntity { this.method2685(local76, arg0); local184 = null; if (!this.aBoolean98 && this.anInt3432 != -1 && this.anInt3399 != -1) { - @Pc(471) SpotAnimType local471 = Static34.method877(this.anInt3432); + @Pc(471) SpotAnimType local471 = SpotAnimTypeList.get(this.anInt3432); local184 = local471.method1319(this.anInt3418, this.anInt3399, this.anInt3361); if (local184 != null) { local184.method4575(0, -this.anInt3394, 0); @@ -352,7 +352,7 @@ public final class Player extends PathingEntity { return; } @Pc(34) int local34 = (int) (Math.atan2((double) arg3, (double) arg1) * 325.949D) & 0x7FF; - @Pc(46) Model local46 = Static220.method3800(local34, this.zFine, arg11, this.xFine, arg2, this.anInt3424); + @Pc(46) Model local46 = HintArrowManager.getModel(local34, this.zFine, arg11, this.xFine, arg2, this.anInt3424); if (local46 == null) { return; } diff --git a/client/src/main/java/PlayerAppearance.java b/client/src/main/java/PlayerAppearance.java index a860384..11f8301 100644 --- a/client/src/main/java/PlayerAppearance.java +++ b/client/src/main/java/PlayerAppearance.java @@ -8,7 +8,39 @@ public final class PlayerAppearance { @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") + @OriginalMember(owner = "client!wd", name = "d", descriptor = "[I") + public static final int[] anIntArray451 = new int[] { 8, 11, 4, 6, 9, 7, 10, 0 }; + @OriginalMember(owner = "client!r", name = "b", descriptor = "[Lclient!tk;") + public static final SeqType[] aClass144Array2 = new SeqType[14]; + @OriginalMember(owner = "client!ri", name = "b", descriptor = "[I") + public static final int[] anIntArray187 = new int[14]; + @OriginalMember(owner = "client!uf", name = "j", descriptor = "Lclient!n;") + public static final SoftLruHashTable aClass99_33 = new SoftLruHashTable(260); + @OriginalMember(owner = "client!l", name = "b", descriptor = "Lclient!n;") + public static final SoftLruHashTable aClass99_21 = new SoftLruHashTable(5); + @OriginalMember(owner = "client!aa", name = "h", descriptor = "[S") + public static final short[] aShortArray1 = new short[] { 960, 957, -21568, -21571, 22464 }; + @OriginalMember(owner = "client!ci", name = "u", descriptor = "[[S") + public static final short[][] aShortArrayArray1 = new short[][] { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 44, 64, 84, 104, 304, 678, 698, 550, 934, 954, 6448, 6946, 6966, 2352, 2726, 2746, 10544, 10918, 10938, 10304, 10550, 10570, 14640, 15014, 15034, 19760, 20134, 20154, -29392, -29018, -28998, 31024, 31270, 31290, -24272, -23898, -23878, -19152, -18778, -18758, -14032, -13658, -13638, -6864, -6490, -6470, 516, 536, 6788, 6808, 11012, 11032, 14980, 15000, 21124, 21144, -28924, -28904, -22012, -21992, -12924, -12904 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10339, 10574, 10425, 10398, 10345, 7512, 8507, 7378, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 44, 64, 84, 104, 304, 678, 698, 550, 934, 954, 6448, 6946, 6966, 2352, 2726, 2746, 10544, 10918, 10938, 10304, 10550, 10570, 14640, 15014, 15034, 19760, 20134, 20154, -29392, -29018, -28998, 31024, 31270, 31290, -24272, -23898, -23878, -19152, -18778, -18758, -14032, -13658, -13638, -6864, -6490, -6470, 516, 536, 6788, 6808, 11012, 11032, 14980, 15000, 21124, 21144, -28924, -28904, -22012, -21992, -12924, -12904 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13753, 13737, 13719, 13883, 13863, 13974, 19643, 18601, 16532, 23993, 25121, 24980, 26944, 26921, 24854, 27191, 27171, 26130, 26941, 28696, 30100, 12477, 10407, 10388, 10685, 10665, 10646, 6711, 6693, 6674, 6965, 7073, 7056, 2361, 4387, 3346, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 44, 64, 84, 104, 304, 678, 698, 550, 934, 954, 6448, 6946, 6966, 2352, 2726, 2746, 10544, 10918, 10938, 10304, 10550, 10570, 14640, 15014, 15034, 19760, 20134, 20154, -29392, -29018, -28998, 31024, 31270, 31290, -24272, -23898, -23878, -19152, -18778, -18758, -14032, -13658, -13638, -6864, -6490, -6470, 516, 536, 6788, 6808, 11012, 11032, 14980, 15000, 21124, 21144, -28924, -28904, -22012, -21992, -12924, -12904 } }; + @OriginalMember(owner = "client!q", name = "d", descriptor = "[[S") + public static final short[][] aShortArrayArray4 = new short[][] { { 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898 }, { 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10347, 10582, 10429, 10407, 10359, 8414, 9540, 10456, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898 }, { 4300, 3294, 3303, 3264, 4506, 4382, 4387, 5293, 7622, 7384, 8412, 7496, 86, 123, 111, 99, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 13766, 13745, 13726, 13890, 13743, 13852, 17602, 18605, 21660, 24000, 24997, 24088, 27972, 25903, 26904, 27193, 27175, 27156, 30020, 28975, 29976, 12482, 13485, 10392, 10692, 10669, 10776, 6717, 6695, 7830, 6971, 6951, 5910, 3389, 3369, 3356, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898 } }; + @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!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!pk", name = "V", descriptor = "[S") + public static final short[] aShortArray64 = new short[] { -10304, 9104, -1, -1, -1 }; + @OriginalMember(owner = "client!vd", name = "B", descriptor = "[S") + public static final short[] aShortArray71 = new short[] { 6798, 8741, 25238, 4626, 4550 }; + @OriginalMember(owner = "client!cj", name = "e", descriptor = "[[S") + public static short[][] aShortArrayArray2; + @OriginalMember(owner = "client!nj", name = "m", descriptor = "[[S") + public static short[][] aShortArrayArray7; + @OriginalMember(owner = "client!qe", name = "r", descriptor = "[S") + public static short[] aShortArray65; + @OriginalMember(owner = "client!mj", name = "C", descriptor = "[S") + public static short[] aShortArray41; + @OriginalMember(owner = "client!hh", name = "e", descriptor = "I") public int anInt2492; @OriginalMember(owner = "client!hh", name = "i", descriptor = "J") @@ -32,40 +64,46 @@ public final class PlayerAppearance { @OriginalMember(owner = "client!hh", name = "x", descriptor = "Z") public boolean aBoolean141; - @OriginalMember(owner = "client!hh", name = "a", descriptor = "(IIIILclient!tk;III)Lclient!ak;") + @OriginalMember(owner = "client!wk", name = "b", descriptor = "(II)V") + public static void clean() { + aClass99_33.clean(5); + aClass99_21.clean(5); + } + + @OriginalMember(owner = "client!hh", name = "a", descriptor = "(IIIILclient!tk;III)Lclient!ak;") public final Model method1946(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) SeqType arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) { @Pc(24) long local24 = (long) arg2 | (long) (arg6 << 16) | (long) arg1 << 32; - @Pc(30) Model local30 = (Model) Static139.aClass99_21.get(local24); + @Pc(30) Model local30 = (Model) aClass99_21.get(local24); if (local30 == null) { @Pc(36) RawModel[] local36 = new RawModel[3]; @Pc(38) int local38 = 0; - if (!Static81.method1752(arg2).isHeadModelReady() || !Static81.method1752(arg6).isHeadModelReady() || !Static81.method1752(arg1).isHeadModelReady()) { + if (!IdkTypeList.get(arg2).isHeadModelReady() || !IdkTypeList.get(arg6).isHeadModelReady() || !IdkTypeList.get(arg1).isHeadModelReady()) { return null; } - @Pc(66) RawModel local66 = Static81.method1752(arg2).getHeadModel(); + @Pc(66) RawModel local66 = IdkTypeList.get(arg2).getHeadModel(); if (local66 != null) { local38++; local36[0] = local66; } - local66 = Static81.method1752(arg6).getHeadModel(); + local66 = IdkTypeList.get(arg6).getHeadModel(); if (local66 != null) { local36[local38++] = local66; } - local66 = Static81.method1752(arg1).getHeadModel(); + local66 = IdkTypeList.get(arg1).getHeadModel(); if (local66 != null) { local36[local38++] = local66; } local66 = new RawModel(local36, local38); for (@Pc(110) int local110 = 0; local110 < 5; local110++) { - if (this.anIntArray236[local110] < Static33.aShortArrayArray2[local110].length) { - local66.recolor(Static200.aShortArray65[local110], Static33.aShortArrayArray2[local110][this.anIntArray236[local110]]); + if (this.anIntArray236[local110] < aShortArrayArray2[local110].length) { + local66.recolor(aShortArray65[local110], aShortArrayArray2[local110][this.anIntArray236[local110]]); } - if (Static172.aShortArrayArray7[local110].length > this.anIntArray236[local110]) { - local66.recolor(Static160.aShortArray41[local110], Static172.aShortArrayArray7[local110][this.anIntArray236[local110]]); + if (aShortArrayArray7[local110].length > this.anIntArray236[local110]) { + local66.recolor(aShortArray41[local110], aShortArrayArray7[local110][this.anIntArray236[local110]]); } } local30 = local66.createModel(64, 768, -50, -10, -50); - Static139.aClass99_21.put(local30, local24); + aClass99_21.put(local30, local24); } if (arg4 != null) { local30 = arg4.method4215(local30, arg0, arg3, arg5); @@ -92,7 +130,7 @@ public final class PlayerAppearance { } this.aLong88 = local13[(int) (((long) (this.aBoolean141 ? 1 : 0) ^ this.aLong88) & 0xFFL)] ^ this.aLong88 >>> 8; if (local8 != 0L && this.aLong88 != local8) { - Static250.aClass99_33.method3098(local8); + aClass99_33.method3098(local8); } } @@ -111,10 +149,10 @@ public final class PlayerAppearance { if (arg3 == null) { arg3 = new int[12]; for (@Pc(24) int local24 = 0; local24 < 8; local24++) { - for (@Pc(31) int local31 = 0; local31 < Static53.anInt1716; local31++) { - @Pc(38) IdkType local38 = Static81.method1752(local31); + for (@Pc(31) int local31 = 0; local31 < IdkTypeList.anInt1716; local31++) { + @Pc(38) IdkType local38 = IdkTypeList.get(local31); if (local38 != null && !local38.aBoolean85 && local38.feature == (arg2 ? Static153.anIntArray351[local24] : Static204.anIntArray425[local24])) { - arg3[Static272.anIntArray451[local24]] = Integer.MIN_VALUE | local31; + arg3[anIntArray451[local24]] = Integer.MIN_VALUE | local31; break; } } @@ -135,13 +173,13 @@ public final class PlayerAppearance { @OriginalMember(owner = "client!hh", name = "b", descriptor = "(I)I") public final int method1952() { - return this.anInt2492 == -1 ? (this.anIntArray233[8] << 10) + ((this.anIntArray236[0] << 25) + (this.anIntArray236[4] << 20)) + (this.anIntArray233[0] << 15) + (this.anIntArray233[11] << 5) + this.anIntArray233[1] : Static214.get(this.anInt2492).id + 305419896; + return this.anInt2492 == -1 ? (this.anIntArray233[8] << 10) + ((this.anIntArray236[0] << 25) + (this.anIntArray236[4] << 20)) + (this.anIntArray233[0] << 15) + (this.anIntArray233[11] << 5) + this.anIntArray233[1] : NpcTypeList.get(this.anInt2492).id + 305419896; } @OriginalMember(owner = "client!hh", name = "a", descriptor = "(III)V") public final void method1953(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { - @Pc(7) int local7 = Static272.anIntArray451[arg0]; - if (0 != this.anIntArray233[local7] && Static81.method1752(arg1) != null) { + @Pc(7) int local7 = anIntArray451[arg0]; + if (0 != this.anIntArray233[local7] && IdkTypeList.get(arg1) != null) { this.anIntArray233[local7] = arg1 | Integer.MIN_VALUE; this.method1947(); } @@ -150,7 +188,7 @@ public final class PlayerAppearance { @OriginalMember(owner = "client!hh", name = "a", descriptor = "([Lclient!ub;ILclient!tk;Lclient!tk;IIIIZII)Lclient!ak;") public final Model method1954(@OriginalArg(0) Class147[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) SeqType arg2, @OriginalArg(3) SeqType arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(7) int arg6, @OriginalArg(9) int arg7, @OriginalArg(10) int arg8) { if (this.anInt2492 != -1) { - return Static214.get(this.anInt2492).getBodyModel(arg0, arg5, arg8, arg1, arg6, arg7, arg2, arg4, arg3); + return NpcTypeList.get(this.anInt2492).getBodyModel(arg0, arg5, arg8, arg1, arg6, arg7, arg2, arg4, arg3); } @Pc(38) int[] local38 = this.anIntArray233; @Pc(41) long local41 = this.aLong88; @@ -178,7 +216,7 @@ public final class PlayerAppearance { } } } - @Pc(154) Model local154 = (Model) Static250.aClass99_33.get(local41); + @Pc(154) Model local154 = (Model) aClass99_33.get(local41); @Pc(158) boolean local158; @Pc(353) int local353; @Pc(360) int local360; @@ -197,16 +235,16 @@ public final class PlayerAppearance { for (@Pc(160) int local160 = 0; local160 < 12; local160++) { local169 = local38[local160]; if ((local169 & 0x40000000) == 0) { - if ((local169 & Integer.MIN_VALUE) != 0 && !Static81.method1752(local169 & 0x3FFFFFFF).isBodyModelReady()) { + if ((local169 & Integer.MIN_VALUE) != 0 && !IdkTypeList.get(local169 & 0x3FFFFFFF).isBodyModelReady()) { local158 = true; } - } else if (!Static71.get(local169 & 0x3FFFFFFF).method1822(this.aBoolean141)) { + } else if (!ObjTypeList.get(local169 & 0x3FFFFFFF).method1822(this.aBoolean141)) { local158 = true; } } if (local158) { if (this.aLong87 != -1L) { - local154 = (Model) Static250.aClass99_33.get(this.aLong87); + local154 = (Model) aClass99_33.get(this.aLong87); } if (local154 == null) { return null; @@ -219,12 +257,12 @@ public final class PlayerAppearance { local250 = local38[local169]; @Pc(272) RawModel local272; if ((local250 & 0x40000000) != 0) { - local272 = Static71.get(local250 & 0x3FFFFFFF).getBodyModel(this.aBoolean141); + local272 = ObjTypeList.get(local250 & 0x3FFFFFFF).getBodyModel(this.aBoolean141); if (local272 != null) { local239[local169] = local272; } } else if ((Integer.MIN_VALUE & local250) != 0) { - local272 = Static81.method1752(local250 & 0x3FFFFFFF).getBodyModel(); + local272 = IdkTypeList.get(local250 & 0x3FFFFFFF).getBodyModel(); if (local272 != null) { local239[local169] = local272; } @@ -232,7 +270,7 @@ public final class PlayerAppearance { } @Pc(303) BasType local303 = null; if (this.anInt2497 != -1) { - local303 = Static90.method1856(this.anInt2497); + local303 = BasTypeList.get(this.anInt2497); } if (local303 != null && local303.modelRotateTranslate != null) { for (local250 = 0; local250 < local303.modelRotateTranslate.length; local250++) { @@ -290,18 +328,18 @@ public final class PlayerAppearance { } @Pc(740) RawModel local740 = new RawModel(local239, local239.length); for (local346 = 0; local346 < 5; local346++) { - if (Static33.aShortArrayArray2[local346].length > this.anIntArray236[local346]) { - local740.recolor(Static200.aShortArray65[local346], Static33.aShortArrayArray2[local346][this.anIntArray236[local346]]); + if (aShortArrayArray2[local346].length > this.anIntArray236[local346]) { + local740.recolor(aShortArray65[local346], aShortArrayArray2[local346][this.anIntArray236[local346]]); } - if (Static172.aShortArrayArray7[local346].length > this.anIntArray236[local346]) { - local740.recolor(Static160.aShortArray41[local346], Static172.aShortArrayArray7[local346][this.anIntArray236[local346]]); + if (aShortArrayArray7[local346].length > this.anIntArray236[local346]) { + local740.recolor(aShortArray41[local346], aShortArrayArray7[local346][this.anIntArray236[local346]]); } } local154 = local740.createModel(64, 850, -30, -50, -30); if (GlRenderer.enabled) { ((GlModel) local154).method4111(false, false, true, false, false, true); } - Static250.aClass99_33.put(local154, local41); + aClass99_33.put(local154, local41); this.aLong87 = local41; } } @@ -313,10 +351,10 @@ public final class PlayerAppearance { @Pc(979) int local979; for (local353 = 0; local353 < local346; local353++) { if (arg0[local353] != null) { - @Pc(858) SeqType local858 = Static36.get(arg0[local353].anInt5396); + @Pc(858) SeqType local858 = SeqTypeList.get(arg0[local353].anInt5396); if (local858.frames != null) { local158 = true; - Static208.aClass144Array2[local353] = local858; + aClass144Array2[local353] = local858; local374 = arg0[local353].anInt5399; local367 = arg0[local353].anInt5398; local381 = local858.frames[local374]; @@ -334,7 +372,7 @@ public final class PlayerAppearance { local979 = local858.frames[local367]; Static133.aClass3_Sub2_Sub7Array7[local353] = Static72.getAnimFrameset(local979 >>> 16); @Pc(991) int local991 = local979 & 0xFFFF; - Static216.anIntArray187[local353] = local991; + anIntArray187[local353] = local991; if (Static133.aClass3_Sub2_Sub7Array7[local353] != null) { local836 |= Static133.aClass3_Sub2_Sub7Array7[local353].isColorTransformed(local991); local827 |= Static133.aClass3_Sub2_Sub7Array7[local353].isAlphaTransformed(local991); @@ -343,7 +381,7 @@ public final class PlayerAppearance { Static262.anIntArray515[local353] = 0; Static73.anIntArray183[local353] = 0; Static133.aClass3_Sub2_Sub7Array7[local353] = null; - Static216.anIntArray187[local353] = -1; + anIntArray187[local353] = -1; } } } @@ -418,7 +456,7 @@ public final class PlayerAppearance { local598 = 1; while (local481 < local346) { if (Static276.aClass3_Sub2_Sub7Array8[local481] != null) { - local1284.method4565(Static276.aClass3_Sub2_Sub7Array8[local481], Static241.anIntArray520[local481], Static133.aClass3_Sub2_Sub7Array7[local481], Static216.anIntArray187[local481], Static73.anIntArray183[local481] - 1, Static262.anIntArray515[local481], local598, Static208.aClass144Array2[local481].aBoolean278, this.anIntArrayArray19[local481]); + local1284.method4565(Static276.aClass3_Sub2_Sub7Array8[local481], Static241.anIntArray520[local481], Static133.aClass3_Sub2_Sub7Array7[local481], anIntArray187[local481], Static73.anIntArray183[local481] - 1, Static262.anIntArray515[local481], local598, aClass144Array2[local481].aBoolean278, this.anIntArrayArray19[local481]); } local481++; local598 <<= 0x1; @@ -433,7 +471,7 @@ public final class PlayerAppearance { for (local481 = 0; local481 < local346; local481++) { Static276.aClass3_Sub2_Sub7Array8[local481] = null; Static133.aClass3_Sub2_Sub7Array7[local481] = null; - Static208.aClass144Array2[local481] = null; + aClass144Array2[local481] = null; } return local1284; } @@ -441,19 +479,19 @@ public final class PlayerAppearance { @OriginalMember(owner = "client!hh", name = "a", descriptor = "(IBLclient!tk;II)Lclient!ak;") public final Model method1956(@OriginalArg(0) int arg0, @OriginalArg(2) SeqType arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { if (this.anInt2492 != -1) { - return Static214.get(this.anInt2492).getHeadModel(arg1, arg0, arg3, arg2); + return NpcTypeList.get(this.anInt2492).getHeadModel(arg1, arg0, arg3, arg2); } - @Pc(30) Model local30 = (Model) Static139.aClass99_21.get(this.aLong88); + @Pc(30) Model local30 = (Model) aClass99_21.get(this.aLong88); if (local30 == null) { @Pc(42) boolean local42 = false; @Pc(52) int local52; for (@Pc(44) int local44 = 0; local44 < 12; local44++) { local52 = this.anIntArray233[local44]; if ((local52 & 0x40000000) == 0) { - if ((local52 & Integer.MIN_VALUE) != 0 && !Static81.method1752(local52 & 0x3FFFFFFF).isHeadModelReady()) { + if ((local52 & Integer.MIN_VALUE) != 0 && !IdkTypeList.get(local52 & 0x3FFFFFFF).isHeadModelReady()) { local42 = true; } - } else if (!Static71.get(local52 & 0x3FFFFFFF).method1816(this.aBoolean141)) { + } else if (!ObjTypeList.get(local52 & 0x3FFFFFFF).method1816(this.aBoolean141)) { local42 = true; } } @@ -467,12 +505,12 @@ public final class PlayerAppearance { local114 = this.anIntArray233[local104]; @Pc(134) RawModel local134; if ((local114 & 0x40000000) != 0) { - local134 = Static71.get(local114 & 0x3FFFFFFF).getHeadModel(this.aBoolean141); + local134 = ObjTypeList.get(local114 & 0x3FFFFFFF).getHeadModel(this.aBoolean141); if (local134 != null) { local100[local52++] = local134; } } else if ((Integer.MIN_VALUE & local114) != 0) { - local134 = Static81.method1752(local114 & 0x3FFFFFFF).getHeadModel(); + local134 = IdkTypeList.get(local114 & 0x3FFFFFFF).getHeadModel(); if (local134 != null) { local100[local52++] = local134; } @@ -480,15 +518,15 @@ public final class PlayerAppearance { } @Pc(171) RawModel local171 = new RawModel(local100, local52); for (local114 = 0; local114 < 5; local114++) { - if (Static33.aShortArrayArray2[local114].length > this.anIntArray236[local114]) { - local171.recolor(Static200.aShortArray65[local114], Static33.aShortArrayArray2[local114][this.anIntArray236[local114]]); + if (aShortArrayArray2[local114].length > this.anIntArray236[local114]) { + local171.recolor(aShortArray65[local114], aShortArrayArray2[local114][this.anIntArray236[local114]]); } - if (Static172.aShortArrayArray7[local114].length > this.anIntArray236[local114]) { - local171.recolor(Static160.aShortArray41[local114], Static172.aShortArrayArray7[local114][this.anIntArray236[local114]]); + if (aShortArrayArray7[local114].length > this.anIntArray236[local114]) { + local171.recolor(aShortArray41[local114], aShortArrayArray7[local114][this.anIntArray236[local114]]); } } local30 = local171.createModel(64, 768, -50, -10, -50); - Static139.aClass99_21.put(local30, this.aLong88); + aClass99_21.put(local30, this.aLong88); } if (arg1 != null) { local30 = arg1.method4215(local30, arg3, arg0, arg2); diff --git a/client/src/main/java/PlayerList.java b/client/src/main/java/PlayerList.java index 7c333e7..42b225e 100644 --- a/client/src/main/java/PlayerList.java +++ b/client/src/main/java/PlayerList.java @@ -3,4 +3,6 @@ import org.openrs2.deob.annotation.OriginalMember; public class PlayerList { @OriginalMember(owner = "client!nk", name = "O", descriptor = "Lclient!e;") public static Player self; + @OriginalMember(owner = "client!bf", name = "E", descriptor = "I") + public static int selfId = -1; } diff --git a/client/src/main/java/Preferences.java b/client/src/main/java/Preferences.java index 4c5e117..f83b738 100644 --- a/client/src/main/java/Preferences.java +++ b/client/src/main/java/Preferences.java @@ -61,6 +61,8 @@ public class Preferences { public static boolean hdr = false; @OriginalMember(owner = "client!rg", name = "F", descriptor = "I") public static int favoriteWorlds = 0; + @OriginalMember(owner = "client!bh", name = "z", descriptor = "Z") + public static boolean sentToServer = true; @OriginalMember(owner = "client!ga", name = "e", descriptor = "I") static int particles = 2; @@ -316,4 +318,9 @@ public class Preferences { local4.p1(cursorsEnabled ? 1 : 0); return local4; } + + @OriginalMember(owner = "client!lf", name = "c", descriptor = "(I)I") + public static int toInt() { + return ((stereo ? 1 : 0) << 19) + (((fogEnabled ? 1 : 0) << 16) + ((highWaterDetail ? 1 : 0) << 15) + ((highDetailLighting ? 1 : 0) << 13) + ((characterShadowsOn ? 1 : 0) << 10) + ((manyGroundTextures ? 1 : 0) << 9) + ((manyIdleAnimations ? 1 : 0) << 7) + ((highDetailTextures ? 1 : 0) << 6) + ((showGroundDecorations ? 1 : 0) << 5) + (((allLevelsVisible ? 1 : 0) << 3) + (brightness & 0x7) - (-((removeRoofsSelectively ? 1 : 0) << 4) + -((flickeringEffectsOn ? 1 : 0) << 8)) - (-((sceneryShadowsType & 0x3) << 11) + -((soundEffectVolume == 0 ? 0 : 1) << 20) - (((musicVolume == 0 ? 0 : 1) << 21) + ((ambientSoundsVolume == 0 ? 0 : 1) << 22)))) + (getParticleSetting() << 23)); + } } diff --git a/client/src/main/java/ProjAnim.java b/client/src/main/java/ProjAnim.java index 4732b58..9d1d9e3 100644 --- a/client/src/main/java/ProjAnim.java +++ b/client/src/main/java/ProjAnim.java @@ -104,11 +104,11 @@ public final class ProjAnim extends Entity { this.anInt4797 = arg8; this.anInt4822 = arg5; this.anInt4813 = arg4; - @Pc(58) int local58 = Static34.method877(this.anInt4816).seqId; + @Pc(58) int local58 = SpotAnimTypeList.get(this.anInt4816).seqId; if (local58 == -1) { this.aClass144_3 = null; } else { - this.aClass144_3 = Static36.get(local58); + this.aClass144_3 = SeqTypeList.get(local58); } } @@ -119,7 +119,7 @@ public final class ProjAnim extends Entity { @OriginalMember(owner = "client!ra", name = "b", descriptor = "(I)Lclient!ak;") private Model method3703() { - @Pc(14) SpotAnimType local14 = Static34.method877(this.anInt4816); + @Pc(14) SpotAnimType local14 = SpotAnimTypeList.get(this.anInt4816); @Pc(24) Model local24 = local14.method1319(this.anInt4798, this.anInt4820, this.anInt4796); if (local24 == null) { return null; diff --git a/client/src/main/java/Protocol.java b/client/src/main/java/Protocol.java index 84b988a..b4b1e75 100644 --- a/client/src/main/java/Protocol.java +++ b/client/src/main/java/Protocol.java @@ -1,6 +1,159 @@ +import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; public class Protocol { + @OriginalMember(owner = "client!eg", name = "e", descriptor = "Lclient!i;") + public static final Packet inboundBuffer = new Packet(65536); + @OriginalMember(owner = "client!wb", name = "f", descriptor = "Lclient!wa;") + public static final Buffer chatBuffer = new Buffer(new byte[5000]); + @OriginalMember(owner = "client!ag", name = "P", descriptor = "Lclient!i;") + public static final Packet outboundBuffer = new Packet(5000); @OriginalMember(owner = "client!jk", name = "B", descriptor = "Lclient!ma;") public static BufferedSocket socket; + @OriginalMember(owner = "client!fl", name = "C", descriptor = "Lsignlink!im;") + public static PrivilegedRequest socketRequest; + @OriginalMember(owner = "client!pe", name = "a", descriptor = "I") + public static int verifyId = 0; + @OriginalMember(owner = "client!na", name = "l", descriptor = "I") + public static int opcode = 0; + @OriginalMember(owner = "client!sc", name = "o", descriptor = "I") + public static int length = 0; + + @OriginalMember(owner = "client!g", name = "a", descriptor = "(IZ)V") + public static void readRebuildPacket(@OriginalArg(1) boolean arg0) { + Static230.dynamicMapRegion = arg0; + @Pc(13) int local13; + @Pc(20) int local20; + @Pc(26) int local26; + @Pc(31) int local31; + @Pc(60) int local60; + @Pc(64) int local64; + @Pc(138) int local138; + @Pc(151) int local151; + @Pc(169) int local169; + if (!Static230.dynamicMapRegion) { + local13 = inboundBuffer.g2sub(); + local20 = (length - inboundBuffer.offset) / 16; + Static72.regionsXteaKeys = new int[local20][4]; + for (local26 = 0; local26 < local20; local26++) { + for (local31 = 0; local31 < 4; local31++) { + Static72.regionsXteaKeys[local26][local31] = inboundBuffer.p4rme(); + } + } + local26 = inboundBuffer.g1ssub(); + local31 = inboundBuffer.g2(); + local60 = inboundBuffer.g2sub(); + local64 = inboundBuffer.g2sub(); + Static238.regionBitPacked = new int[local20]; + Static273.mapFilesBuffer = new byte[local20][]; + Static191.npcSpawnsFilesBuffer = null; + Static99.underWaterMapFileIds = new int[local20]; + Static156.locationMapFilesBuffer = new byte[local20][]; + Static19.underWaterLocationsMapFilesBuffer = new byte[local20][]; + Static175.npcSpawnsFileIds = null; + Static36.mapFileIds = new int[local20]; + Static186.underWaterMapFilesBuffer = new byte[local20][]; + Static172.locationsMapFileIds = new int[local20]; + Static35.underWaterLocationsMapFileIds = new int[local20]; + local20 = 0; + @Pc(100) boolean local100 = false; + if ((local31 / 8 == 48 || local31 / 8 == 49) && local60 / 8 == 48) { + local100 = true; + } + if (local31 / 8 == 48 && local60 / 8 == 148) { + local100 = true; + } + for (local138 = (local31 - 6) / 8; local138 <= (local31 + 6) / 8; local138++) { + for (local151 = (local60 - 6) / 8; local151 <= (local60 + 6) / 8; local151++) { + local169 = (local138 << 8) + local151; + if (local100 && (local151 == 49 || local151 == 149 || local151 == 147 || local138 == 50 || local138 == 49 && local151 == 47)) { + Static238.regionBitPacked[local20] = local169; + Static36.mapFileIds[local20] = -1; + Static172.locationsMapFileIds[local20] = -1; + Static99.underWaterMapFileIds[local20] = -1; + Static35.underWaterLocationsMapFileIds[local20] = -1; + } else { + Static238.regionBitPacked[local20] = local169; + Static36.mapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); + Static172.locationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); + Static99.underWaterMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); + Static35.underWaterLocationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); + } + local20++; + } + } + Static127.method2463(local26, local60, local31, local64, false, local13); + return; + } + local13 = inboundBuffer.g2leadd(); + local20 = inboundBuffer.g2leadd(); + local26 = inboundBuffer.g1ssub(); + local31 = inboundBuffer.g2leadd(); + inboundBuffer.method2233(); + @Pc(391) int local391; + for (local60 = 0; local60 < 4; local60++) { + for (local64 = 0; local64 < 13; local64++) { + for (local391 = 0; local391 < 13; local391++) { + local138 = inboundBuffer.method2238(1); + if (local138 == 1) { + Static187.anIntArrayArrayArray18[local60][local64][local391] = inboundBuffer.method2238(26); + } else { + Static187.anIntArrayArrayArray18[local60][local64][local391] = -1; + } + } + } + } + inboundBuffer.method2244(); + local60 = (length - inboundBuffer.offset) / 16; + Static72.regionsXteaKeys = new int[local60][4]; + for (local64 = 0; local64 < local60; local64++) { + for (local391 = 0; local391 < 4; local391++) { + Static72.regionsXteaKeys[local64][local391] = inboundBuffer.p4rme(); + } + } + local64 = inboundBuffer.g2(); + Static35.underWaterLocationsMapFileIds = new int[local60]; + Static172.locationsMapFileIds = new int[local60]; + Static36.mapFileIds = new int[local60]; + Static19.underWaterLocationsMapFilesBuffer = new byte[local60][]; + Static175.npcSpawnsFileIds = null; + Static99.underWaterMapFileIds = new int[local60]; + Static156.locationMapFilesBuffer = new byte[local60][]; + Static273.mapFilesBuffer = new byte[local60][]; + Static238.regionBitPacked = new int[local60]; + Static191.npcSpawnsFilesBuffer = null; + Static186.underWaterMapFilesBuffer = new byte[local60][]; + local60 = 0; + for (local391 = 0; local391 < 4; local391++) { + for (local138 = 0; local138 < 13; local138++) { + for (local151 = 0; local151 < 13; local151++) { + local169 = Static187.anIntArrayArrayArray18[local391][local138][local151]; + if (local169 != -1) { + @Pc(555) int local555 = local169 >> 14 & 0x3FF; + @Pc(561) int local561 = local169 >> 3 & 0x7FF; + @Pc(571) int local571 = local561 / 8 + (local555 / 8 << 8); + @Pc(573) int local573; + for (local573 = 0; local573 < local60; local573++) { + if (local571 == Static238.regionBitPacked[local573]) { + local571 = -1; + break; + } + } + if (local571 != -1) { + Static238.regionBitPacked[local60] = local571; + @Pc(609) int local609 = local571 & 0xFF; + local573 = local571 >> 8 & 0xFF; + Static36.mapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); + Static172.locationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); + Static99.underWaterMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); + Static35.underWaterLocationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); + local60++; + } + } + } + } + } + Static127.method2463(local26, local64, local20, local31, false, local13); + } } diff --git a/client/src/main/java/QuickChatCatType.java b/client/src/main/java/QuickChatCatType.java index f6faf82..3ccd372 100644 --- a/client/src/main/java/QuickChatCatType.java +++ b/client/src/main/java/QuickChatCatType.java @@ -91,7 +91,7 @@ public final class QuickChatCatType extends SecondaryNode { } @OriginalMember(owner = "client!bc", name = "a", descriptor = "(Lclient!wa;B)V") - public final void method470(@OriginalArg(0) Buffer arg0) { + public final void decode(@OriginalArg(0) Buffer arg0) { while (true) { @Pc(12) int local12 = arg0.g1(); if (local12 == 0) { diff --git a/client/src/main/java/QuickChatCatTypeList.java b/client/src/main/java/QuickChatCatTypeList.java new file mode 100644 index 0000000..7a31736 --- /dev/null +++ b/client/src/main/java/QuickChatCatTypeList.java @@ -0,0 +1,41 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class QuickChatCatTypeList { + @OriginalMember(owner = "client!fm", name = "db", descriptor = "Lclient!gn;") + public static final LruHashTable types = new LruHashTable(64); + @OriginalMember(owner = "client!gn", name = "t", descriptor = "Lclient!ve;") + public static Js5 archive1; + @OriginalMember(owner = "client!ce", name = "d", descriptor = "Lclient!ve;") + public static Js5 archive2; + + @OriginalMember(owner = "client!ja", name = "a", descriptor = "(Lclient!ve;Lclient!ve;I)V") + public static void init(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1) { + archive1 = arg1; + archive2 = arg0; + } + + @OriginalMember(owner = "client!tb", name = "b", descriptor = "(IB)Lclient!bc;") + public static QuickChatCatType method4045(@OriginalArg(0) int arg0) { + @Pc(10) QuickChatCatType local10 = (QuickChatCatType) types.get((long) arg0); + if (local10 != null) { + return local10; + } + @Pc(24) byte[] local24; + if (arg0 < 32768) { + local24 = archive1.getFile(0, arg0); + } else { + local24 = archive2.getFile(0, arg0 & 0x7FFF); + } + local10 = new QuickChatCatType(); + if (local24 != null) { + local10.decode(new Buffer(local24)); + } + if (arg0 >= 32768) { + local10.method465(); + } + types.put(local10, (long) arg0); + return local10; + } +} diff --git a/client/src/main/java/QuickChatPhraseType.java b/client/src/main/java/QuickChatPhraseType.java index 8ea8b37..a9d2152 100644 --- a/client/src/main/java/QuickChatPhraseType.java +++ b/client/src/main/java/QuickChatPhraseType.java @@ -35,7 +35,7 @@ public final class QuickChatPhraseType extends SecondaryNode { } @OriginalMember(owner = "client!cb", name = "a", descriptor = "(Lclient!wa;I)V") - public final void method761(@OriginalArg(0) Buffer arg0) { + public final void decode(@OriginalArg(0) Buffer arg0) { while (true) { @Pc(9) int local9 = arg0.g1(); if (local9 == 0) { diff --git a/client/src/main/java/QuickChatPhraseTypeList.java b/client/src/main/java/QuickChatPhraseTypeList.java new file mode 100644 index 0000000..920fbe7 --- /dev/null +++ b/client/src/main/java/QuickChatPhraseTypeList.java @@ -0,0 +1,54 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class QuickChatPhraseTypeList { + @OriginalMember(owner = "client!ud", name = "P", descriptor = "Lclient!gn;") + public static final LruHashTable types = new LruHashTable(64); + @OriginalMember(owner = "client!vf", name = "n", descriptor = "Lclient!ve;") + public static Js5 archive2; + @OriginalMember(owner = "client!id", name = "j", descriptor = "Lclient!of;") + public static QuickChatCommandDecoder decoder = null; + @OriginalMember(owner = "client!te", name = "y", descriptor = "Lclient!ve;") + public static Js5 archive1; + @OriginalMember(owner = "client!le", name = "e", descriptor = "I") + public static int anInt3490 = 0; + @OriginalMember(owner = "client!ck", name = "C", descriptor = "I") + public static int anInt1047 = 0; + + @OriginalMember(owner = "client!ej", name = "a", descriptor = "(Lclient!ve;ILclient!ve;Lclient!of;)V") + public static void init(@OriginalArg(0) Js5 arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) QuickChatCommandDecoder arg2) { + archive2 = arg0; + decoder = arg2; + archive1 = arg1; + if (archive1 != null) { + anInt3490 = archive1.getGroupCapacity(1); + } + if (archive2 != null) { + anInt1047 = archive2.getGroupCapacity(1); + } + } + + @OriginalMember(owner = "client!sj", name = "b", descriptor = "(II)Lclient!cb;") + public static QuickChatPhraseType get(@OriginalArg(1) int arg0) { + @Pc(10) QuickChatPhraseType local10 = (QuickChatPhraseType) types.get((long) arg0); + if (local10 != null) { + return local10; + } + @Pc(27) byte[] local27; + if (arg0 < 32768) { + local27 = archive1.getFile(1, arg0); + } else { + local27 = archive2.getFile(1, arg0 & 0x7FFF); + } + local10 = new QuickChatPhraseType(); + if (local27 != null) { + local10.decode(new Buffer(local27)); + } + if (arg0 >= 32768) { + local10.method763(); + } + types.put(local10, (long) arg0); + return local10; + } +} diff --git a/client/src/main/java/SceneGraph.java b/client/src/main/java/SceneGraph.java index dbf6e3f..81f6bed 100644 --- a/client/src/main/java/SceneGraph.java +++ b/client/src/main/java/SceneGraph.java @@ -1,8 +1,31 @@ +import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; public class SceneGraph { @OriginalMember(owner = "client!km", name = "f", descriptor = "(I)Z") public static boolean allLevelsAreVisible() { - return GlRenderer.enabled ? true : Preferences.allLevelsVisible; + return GlRenderer.enabled || Preferences.allLevelsVisible; + } + + @OriginalMember(owner = "client!ql", name = "a", descriptor = "(IIII)I") + public static int getTileHeight(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { + if (Static83.activeTileHeightMap == null) { + return 0; + } + @Pc(12) int local12 = arg1 >> 7; + @Pc(16) int local16 = arg2 >> 7; + if (local12 < 0 || local16 < 0 || local12 > 103 || local16 > 103) { + return 0; + } + @Pc(36) int local36 = arg1 & 0x7F; + @Pc(40) int local40 = arg2 & 0x7F; + @Pc(42) int local42 = arg0; + if (arg0 < 3 && (Static12.tileSettings[1][local12][local16] & 0x2) == 2) { + local42 = arg0 + 1; + } + @Pc(91) int local91 = local36 * Static83.activeTileHeightMap[local42][local12 + 1][local16 + 1] + Static83.activeTileHeightMap[local42][local12][local16 + 1] * (128 - local36) >> 7; + @Pc(118) int local118 = local36 * Static83.activeTileHeightMap[local42][local12 + 1][local16] + (128 - local36) * Static83.activeTileHeightMap[local42][local12][local16] >> 7; + return local40 * local91 + (128 - local40) * local118 >> 7; } } diff --git a/client/src/main/java/SeqType.java b/client/src/main/java/SeqType.java index e21b2f9..da149aa 100644 --- a/client/src/main/java/SeqType.java +++ b/client/src/main/java/SeqType.java @@ -13,10 +13,10 @@ public final class SeqType { public boolean[] aBooleanArray123; @OriginalMember(owner = "client!tk", name = "y", descriptor = "I") - public int anInt5361; + public int id; @OriginalMember(owner = "client!tk", name = "C", descriptor = "[[I") - public int[][] anIntArrayArray38; + public int[][] sounds; @OriginalMember(owner = "client!tk", name = "G", descriptor = "[I") public int[] anIntArray474; @@ -336,14 +336,14 @@ public final class SeqType { } } else if (arg0 == 13) { local8 = arg1.g2(); - this.anIntArrayArray38 = new int[local8][]; + this.sounds = new int[local8][]; for (local14 = 0; local14 < local8; local14++) { @Pc(163) int local163 = arg1.g1(); if (local163 > 0) { - this.anIntArrayArray38[local14] = new int[local163]; - this.anIntArrayArray38[local14][0] = arg1.g3(); + this.sounds[local14] = new int[local163]; + this.sounds[local14][0] = arg1.g3(); for (@Pc(182) int local182 = 1; local182 < local163; local182++) { - this.anIntArrayArray38[local14][local182] = arg1.g2(); + this.sounds[local14][local182] = arg1.g2(); } } } diff --git a/client/src/main/java/SeqTypeList.java b/client/src/main/java/SeqTypeList.java new file mode 100644 index 0000000..f7e97a7 --- /dev/null +++ b/client/src/main/java/SeqTypeList.java @@ -0,0 +1,68 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class SeqTypeList { + @OriginalMember(owner = "client!lc", name = "e", descriptor = "Lclient!n;") + public static final SoftLruHashTable types = new SoftLruHashTable(64); + @OriginalMember(owner = "client!vl", name = "a", descriptor = "Lclient!n;") + public static final SoftLruHashTable aClass99_37 = new SoftLruHashTable(100); + @OriginalMember(owner = "client!tk", name = "s", descriptor = "Lclient!ve;") + public static Js5 archive; + @OriginalMember(owner = "client!af", name = "a", descriptor = "Lclient!ve;") + public static Js5 aClass153_1; + @OriginalMember(owner = "client!se", name = "l", descriptor = "Lclient!ve;") + public static Js5 aClass153_92; + + @OriginalMember(owner = "client!client", name = "a", descriptor = "(IB)Lclient!tk;") + public static SeqType get(@OriginalArg(0) int id) { + @Pc(17) SeqType local17 = (SeqType) types.get((long) id); + if (local17 != null) { + return local17; + } + @Pc(32) byte[] local32 = archive.getFile(getGroupId(id), getFileId(id)); + local17 = new SeqType(); + local17.id = id; + if (local32 != null) { + local17.decode(new Buffer(local32)); + } + local17.postDecode(); + types.put(local17, (long) id); + return local17; + } + + @OriginalMember(owner = "client!s", name = "a", descriptor = "(II)I") + public static int getGroupId(@OriginalArg(0) int arg0) { + return arg0 >>> 7; + } + + @OriginalMember(owner = "client!jd", name = "a", descriptor = "(II)I") + public static int getFileId(@OriginalArg(1) int arg0) { + return arg0 & 0x7F; + } + + @OriginalMember(owner = "client!lb", name = "a", descriptor = "(Lclient!ve;Lclient!ve;ILclient!ve;)V") + public static void init(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1, @OriginalArg(3) Js5 arg2) { + archive = arg1; + aClass153_1 = arg0; + aClass153_92 = arg2; + } + + @OriginalMember(owner = "client!an", name = "a", descriptor = "(Z)V") + public static void method350() { + types.clear(); + aClass99_37.clear(); + } + + @OriginalMember(owner = "client!sg", name = "a", descriptor = "(B)V") + public static void method3903() { + types.method3103(); + aClass99_37.method3103(); + } + + @OriginalMember(owner = "client!fl", name = "a", descriptor = "(IB)V") + public static void clean() { + types.clean(5); + aClass99_37.clean(5); + } +} diff --git a/client/src/main/java/Shadow.java b/client/src/main/java/Shadow.java index 0b524cc..60ddd53 100644 --- a/client/src/main/java/Shadow.java +++ b/client/src/main/java/Shadow.java @@ -38,7 +38,7 @@ public final class Shadow { @Pc(12) int[] local12 = new int[1]; local9.glGenTextures(1, local12, 0); this.anInt5901 = local12[0]; - Static63.onCardTexture += 16384; + GlCleaner.onCardTexture += 16384; GlRenderer.setTextureId(this.anInt5901); local9.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR); local9.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); diff --git a/client/src/main/java/ShadowModelList.java b/client/src/main/java/ShadowModelList.java new file mode 100644 index 0000000..f583d68 --- /dev/null +++ b/client/src/main/java/ShadowModelList.java @@ -0,0 +1,151 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class ShadowModelList { + @OriginalMember(owner = "client!di", name = "I", descriptor = "Lclient!n;") + public static final SoftLruHashTable SHADOWS = new SoftLruHashTable(32); + + @OriginalMember(owner = "client!kh", name = "a", descriptor = "(II)V") + public static void clean() { + SHADOWS.clean(5); + } + + @OriginalMember(owner = "client!ug", name = "b", descriptor = "(B)V") + public static void method4276() { + SHADOWS.method3103(); + } + + @OriginalMember(owner = "client!dc", name = "a", descriptor = "(IZLclient!tk;IIIIILclient!ak;IIIIB)Lclient!ak;") + public static Model method1043(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) SeqType arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) Model arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10, @OriginalArg(11) int arg11, @OriginalArg(12) int arg12) { + @Pc(23) long local23 = ((long) arg4 << 48) + (long) (arg7 + (arg0 << 16) + (arg12 << 24)) + ((long) arg6 << 32); + @Pc(33) Model local33 = (Model) SHADOWS.get(local23); + @Pc(109) int local109; + @Pc(115) int local115; + @Pc(126) int local126; + @Pc(130) int local130; + @Pc(162) int local162; + if (local33 == null) { + @Pc(41) byte local41; + if (arg7 == 1) { + local41 = 9; + } else if (arg7 == 2) { + local41 = 12; + } else if (arg7 == 3) { + local41 = 15; + } else if (arg7 == 4) { + local41 = 18; + } else { + local41 = 21; + } + @Pc(83) int[] local83 = new int[] { 64, 96, 128 }; + @Pc(103) RawModel local103 = new RawModel(local41 * 3 + 1, -local41 + local41 * 3 * 2, 0); + local109 = local103.method1685(0, 0); + @Pc(113) int[][] local113 = new int[3][local41]; + for (local115 = 0; local115 < 3; local115++) { + local126 = local83[local115]; + local130 = local83[local115]; + for (@Pc(132) int local132 = 0; local132 < local41; local132++) { + @Pc(141) int local141 = (local132 << 11) / local41; + @Pc(152) int local152 = arg5 + MathUtils.cos[local141] * local130 >> 16; + local162 = arg3 + MathUtils.sin[local141] * local126 >> 16; + local113[local115][local132] = local103.method1685(local162, local152); + } + } + for (local115 = 0; local115 < 3; local115++) { + local126 = (local115 * 256 + 128) / 3; + local130 = 256 - local126; + @Pc(207) byte local207 = (byte) (arg12 * local126 + arg0 * local130 >> 8); + @Pc(252) short local252 = (short) (((arg6 & 0x7F) * local130 + (arg4 & 0x7F) * local126 & 0x7F00) + (local130 * (arg6 & 0x380) + local126 * (arg4 & 0x380) & 0x38000) + (local126 * (arg4 & 0xFC00) + (arg6 & 0xFC00) * local130 & 0xFC0000) >> 8); + for (local162 = 0; local162 < local41; local162++) { + if (local115 == 0) { + local103.method1676(local109, local113[0][(local162 + 1) % local41], local113[0][local162], local252, local207); + } else { + local103.method1676(local113[local115 - 1][local162], local113[local115 - 1][(local162 + 1) % local41], local113[local115][(local162 + 1) % local41], local252, local207); + local103.method1676(local113[local115 - 1][local162], local113[local115][(local162 + 1) % local41], local113[local115][local162], local252, local207); + } + } + } + local33 = local103.createModel(64, 768, -50, -10, -50); + SHADOWS.put(local33, local23); + } + @Pc(367) int local367 = arg7 * 64 - 1; + @Pc(376) int local376 = -local367; + @Pc(379) int local379 = -local367; + @Pc(381) int local381 = local367; + @Pc(384) int local384 = arg8.method4562(); + @Pc(386) AnimFrameset local386 = null; + local115 = arg8.method4561(); + local126 = arg8.method4576(); + local130 = arg8.method4550(); + if (arg2 != null) { + @Pc(403) int local403 = arg2.frames[arg10]; + local386 = Static72.getAnimFrameset(local403 >> 16); + arg10 = local403 & 0xFFFF; + } + local109 = local367; + if (arg1) { + if (arg9 > 1664 || arg9 < 384) { + local379 -= 128; + } + if (arg9 > 1152 && arg9 < 1920) { + local381 = local367 + 128; + } + if (arg9 > 640 && arg9 < 1408) { + local109 = local367 + 128; + } + if (arg9 > 128 && arg9 < 896) { + local376 -= 128; + } + } + if (local109 < local130) { + local130 = local109; + } + if (local376 > local384) { + local384 = local376; + } + if (local126 < local379) { + local126 = local379; + } + if (local381 < local115) { + local115 = local381; + } + if (local386 == null) { + local33 = local33.method4560(true, true, true); + local33.resize((local115 - local384) / 2, 128, (local130 - local126) / 2); + local33.method4575((local384 + local115) / 2, 0, (local126 + local130) / 2); + } else { + local33 = local33.method4560(!local386.isAlphaTransformed(arg10), !local386.isColorTransformed(arg10), true); + local33.resize((local115 - local384) / 2, 128, (local130 - local126) / 2); + local33.method4575((local384 + local115) / 2, 0, (local126 + local130) / 2); + local33.method4555(local386, arg10); + } + if (arg9 != 0) { + local33.method4554(arg9); + } + if (GlRenderer.enabled) { + @Pc(650) GlModel local650 = (GlModel) local33; + if (SceneGraph.getTileHeight(Static55.level, arg3 + local384, local126 + arg5) != arg11 || SceneGraph.getTileHeight(Static55.level, local115 + arg3, arg5 - -local130) != arg11) { + for (local162 = 0; local162 < local650.vertexCount; local162++) { + local650.anIntArray465[local162] += SceneGraph.getTileHeight(Static55.level, local650.anIntArray461[local162] + arg3, arg5 + local650.anIntArray466[local162]) - arg11; + } + local650.vertexBuffer.valid = false; + local650.bounds.valid = false; + } + } else { + @Pc(574) SoftwareModel local574 = (SoftwareModel) local33; + if (SceneGraph.getTileHeight(Static55.level, arg3 + local384, arg5 - -local126) != arg11 || arg11 != SceneGraph.getTileHeight(Static55.level, arg3 + local115, arg5 - -local130)) { + for (local162 = 0; local162 < local574.vertexCount; local162++) { + local574.anIntArray527[local162] += SceneGraph.getTileHeight(Static55.level, arg3 + local574.anIntArray528[local162], arg5 + local574.anIntArray531[local162]) - arg11; + } + local574.boundsValid = false; + } + } + return local33; + } + + @OriginalMember(owner = "client!hb", name = "a", descriptor = "(Z)V") + public static void method1857() { + SHADOWS.clear(); + } +} diff --git a/client/src/main/java/SoftLruHashTable.java b/client/src/main/java/SoftLruHashTable.java index 77d8c10..452eaf5 100644 --- a/client/src/main/java/SoftLruHashTable.java +++ b/client/src/main/java/SoftLruHashTable.java @@ -66,7 +66,7 @@ public final class SoftLruHashTable { } @OriginalMember(owner = "client!n", name = "c", descriptor = "(II)V") - public final void method3102(@OriginalArg(1) int arg0) { + public final void clean(@OriginalArg(1) int arg0) { if (Static252.aClass22_1 == null) { return; } diff --git a/client/src/main/java/SoftwareModel.java b/client/src/main/java/SoftwareModel.java index 45e7ddf..1d971df 100644 --- a/client/src/main/java/SoftwareModel.java +++ b/client/src/main/java/SoftwareModel.java @@ -97,10 +97,10 @@ public final class SoftwareModel extends Model { private byte aByte20 = 0; @OriginalMember(owner = "client!w", name = "V", descriptor = "Z") - public boolean aBoolean305 = false; + public boolean boundsValid = false; @OriginalMember(owner = "client!w", name = "P", descriptor = "I") - public int anInt5788 = 0; + public int vertexCount = 0; @OriginalMember(owner = "client!w", name = "N", descriptor = "I") private int anInt5787 = 0; @@ -131,7 +131,7 @@ public final class SoftwareModel extends Model { public SoftwareModel(@OriginalArg(0) RawModel arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { arg0.method1668(); arg0.method1683(); - this.anInt5788 = arg0.anInt2139; + this.vertexCount = arg0.anInt2139; this.anIntArray528 = arg0.anIntArray202; this.anIntArray527 = arg0.anIntArray201; this.anIntArray531 = arg0.anIntArray203; @@ -309,7 +309,7 @@ public final class SoftwareModel extends Model { @Pc(23) boolean local23 = false; @Pc(25) boolean local25 = false; @Pc(27) boolean local27 = false; - this.anInt5788 = 0; + this.vertexCount = 0; this.anInt5787 = 0; this.anInt5789 = 0; this.aByte20 = -1; @@ -318,7 +318,7 @@ public final class SoftwareModel extends Model { for (local45 = 0; local45 < arg1; local45++) { local52 = arg0[local45]; if (local52 != null) { - this.anInt5788 += local52.anInt5788; + this.vertexCount += local52.vertexCount; this.anInt5787 += local52.anInt5787; this.anInt5789 += local52.anInt5789; if (local52.aByteArray73 == null) { @@ -336,9 +336,9 @@ public final class SoftwareModel extends Model { local27 |= local52.aByteArray74 != null; } } - this.anIntArray528 = new int[this.anInt5788]; - this.anIntArray527 = new int[this.anInt5788]; - this.anIntArray531 = new int[this.anInt5788]; + this.anIntArray528 = new int[this.vertexCount]; + this.anIntArray527 = new int[this.vertexCount]; + this.anIntArray531 = new int[this.vertexCount]; this.anIntArray534 = new int[this.anInt5787]; this.anIntArray524 = new int[this.anInt5787]; this.anIntArray529 = new int[this.anInt5787]; @@ -363,7 +363,7 @@ public final class SoftwareModel extends Model { this.anIntArray525 = new int[this.anInt5789]; } this.aShortArray89 = new short[this.anInt5787]; - this.anInt5788 = 0; + this.vertexCount = 0; this.anInt5787 = 0; this.anInt5789 = 0; for (local45 = 0; local45 < arg1; local45++) { @@ -371,9 +371,9 @@ public final class SoftwareModel extends Model { if (local52 != null) { @Pc(251) int local251; for (local251 = 0; local251 < local52.anInt5787; local251++) { - this.anIntArray534[this.anInt5787] = local52.anIntArray534[local251] + this.anInt5788; - this.anIntArray524[this.anInt5787] = local52.anIntArray524[local251] + this.anInt5788; - this.anIntArray529[this.anInt5787] = local52.anIntArray529[local251] + this.anInt5788; + this.anIntArray534[this.anInt5787] = local52.anIntArray534[local251] + this.vertexCount; + this.anIntArray524[this.anInt5787] = local52.anIntArray524[local251] + this.vertexCount; + this.anIntArray529[this.anInt5787] = local52.anIntArray529[local251] + this.vertexCount; this.anIntArray533[this.anInt5787] = local52.anIntArray533[local251]; this.anIntArray523[this.anInt5787] = local52.anIntArray523[local251]; this.anIntArray532[this.anInt5787] = local52.anIntArray532[local251]; @@ -405,16 +405,16 @@ public final class SoftwareModel extends Model { this.anInt5787++; } for (local251 = 0; local251 < local52.anInt5789; local251++) { - this.anIntArray526[this.anInt5789] = local52.anIntArray526[local251] + this.anInt5788; - this.anIntArray530[this.anInt5789] = local52.anIntArray530[local251] + this.anInt5788; - this.anIntArray525[this.anInt5789] = local52.anIntArray525[local251] + this.anInt5788; + this.anIntArray526[this.anInt5789] = local52.anIntArray526[local251] + this.vertexCount; + this.anIntArray530[this.anInt5789] = local52.anIntArray530[local251] + this.vertexCount; + this.anIntArray525[this.anInt5789] = local52.anIntArray525[local251] + this.vertexCount; this.anInt5789++; } - for (local251 = 0; local251 < local52.anInt5788; local251++) { - this.anIntArray528[this.anInt5788] = local52.anIntArray528[local251]; - this.anIntArray527[this.anInt5788] = local52.anIntArray527[local251]; - this.anIntArray531[this.anInt5788] = local52.anIntArray531[local251]; - this.anInt5788++; + for (local251 = 0; local251 < local52.vertexCount; local251++) { + this.anIntArray528[this.vertexCount] = local52.anIntArray528[local251]; + this.anIntArray527[this.vertexCount] = local52.anIntArray527[local251]; + this.anIntArray531[this.vertexCount] = local52.anIntArray531[local251]; + this.vertexCount++; } } } @@ -464,11 +464,11 @@ public final class SoftwareModel extends Model { @OriginalMember(owner = "client!w", name = "e", descriptor = "()V") @Override public final void method4552() { - for (@Pc(1) int local1 = 0; local1 < this.anInt5788; local1++) { + for (@Pc(1) int local1 = 0; local1 < this.vertexCount; local1++) { this.anIntArray528[local1] = -this.anIntArray528[local1]; this.anIntArray531[local1] = -this.anIntArray531[local1]; } - this.aBoolean305 = false; + this.boundsValid = false; } @OriginalMember(owner = "client!w", name = "n", descriptor = "()V") @@ -496,7 +496,7 @@ public final class SoftwareModel extends Model { @OriginalMember(owner = "client!w", name = "k", descriptor = "()I") @Override public final int method4576() { - if (!this.aBoolean305) { + if (!this.boundsValid) { this.method4592(); } return this.aShort33; @@ -505,7 +505,7 @@ public final class SoftwareModel extends Model { @OriginalMember(owner = "client!w", name = "b", descriptor = "()I") @Override public final int method4549() { - if (!this.aBoolean305) { + if (!this.boundsValid) { this.method4592(); } return this.aShort38; @@ -513,16 +513,16 @@ public final class SoftwareModel extends Model { @OriginalMember(owner = "client!w", name = "a", descriptor = "(ZZLclient!w;[B[S[I[I[I)Lclient!ak;") private Model method4584(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) SoftwareModel arg2, @OriginalArg(3) byte[] arg3, @OriginalArg(4) short[] arg4, @OriginalArg(5) int[] arg5, @OriginalArg(6) int[] arg6, @OriginalArg(7) int[] arg7) { - arg2.anInt5788 = this.anInt5788; + arg2.vertexCount = this.vertexCount; arg2.anInt5787 = this.anInt5787; arg2.anInt5789 = this.anInt5789; - if (arg2.anIntArray528 == null || arg2.anIntArray528.length < this.anInt5788) { - arg2.anIntArray528 = new int[this.anInt5788 + 100]; - arg2.anIntArray527 = new int[this.anInt5788 + 100]; - arg2.anIntArray531 = new int[this.anInt5788 + 100]; + if (arg2.anIntArray528 == null || arg2.anIntArray528.length < this.vertexCount) { + arg2.anIntArray528 = new int[this.vertexCount + 100]; + arg2.anIntArray527 = new int[this.vertexCount + 100]; + arg2.anIntArray531 = new int[this.vertexCount + 100]; } @Pc(43) int local43; - for (local43 = 0; local43 < this.anInt5788; local43++) { + for (local43 = 0; local43 < this.vertexCount; local43++) { arg2.anIntArray528[local43] = this.anIntArray528[local43]; arg2.anIntArray527[local43] = this.anIntArray527[local43]; arg2.anIntArray531[local43] = this.anIntArray531[local43]; @@ -573,7 +573,7 @@ public final class SoftwareModel extends Model { arg2.aShortArray91 = this.aShortArray91; arg2.aShortArray90 = this.aShortArray90; arg2.aBoolean303 = this.aBoolean303; - arg2.aBoolean305 = false; + arg2.boundsValid = false; return arg2; } @@ -582,12 +582,12 @@ public final class SoftwareModel extends Model { public final void method4574(@OriginalArg(0) int arg0) { @Pc(3) int local3 = MathUtils.sin[arg0]; @Pc(7) int local7 = MathUtils.cos[arg0]; - for (@Pc(9) int local9 = 0; local9 < this.anInt5788; local9++) { + for (@Pc(9) int local9 = 0; local9 < this.vertexCount; local9++) { @Pc(29) int local29 = this.anIntArray527[local9] * local7 - this.anIntArray531[local9] * local3 >> 16; this.anIntArray531[local9] = this.anIntArray527[local9] * local3 + this.anIntArray531[local9] * local7 >> 16; this.anIntArray527[local9] = local29; } - this.aBoolean305 = false; + this.boundsValid = false; } @OriginalMember(owner = "client!w", name = "d", descriptor = "()Z") @@ -608,18 +608,18 @@ public final class SoftwareModel extends Model { public final void method4564(@OriginalArg(0) int arg0) { @Pc(3) int local3 = MathUtils.sin[arg0]; @Pc(7) int local7 = MathUtils.cos[arg0]; - for (@Pc(9) int local9 = 0; local9 < this.anInt5788; local9++) { + for (@Pc(9) int local9 = 0; local9 < this.vertexCount; local9++) { @Pc(29) int local29 = this.anIntArray527[local9] * local3 + this.anIntArray528[local9] * local7 >> 16; this.anIntArray527[local9] = this.anIntArray527[local9] * local7 - this.anIntArray528[local9] * local3 >> 16; this.anIntArray528[local9] = local29; } - this.aBoolean305 = false; + this.boundsValid = false; } @OriginalMember(owner = "client!w", 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.aBoolean305) { + if (!this.boundsValid) { this.method4592(); } @Pc(14) int local14 = arg7 * arg4 - arg5 * arg3 >> 16; @@ -730,7 +730,7 @@ public final class SoftwareModel extends Model { } } } - for (local204 = 0; local204 < this.anInt5788; local204++) { + for (local204 = 0; local204 < this.vertexCount; local204++) { local223 = this.anIntArray528[local204]; local208 = this.anIntArray527[local204]; local227 = this.anIntArray531[local204]; @@ -770,7 +770,7 @@ public final class SoftwareModel extends Model { @OriginalMember(owner = "client!w", name = "a", descriptor = "(II[[I[[IIIIZ)Lclient!w;") public final SoftwareModel method4586(@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) boolean arg7) { - if (!this.aBoolean305) { + if (!this.boundsValid) { this.method4592(); } @Pc(9) int local9 = arg4 + this.aShort31; @@ -799,7 +799,7 @@ public final class SoftwareModel extends Model { @Pc(150) SoftwareModel local150; if (arg7) { local150 = new SoftwareModel(); - local150.anInt5788 = this.anInt5788; + local150.vertexCount = this.vertexCount; local150.anInt5787 = this.anInt5787; local150.anInt5789 = this.anInt5789; local150.anIntArray534 = this.anIntArray534; @@ -828,7 +828,7 @@ public final class SoftwareModel extends Model { local150.anIntArray531 = Static115.method2308(this.anIntArray531); } else { local150.anIntArray528 = this.anIntArray528; - local150.anIntArray527 = new int[local150.anInt5788]; + local150.anIntArray527 = new int[local150.vertexCount]; local150.anIntArray531 = this.anIntArray531; } } else { @@ -845,7 +845,7 @@ public final class SoftwareModel extends Model { @Pc(367) int local367; @Pc(379) int local379; if (arg0 == 1) { - for (local285 = 0; local285 < local150.anInt5788; local285++) { + for (local285 = 0; local285 < local150.vertexCount; local285++) { local296 = this.anIntArray528[local285] + arg4; local303 = this.anIntArray531[local285] + arg6; local307 = local296 & 0x7F; @@ -860,7 +860,7 @@ public final class SoftwareModel extends Model { } else { @Pc(506) int local506; if (arg0 == 2) { - for (local285 = 0; local285 < local150.anInt5788; local285++) { + for (local285 = 0; local285 < local150.vertexCount; local285++) { local296 = (this.anIntArray527[local285] << 16) / this.aShort38; if (local296 < arg1) { local303 = this.anIntArray528[local285] + arg4; @@ -883,7 +883,7 @@ public final class SoftwareModel extends Model { local150.method4573(arg2, arg4, arg5, arg6, local285, local296); } else if (arg0 == 4) { local285 = this.aShort37 - this.aShort38; - for (local296 = 0; local296 < this.anInt5788; local296++) { + for (local296 = 0; local296 < this.vertexCount; local296++) { local303 = this.anIntArray528[local296] + arg4; local307 = this.anIntArray531[local296] + arg6; local311 = local303 & 0x7F; @@ -897,7 +897,7 @@ public final class SoftwareModel extends Model { } } else if (arg0 == 5) { local285 = this.aShort37 - this.aShort38; - for (local296 = 0; local296 < this.anInt5788; local296++) { + for (local296 = 0; local296 < this.vertexCount; local296++) { local303 = this.anIntArray528[local296] + arg4; local307 = this.anIntArray531[local296] + arg6; local311 = local303 & 0x7F; @@ -915,26 +915,26 @@ public final class SoftwareModel extends Model { } } } - local150.aBoolean305 = false; + local150.boundsValid = false; return local150; } @OriginalMember(owner = "client!w", name = "i", descriptor = "()V") @Override public final void method4563() { - for (@Pc(1) int local1 = 0; local1 < this.anInt5788; local1++) { + for (@Pc(1) int local1 = 0; local1 < this.vertexCount; local1++) { @Pc(10) int local10 = this.anIntArray528[local1]; this.anIntArray528[local1] = this.anIntArray531[local1]; this.anIntArray531[local1] = -local10; } - this.aBoolean305 = false; + this.boundsValid = false; } @OriginalMember(owner = "client!w", name = "a", descriptor = "(IIIIIIIJ)V") @Override public final void method4571(@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) long arg6) { try { - if (!this.aBoolean305) { + if (!this.boundsValid) { this.method4592(); } @Pc(6) int local6 = Rasteriser.centerX; @@ -948,7 +948,7 @@ public final class SoftwareModel extends Model { @Pc(36) int local36 = MathUtils.sin[arg2]; @Pc(40) int local40 = MathUtils.cos[arg2]; @Pc(50) int local50 = arg4 * local36 + arg5 * local40 >> 16; - for (@Pc(52) int local52 = 0; local52 < this.anInt5788; local52++) { + for (@Pc(52) int local52 = 0; local52 < this.vertexCount; local52++) { @Pc(61) int local61 = this.anIntArray528[local52]; @Pc(66) int local66 = this.anIntArray527[local52]; @Pc(71) int local71 = this.anIntArray531[local52]; @@ -1142,7 +1142,7 @@ public final class SoftwareModel extends Model { @OriginalMember(owner = "client!w", name = "c", descriptor = "()I") @Override public final int method4550() { - if (!this.aBoolean305) { + if (!this.boundsValid) { this.method4592(); } return this.aShort36; @@ -1151,12 +1151,12 @@ public final class SoftwareModel extends Model { @OriginalMember(owner = "client!w", name = "b", descriptor = "(III)V") @Override public final void resize(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { - for (@Pc(1) int local1 = 0; local1 < this.anInt5788; local1++) { + for (@Pc(1) int local1 = 0; local1 < this.vertexCount; local1++) { this.anIntArray528[local1] = this.anIntArray528[local1] * arg0 / 128; this.anIntArray527[local1] = this.anIntArray527[local1] * arg1 / 128; this.anIntArray531[local1] = this.anIntArray531[local1] * arg2 / 128; } - this.aBoolean305 = false; + this.boundsValid = false; } @OriginalMember(owner = "client!w", name = "a", descriptor = "(ZZZ)Lclient!ak;") @@ -1177,7 +1177,7 @@ public final class SoftwareModel extends Model { @OriginalMember(owner = "client!w", name = "j", descriptor = "()I") @Override public final int method4566() { - if (!this.aBoolean305) { + if (!this.boundsValid) { this.method4592(); } return this.aShort34; @@ -1191,7 +1191,7 @@ public final class SoftwareModel extends Model { @OriginalMember(owner = "client!w", name = "g", descriptor = "()I") @Override public final int method4561() { - if (!this.aBoolean305) { + if (!this.boundsValid) { this.method4592(); } return this.aShort32; @@ -1204,7 +1204,7 @@ public final class SoftwareModel extends Model { this.method4581(); this.aBoolean304 = false; } - this.aBoolean305 = false; + this.boundsValid = false; } @OriginalMember(owner = "client!w", name = "b", descriptor = "(I)V") @@ -1212,12 +1212,12 @@ public final class SoftwareModel extends Model { public final void method4554(@OriginalArg(0) int arg0) { @Pc(3) int local3 = MathUtils.sin[arg0]; @Pc(7) int local7 = MathUtils.cos[arg0]; - for (@Pc(9) int local9 = 0; local9 < this.anInt5788; local9++) { + for (@Pc(9) int local9 = 0; local9 < this.vertexCount; local9++) { @Pc(29) int local29 = this.anIntArray531[local9] * local3 + this.anIntArray528[local9] * local7 >> 16; this.anIntArray531[local9] = this.anIntArray531[local9] * local7 - this.anIntArray528[local9] * local3 >> 16; this.anIntArray528[local9] = local29; } - this.aBoolean305 = false; + this.boundsValid = false; } @OriginalMember(owner = "client!w", name = "a", descriptor = "(I[IIIIZ)V") @@ -1725,18 +1725,18 @@ public final class SoftwareModel extends Model { @OriginalMember(owner = "client!w", name = "l", descriptor = "()V") @Override public final void method4578() { - for (@Pc(1) int local1 = 0; local1 < this.anInt5788; local1++) { + for (@Pc(1) int local1 = 0; local1 < this.vertexCount; local1++) { @Pc(10) int local10 = this.anIntArray531[local1]; this.anIntArray531[local1] = this.anIntArray528[local1]; this.anIntArray528[local1] = -local10; } - this.aBoolean305 = false; + this.boundsValid = false; } @OriginalMember(owner = "client!w", name = "b", descriptor = "(IIIIIIII)V") public final void method4591(@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) { try { - if (!this.aBoolean305) { + if (!this.boundsValid) { this.method4592(); } @Pc(6) int local6 = Rasteriser.centerX; @@ -1750,7 +1750,7 @@ public final class SoftwareModel extends Model { @Pc(36) int local36 = MathUtils.sin[arg2]; @Pc(40) int local40 = MathUtils.cos[arg2]; @Pc(50) int local50 = arg4 * local36 + arg5 * local40 >> 16; - for (@Pc(52) int local52 = 0; local52 < this.anInt5788; local52++) { + for (@Pc(52) int local52 = 0; local52 < this.vertexCount; local52++) { @Pc(61) int local61 = this.anIntArray528[local52]; @Pc(66) int local66 = this.anIntArray527[local52]; @Pc(71) int local71 = this.anIntArray531[local52]; @@ -1794,7 +1794,7 @@ public final class SoftwareModel extends Model { @Pc(11) int local11 = -32768; @Pc(13) int local13 = 0; @Pc(15) int local15 = 0; - for (@Pc(17) int local17 = 0; local17 < this.anInt5788; local17++) { + for (@Pc(17) int local17 = 0; local17 < this.vertexCount; local17++) { @Pc(26) int local26 = this.anIntArray528[local17]; @Pc(31) int local31 = this.anIntArray527[local17]; @Pc(36) int local36 = this.anIntArray531[local17]; @@ -1833,13 +1833,13 @@ public final class SoftwareModel extends Model { this.aShort36 = (short) local11; this.aShort34 = (short) (Math.sqrt((double) local13) + 0.99D); this.aShort35 = (short) (Math.sqrt((double) local15) + 0.99D); - this.aBoolean305 = true; + this.boundsValid = true; } @OriginalMember(owner = "client!w", name = "h", descriptor = "()I") @Override public final int method4562() { - if (!this.aBoolean305) { + if (!this.boundsValid) { this.method4592(); } return this.aShort31; @@ -2231,7 +2231,7 @@ public final class SoftwareModel extends Model { Static268.anInt5793 = 0; Static268.anInt5791 = 0; Static268.anInt5792 = 0; - for (local11 = 0; local11 < this.anInt5788; local11++) { + for (local11 = 0; local11 < this.vertexCount; local11++) { Static268.anInt5793 += this.anIntArray528[local11]; Static268.anInt5791 += this.anIntArray527[local11]; Static268.anInt5792 += this.anIntArray531[local11]; @@ -2247,7 +2247,7 @@ public final class SoftwareModel extends Model { Static268.anInt5792 = arg3; } } else if (arg0 == 1) { - for (local3 = 0; local3 < this.anInt5788; local3++) { + for (local3 = 0; local3 < this.vertexCount; local3++) { this.anIntArray528[local3] += arg1; this.anIntArray527[local3] += arg2; this.anIntArray531[local3] += arg3; @@ -2256,7 +2256,7 @@ public final class SoftwareModel extends Model { @Pc(146) int local146; @Pc(164) int local164; if (arg0 == 2) { - for (local3 = 0; local3 < this.anInt5788; local3++) { + for (local3 = 0; local3 < this.vertexCount; local3++) { this.anIntArray528[local3] -= Static268.anInt5793; this.anIntArray527[local3] -= Static268.anInt5791; this.anIntArray531[local3] -= Static268.anInt5792; @@ -2286,7 +2286,7 @@ public final class SoftwareModel extends Model { this.anIntArray531[local3] += Static268.anInt5792; } } else if (arg0 == 3) { - for (local3 = 0; local3 < this.anInt5788; local3++) { + for (local3 = 0; local3 < this.vertexCount; local3++) { this.anIntArray528[local3] -= Static268.anInt5793; this.anIntArray527[local3] -= Static268.anInt5791; this.anIntArray531[local3] -= Static268.anInt5792; @@ -2336,12 +2336,12 @@ public final class SoftwareModel extends Model { @OriginalMember(owner = "client!w", name = "c", descriptor = "(III)V") @Override public final void method4575(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { - for (@Pc(1) int local1 = 0; local1 < this.anInt5788; local1++) { + for (@Pc(1) int local1 = 0; local1 < this.vertexCount; local1++) { this.anIntArray528[local1] += arg0; this.anIntArray527[local1] += arg1; this.anIntArray531[local1] += arg2; } - this.aBoolean305 = false; + this.boundsValid = false; } @OriginalMember(owner = "client!w", name = "b", descriptor = "(ZZZ)Lclient!ak;") diff --git a/client/src/main/java/SoundBank.java b/client/src/main/java/SoundBank.java index c3452e8..341bdc8 100644 --- a/client/src/main/java/SoundBank.java +++ b/client/src/main/java/SoundBank.java @@ -52,7 +52,7 @@ public final class SoundBank { public final PcmSound method2738(@OriginalArg(0) int arg0, @OriginalArg(2) int[] arg1) { if (this.aClass153_52.method4483() == 1) { return this.method2737(arg1, 0, arg0); - } else if (this.aClass153_52.method4504(arg0) == 1) { + } else if (this.aClass153_52.getGroupCapacity(arg0) == 1) { return this.method2737(arg1, arg0, 0); } else { throw new RuntimeException(); @@ -93,7 +93,7 @@ public final class SoundBank { public final PcmSound method2741(@OriginalArg(1) int arg0, @OriginalArg(2) int[] arg1) { if (this.aClass153_53.method4483() == 1) { return this.method2740(0, arg1, arg0); - } else if (this.aClass153_53.method4504(arg0) == 1) { + } else if (this.aClass153_53.getGroupCapacity(arg0) == 1) { return this.method2740(arg0, arg1, 0); } else { throw new RuntimeException(); diff --git a/client/src/main/java/SoundPlayer.java b/client/src/main/java/SoundPlayer.java index 735d1a3..5e2f043 100644 --- a/client/src/main/java/SoundPlayer.java +++ b/client/src/main/java/SoundPlayer.java @@ -3,35 +3,61 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; public class SoundPlayer { + @OriginalMember(owner = "client!qe", name = "t", descriptor = "[I") + public static final int[] anIntArray421 = new int[50]; + @OriginalMember(owner = "client!wh", name = "g", descriptor = "[I") + public static final int[] anIntArray563 = new int[50]; + @OriginalMember(owner = "client!na", name = "mb", descriptor = "[I") + public static final int[] anIntArray362 = new int[50]; + @OriginalMember(owner = "client!nk", name = "n", descriptor = "[Lclient!sl;") + public static final SynthSound[] aClass138Array1 = new SynthSound[50]; + @OriginalMember(owner = "client!ca", name = "fb", descriptor = "[I") + public static final int[] anIntArray68 = new int[50]; + @OriginalMember(owner = "client!pe", name = "j", descriptor = "I") + public static int anInt4451 = 0; + @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)) { + public static void playSeqSound(@OriginalArg(0) int arg0, @OriginalArg(1) SeqType arg1, @OriginalArg(3) int arg2, @OriginalArg(4) boolean self, @OriginalArg(5) int arg4) { + if (anInt4451 >= 50 || (arg1.sounds == null || arg4 >= arg1.sounds.length || arg1.sounds[arg4] == null)) { return; } - @Pc(36) int local36 = arg1.anIntArrayArray38[arg4][0]; + @Pc(36) int local36 = arg1.sounds[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 (arg1.sounds[arg4].length > 1) { + local57 = (int) ((double) arg1.sounds[arg4].length * Math.random()); if (local57 > 0) { - local40 = arg1.anIntArrayArray38[arg4][local57]; + local40 = arg1.sounds[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); + @Pc(77) int minDistance = local36 & 0x1F; + if (minDistance == 0) { + if (self) { + play(local73, local40, 0); } } else if (Preferences.ambientSoundsVolume != 0) { - Static200.anIntArray421[Static189.anInt4451] = local40; - Static276.anIntArray563[Static189.anInt4451] = local73; + anIntArray421[anInt4451] = local40; + anIntArray563[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++; + anIntArray362[anInt4451] = 0; + aClass138Array1[anInt4451] = null; + anIntArray68[anInt4451] = minDistance + (local57 << 16) + (local111 << 8); + anInt4451++; } } + + @OriginalMember(owner = "client!ca", name = "a", descriptor = "(IIII)V") + public static void play(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { + if (Preferences.soundEffectVolume == 0 || arg0 == 0 || anInt4451 >= 50 || arg1 == -1) { + return; + } + anIntArray421[anInt4451] = arg1; + anIntArray563[anInt4451] = arg0; + anIntArray362[anInt4451] = arg2; + aClass138Array1[anInt4451] = null; + anIntArray68[anInt4451] = 0; + anInt4451++; + } } diff --git a/client/src/main/java/SpecularMaterialRenderer.java b/client/src/main/java/SpecularMaterialRenderer.java index 46222c6..083a4d7 100644 --- a/client/src/main/java/SpecularMaterialRenderer.java +++ b/client/src/main/java/SpecularMaterialRenderer.java @@ -228,7 +228,7 @@ public final class SpecularMaterialRenderer implements MaterialRenderer { local1.glTexImage2D(local27 + GL2.GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0, GL2.GL_ALPHA, 64, 64, 0, GL2.GL_ALPHA, GL2.GL_UNSIGNED_BYTE, ByteBuffer.wrap(local25)); local1.glBindTexture(GL2.GL_TEXTURE_CUBE_MAP, this.anIntArray519[2]); local1.glTexImage2D(local27 + GL2.GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0, GL2.GL_ALPHA, 64, 64, 0, GL2.GL_ALPHA, GL2.GL_UNSIGNED_BYTE, ByteBuffer.wrap(local19)); - Static63.onCardTexture += 12288; + GlCleaner.onCardTexture += 12288; } } } diff --git a/client/src/main/java/SpotAnim.java b/client/src/main/java/SpotAnim.java index 8c0607d..fb34fd7 100644 --- a/client/src/main/java/SpotAnim.java +++ b/client/src/main/java/SpotAnim.java @@ -53,18 +53,18 @@ public final class SpotAnim extends Entity { this.anInt590 = arg6 + arg5; this.anInt596 = arg0; this.anInt599 = arg4; - @Pc(42) int local42 = Static34.method877(this.anInt596).seqId; + @Pc(42) int local42 = SpotAnimTypeList.get(this.anInt596).seqId; if (local42 == -1) { this.aBoolean41 = true; } else { this.aBoolean41 = false; - this.aClass144_1 = Static36.get(local42); + this.aClass144_1 = SeqTypeList.get(local42); } } @OriginalMember(owner = "client!bh", name = "b", descriptor = "(Z)Lclient!ak;") private Model method552() { - @Pc(8) SpotAnimType local8 = Static34.method877(this.anInt596); + @Pc(8) SpotAnimType local8 = SpotAnimTypeList.get(this.anInt596); @Pc(26) Model local26; if (this.aBoolean41) { local26 = local8.method1319(-1, -1, 0); diff --git a/client/src/main/java/SpotAnimType.java b/client/src/main/java/SpotAnimType.java index aa0f997..6db534b 100644 --- a/client/src/main/java/SpotAnimType.java +++ b/client/src/main/java/SpotAnimType.java @@ -46,7 +46,7 @@ public final class SpotAnimType { private int angle = 0; @OriginalMember(owner = "client!eg", name = "a", descriptor = "(Lclient!wa;B)V") - public final void method1316(@OriginalArg(0) Buffer arg0) { + public final void decode(@OriginalArg(0) Buffer arg0) { while (true) { @Pc(17) int local17 = arg0.g1(); if (local17 == 0) { @@ -99,9 +99,9 @@ public final class SpotAnimType { @OriginalMember(owner = "client!eg", name = "a", descriptor = "(IBII)Lclient!ak;") public final Model method1319(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { - @Pc(13) Model local13 = (Model) Static56.models.get((long) this.id); + @Pc(13) Model local13 = (Model) SpotAnimTypeList.models.get((long) this.id); if (local13 == null) { - @Pc(28) RawModel local28 = Static77.create(Static93.modelsArchive, this.modelId); + @Pc(28) RawModel local28 = Static77.create(SpotAnimTypeList.modelsArchive, this.modelId); if (local28 == null) { return null; } @@ -117,13 +117,13 @@ public final class SpotAnimType { } } local13 = local28.createModel(this.anInt1749 + 64, this.anInt1748 + 850, -30, -50, -30); - Static56.models.put(local13, (long) this.id); + SpotAnimTypeList.models.put(local13, (long) this.id); } @Pc(118) Model local118; if (this.seqId == -1 || arg1 == -1) { local118 = local13.method4560(true, true, true); } else { - local118 = Static36.get(this.seqId).method4219(arg0, arg2, arg1, local13); + local118 = SeqTypeList.get(this.seqId).method4219(arg0, arg2, arg1, local13); } if (this.resizeXZ != 128 || this.resizeY != 128) { local118.resize(this.resizeXZ, this.resizeY, this.resizeXZ); diff --git a/client/src/main/java/SpotAnimTypeList.java b/client/src/main/java/SpotAnimTypeList.java new file mode 100644 index 0000000..80da8f7 --- /dev/null +++ b/client/src/main/java/SpotAnimTypeList.java @@ -0,0 +1,64 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class SpotAnimTypeList { + @OriginalMember(owner = "client!wk", name = "t", descriptor = "Lclient!n;") + public static final SoftLruHashTable types = new SoftLruHashTable(64); + @OriginalMember(owner = "client!ef", name = "b", descriptor = "Lclient!n;") + public static final SoftLruHashTable models = new SoftLruHashTable(30); + @OriginalMember(owner = "client!he", name = "cb", descriptor = "Lclient!ve;") + public static Js5 modelsArchive; + @OriginalMember(owner = "client!ke", name = "R", descriptor = "Lclient!ve;") + public static Js5 archive; + + @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) { + modelsArchive = arg0; + archive = arg1; + } + + @OriginalMember(owner = "client!ck", name = "a", descriptor = "(BI)Lclient!eg;") + public static SpotAnimType get(@OriginalArg(1) int arg0) { + @Pc(10) SpotAnimType local10 = (SpotAnimType) types.get((long) arg0); + if (local10 != null) { + return local10; + } + @Pc(26) byte[] local26 = archive.getFile(method3681(arg0), method4010(arg0)); + local10 = new SpotAnimType(); + local10.id = arg0; + if (local26 != null) { + local10.decode(new Buffer(local26)); + } + types.put(local10, (long) arg0); + return local10; + } + + @OriginalMember(owner = "client!qk", name = "a", descriptor = "(ZI)I") + public static int method3681(@OriginalArg(1) int arg0) { + return arg0 >>> 8; + } + + @OriginalMember(owner = "client!kf", name = "a", descriptor = "(II)I") + public static int method4010(@OriginalArg(0) int arg0) { + return arg0 & 0xFF; + } + + @OriginalMember(owner = "client!kl", name = "c", descriptor = "(II)V") + public static void clean() { + types.clean(5); + models.clean(5); + } + + @OriginalMember(owner = "client!ub", name = "a", descriptor = "(Z)V") + public static void method4249() { + types.clear(); + models.clear(); + } + + @OriginalMember(owner = "client!fk", name = "a", descriptor = "(B)V") + public static void method1441() { + types.method3103(); + models.method3103(); + } +} diff --git a/client/src/main/java/Sprites.java b/client/src/main/java/Sprites.java index 1d408f0..e6ef9c5 100644 --- a/client/src/main/java/Sprites.java +++ b/client/src/main/java/Sprites.java @@ -4,58 +4,58 @@ 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"); + public static final JagString P11_FULL = JagString.parse("p11_full"); @OriginalMember(owner = "client!ee", name = "e", descriptor = "Lclient!na;") - public static final JagString P12_FULL = Static28.parse("p12_full"); + public static final JagString P12_FULL = JagString.parse("p12_full"); @OriginalMember(owner = "client!fm", name = "eb", descriptor = "Lclient!na;") - public static final JagString B12_FULL = Static28.parse("b12_full"); + public static final JagString B12_FULL = JagString.parse("b12_full"); @OriginalMember(owner = "client!bg", name = "N", descriptor = "Lclient!na;") - public static final JagString MAPFUNCTION = Static28.parse("mapfunction"); + public static final JagString MAPFUNCTION = JagString.parse("mapfunction"); @OriginalMember(owner = "client!rl", name = "S", descriptor = "Lclient!na;") - public static final JagString HITMARKS = Static28.parse("hitmarks"); + public static final JagString HITMARKS = JagString.parse("hitmarks"); @OriginalMember(owner = "client!vd", name = "v", descriptor = "Lclient!na;") - public static final JagString HITBAR_DEFAULT = Static28.parse("hitbar_default"); + public static final JagString HITBAR_DEFAULT = JagString.parse("hitbar_default"); @OriginalMember(owner = "client!jj", name = "d", descriptor = "Lclient!na;") - public static final JagString HEADICONS_PK = Static28.parse("headicons_pk"); + public static final JagString HEADICONS_PK = JagString.parse("headicons_pk"); @OriginalMember(owner = "client!sh", name = "j", descriptor = "Lclient!na;") - public static final JagString HEADICONS_PRAYER = Static28.parse("headicons_prayer"); + public static final JagString HEADICONS_PRAYER = JagString.parse("headicons_prayer"); @OriginalMember(owner = "client!hj", name = "d", descriptor = "Lclient!na;") - public static final JagString HINT_HEADICONS = Static28.parse("hint_headicons"); + public static final JagString HINT_HEADICONS = JagString.parse("hint_headicons"); @OriginalMember(owner = "client!pe", name = "n", descriptor = "Lclient!na;") - public static final JagString HINT_MAPMARKERS = Static28.parse("hint_mapmarkers"); + public static final JagString HINT_MAPMARKERS = JagString.parse("hint_mapmarkers"); @OriginalMember(owner = "client!vc", name = "ab", descriptor = "Lclient!na;") - public static final JagString MAPFLAG = Static28.parse("mapflag"); + public static final JagString MAPFLAG = JagString.parse("mapflag"); @OriginalMember(owner = "client!gm", name = "db", descriptor = "Lclient!na;") - public static final JagString CROSS = Static28.parse("cross"); + public static final JagString CROSS = JagString.parse("cross"); @OriginalMember(owner = "client!pe", name = "z", descriptor = "Lclient!na;") - public static final JagString MAPDOTS = Static28.parse("mapdots"); + public static final JagString MAPDOTS = JagString.parse("mapdots"); @OriginalMember(owner = "client!uf", name = "o", descriptor = "Lclient!na;") - public static final JagString SCROLLBAR = Static28.parse("scrollbar"); + public static final JagString SCROLLBAR = JagString.parse("scrollbar"); @OriginalMember(owner = "client!cb", name = "eb", descriptor = "Lclient!na;") - public static final JagString NAME_ICONS = Static28.parse("name_icons"); + public static final JagString NAME_ICONS = JagString.parse("name_icons"); @OriginalMember(owner = "client!bh", name = "v", descriptor = "Lclient!na;") - public static final JagString FLOORSHADOWS = Static28.parse("floorshadows"); + public static final JagString FLOORSHADOWS = JagString.parse("floorshadows"); @OriginalMember(owner = "client!wl", name = "d", descriptor = "Lclient!na;") - public static final JagString COMPASS = Static28.parse("compass"); + public static final JagString COMPASS = JagString.parse("compass"); @OriginalMember(owner = "client!af", name = "g", descriptor = "Lclient!na;") - public static final JagString HINT_MAPEDGE = Static28.parse("hint_mapedge"); + public static final JagString HINT_MAPEDGE = JagString.parse("hint_mapedge"); @OriginalMember(owner = "client!nc", name = "h", descriptor = "I") public static int p11FullId; @@ -270,4 +270,9 @@ public class Sprites { Static67.mapfuncs = mapfunctions; } } + + @OriginalMember(owner = "client!f", name = "h", descriptor = "(I)I") + public static int total() { + return 15; + } } diff --git a/client/src/main/java/Static1.java b/client/src/main/java/Static1.java index 5a6a608..b6a1ec6 100644 --- a/client/src/main/java/Static1.java +++ b/client/src/main/java/Static1.java @@ -11,7 +11,7 @@ public final class Static1 { public static int anInt5; @OriginalMember(owner = "client!a", name = "e", descriptor = "Lclient!na;") - public static final JagString TITLE_SONG = Static28.parse("scape main"); + public static final JagString TITLE_SONG = JagString.parse("scape main"); @OriginalMember(owner = "client!a", name = "f", descriptor = "[Z") public static final boolean[] aBooleanArray1 = new boolean[8]; @@ -20,12 +20,7 @@ public final class Static1 { public static int anInt6 = 0; @OriginalMember(owner = "client!a", name = "j", descriptor = "Lclient!na;") - public static final JagString aClass100_2 = Static28.parse(" )4 "); - - @OriginalMember(owner = "client!a", name = "a", descriptor = "(Lclient!fi;I)V") - public static void method1(@OriginalArg(0) HuffmanCodec arg0) { - Static62.aClass44_1 = arg0; - } + public static final JagString aClass100_2 = JagString.parse(" )4 "); @OriginalMember(owner = "client!a", name = "a", descriptor = "([[F[[F[[II[[F[[B[[II[[B[[B[[B[[[B)[Lclient!hg;") public static GlTile[] method2(@OriginalArg(0) float[][] arg0, @OriginalArg(1) float[][] arg1, @OriginalArg(2) int[][] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) byte[][] arg5, @OriginalArg(6) int[][] arg6, @OriginalArg(8) byte[][] arg7, @OriginalArg(9) byte[][] arg8, @OriginalArg(10) byte[][] arg9, @OriginalArg(11) byte[][][] arg10) { @@ -59,7 +54,7 @@ public final class Static1 { local30 = arg8[local12][local17] & 0xFF; local38 = arg9[local12][local17] & 0xFF; if (local38 != 0) { - @Pc(50) FloType local50 = Static256.method4395(local38 - 1); + @Pc(50) FloType local50 = FloTypeList.method4395(local38 - 1); if (local50.anInt5899 == -1) { continue; } @@ -91,7 +86,7 @@ public final class Static1 { @Pc(264) byte local264; @Pc(287) int local287; if (local180 != 0 && local38 != local180) { - local242 = Static256.method4395(local180 - 1); + local242 = FloTypeList.method4395(local180 - 1); if (local242.aBoolean310 && local242.anInt5899 != -1) { local264 = arg5[local12 - 1][local17 + 1]; local274 = arg7[local12 - 1][local17 + 1]; @@ -112,7 +107,7 @@ public final class Static1 { } } if (local214 != 0 && local214 != local38) { - local242 = Static256.method4395(local214 - 1); + local242 = FloTypeList.method4395(local214 - 1); if (local242.aBoolean310 && local242.anInt5899 != -1) { local264 = arg5[local12 - 1][local17 - 1]; local274 = arg7[local12 - 1][local17 - 1]; @@ -132,7 +127,7 @@ public final class Static1 { } } if (local202 != 0 && local38 != local202) { - local242 = Static256.method4395(local202 - 1); + local242 = FloTypeList.method4395(local202 - 1); if (local242.aBoolean310 && local242.anInt5899 != -1) { local264 = arg5[local12 + 1][local17 - 1]; local274 = arg7[local12 + 1][local17 - 1]; @@ -152,7 +147,7 @@ public final class Static1 { } } if (local226 != 0 && local226 != local38) { - local242 = Static256.method4395(local226 - 1); + local242 = FloTypeList.method4395(local226 - 1); if (local242.aBoolean310 && local242.anInt5899 != -1) { local264 = arg5[local12 + 1][local17 + 1]; local274 = arg7[local12 + 1][local17 + 1]; @@ -172,7 +167,7 @@ public final class Static1 { } } if (local143 != 0 && local38 != local143) { - local242 = Static256.method4395(local143 - 1); + local242 = FloTypeList.method4395(local143 - 1); if (local242.aBoolean310 && local242.anInt5899 != -1) { local129 = Static130.anIntArray300[arg7[local12][local17 + 1] * 4 + (arg5[local12][local17 + 1] + 2 & 0x3)]; for (local777 = 0; local777 < 8; local777++) { @@ -187,7 +182,7 @@ public final class Static1 { } } if (local163 != 0 && local38 != local163) { - local242 = Static256.method4395(local163 - 1); + local242 = FloTypeList.method4395(local163 - 1); if (local242.aBoolean310 && local242.anInt5899 != -1) { local133 = Static130.anIntArray300[(arg5[local12 - 1][local17] + 3 & 0x3) + arg7[local12 - 1][local17] * 4]; for (local777 = 0; local777 < 8; local777++) { @@ -202,7 +197,7 @@ public final class Static1 { } } if (local153 != 0 && local38 != local153) { - local242 = Static256.method4395(local153 - 1); + local242 = FloTypeList.method4395(local153 - 1); if (local242.aBoolean310 && local242.anInt5899 != -1) { local131 = Static130.anIntArray300[(arg5[local12][local17 - 1] & 0x3) + arg7[local12][local17 - 1] * 4]; for (local777 = 0; local777 < 8; local777++) { @@ -217,7 +212,7 @@ public final class Static1 { } } if (local190 != 0 && local38 != local190) { - local242 = Static256.method4395(local190 - 1); + local242 = FloTypeList.method4395(local190 - 1); if (local242.aBoolean310 && local242.anInt5899 != -1) { local168 = Static130.anIntArray300[(arg5[local12 + 1][local17] + 1 & 0x3) + arg7[local12 + 1][local17] * 4]; for (local777 = 0; local777 < 8; local777++) { @@ -237,7 +232,7 @@ public final class Static1 { local1068 = Static277.aBooleanArrayArray4[local777 == local153 ? local131 : 0]; @Pc(1077) boolean[] local1077 = Static277.aBooleanArrayArray4[local143 == local777 ? local129 : 0]; local1086 = Static277.aBooleanArrayArray4[local190 == local777 ? local168 : 0]; - @Pc(1092) FloType local1092 = Static256.method4395(local777 - 1); + @Pc(1092) FloType local1092 = FloTypeList.method4395(local777 - 1); @Pc(1097) GlTile local1097 = Static243.method4212(local10, local1092); local1097.anInt2482 += 5; local1097.anInt2482 += local1077.length - 2; @@ -265,7 +260,7 @@ public final class Static1 { local30 = arg3; } if (local127 != 0) { - @Pc(1250) FloType local1250 = Static256.method4395(local127 - 1); + @Pc(1250) FloType local1250 = FloTypeList.method4395(local127 - 1); if (local1250.anInt5899 == -1) { continue; } @@ -299,7 +294,7 @@ public final class Static1 { if (local214 == 0 || local214 == local127) { local214 = 0; } else { - local1496 = Static256.method4395(local214 - 1); + local1496 = FloTypeList.method4395(local214 - 1); if (local1496.aBoolean310 && local1496.anInt5899 != -1) { local274 = arg5[local12 - 1][local17 + 1]; local1527 = arg7[local12 - 1][local17 + 1]; @@ -326,7 +321,7 @@ public final class Static1 { if (local202 == 0 || local127 == local202) { local202 = 0; } else { - local1496 = Static256.method4395(local202 - 1); + local1496 = FloTypeList.method4395(local202 - 1); if (local1496.aBoolean310 && local1496.anInt5899 != -1) { local274 = arg5[local12 - 1][local17 - 1]; local1527 = arg7[local12 - 1][local17 - 1]; @@ -352,7 +347,7 @@ public final class Static1 { if (local226 == 0 || local226 == local127) { local226 = 0; } else { - local1496 = Static256.method4395(local226 - 1); + local1496 = FloTypeList.method4395(local226 - 1); if (local1496.aBoolean310 && local1496.anInt5899 != -1) { local274 = arg5[local12 + 1][local17 - 1]; local1527 = arg7[local12 + 1][local17 - 1]; @@ -378,7 +373,7 @@ public final class Static1 { if (local1035 == 0 || local127 == local1035) { local1035 = 0; } else { - local1496 = Static256.method4395(local1035 - 1); + local1496 = FloTypeList.method4395(local1035 - 1); if (local1496.aBoolean310 && local1496.anInt5899 != -1) { local1527 = arg7[local12 + 1][local17 + 1]; local274 = arg5[local12 + 1][local17 + 1]; @@ -403,7 +398,7 @@ public final class Static1 { } @Pc(2003) int local2003; if (local163 != 0 && local163 != local127) { - local1496 = Static256.method4395(local163 - 1); + local1496 = FloTypeList.method4395(local163 - 1); if (local1496.aBoolean310 && local1496.anInt5899 != -1) { local133 = Static130.anIntArray300[arg7[local12][local17 + 1] * 4 + (arg5[local12][local17 + 1] + 2 & 0x3)]; for (local2003 = 0; local2003 < 8; local2003++) { @@ -418,7 +413,7 @@ public final class Static1 { } } if (local153 != 0 && local127 != local153) { - local1496 = Static256.method4395(local153 - 1); + local1496 = FloTypeList.method4395(local153 - 1); if (local1496.aBoolean310 && local1496.anInt5899 != -1) { local131 = Static130.anIntArray300[(arg5[local12 - 1][local17] + 3 & 0x3) + arg7[local12 - 1][local17] * 4]; for (local2003 = 0; local2003 < 8; local2003++) { @@ -433,7 +428,7 @@ public final class Static1 { } } if (local190 != 0 && local190 != local127) { - local1496 = Static256.method4395(local190 - 1); + local1496 = FloTypeList.method4395(local190 - 1); if (local1496.aBoolean310 && local1496.anInt5899 != -1) { local168 = Static130.anIntArray300[(arg5[local12][local17 - 1] & 0x3) + arg7[local12][local17 - 1] * 4]; for (local2003 = 0; local2003 < 8; local2003++) { @@ -448,7 +443,7 @@ public final class Static1 { } } if (local180 != 0 && local180 != local127) { - local1496 = Static256.method4395(local180 - 1); + local1496 = FloTypeList.method4395(local180 - 1); if (local1496.aBoolean310 && local1496.anInt5899 != -1) { local143 = Static130.anIntArray300[arg7[local12 + 1][local17] * 4 + (arg5[local12 + 1][local17] + 1 & 0x3)]; for (local2003 = 0; local2003 < 8; local2003++) { @@ -468,7 +463,7 @@ public final class Static1 { local1068 = Static277.aBooleanArrayArray4[local153 == local2003 ? local131 : 0]; local1086 = Static277.aBooleanArrayArray4[local2003 == local190 ? local168 : 0]; @Pc(2318) boolean[] local2318 = Static277.aBooleanArrayArray4[local2003 == local180 ? local143 : 0]; - @Pc(2324) FloType local2324 = Static256.method4395(local2003 - 1); + @Pc(2324) FloType local2324 = FloTypeList.method4395(local2003 - 1); @Pc(2329) GlTile local2329 = Static243.method4212(local10, local2324); @Pc(2345) int local2345 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12][local17]) << 8 | 0xFF; @Pc(2365) int local2365 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12 + 1][local17]) << 8 | 0xFF; @@ -545,14 +540,14 @@ public final class Static1 { 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) { + if (WorldMap.aClass3_Sub2_Sub1_2 == null || arg2 != WorldMap.aClass3_Sub2_Sub1_2.anInt1867 || WorldMap.aClass3_Sub2_Sub1_2.anInt1859 != arg1) { @Pc(63) SoftwareSprite local63 = new SoftwareSprite(arg2, arg1); 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); + WorldMap.aClass3_Sub2_Sub1_2 = new GlSprite(local63); } else { - Static70.aClass3_Sub2_Sub1_2 = local63; + WorldMap.aClass3_Sub2_Sub1_2 = local63; } if (GlRenderer.enabled) { SoftwareRaster.pixels = null; @@ -560,7 +555,7 @@ public final class Static1 { client.frameBuffer.makeTarget(); } } - Static70.aClass3_Sub2_Sub1_2.method1415(arg0, arg3); + WorldMap.aClass3_Sub2_Sub1_2.method1415(arg0, arg3); @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; diff --git a/client/src/main/java/Static10.java b/client/src/main/java/Static10.java index 3f3c745..1657eee 100644 --- a/client/src/main/java/Static10.java +++ b/client/src/main/java/Static10.java @@ -21,27 +21,6 @@ public final class Static10 { return local7; } - @OriginalMember(owner = "client!an", name = "a", descriptor = "(BI)I") - public static int method347(@OriginalArg(1) int arg0) { - if (Protocol.socket != null) { - Protocol.socket.close(); - Protocol.socket = null; - } - Static127.anInt3132++; - if (Static127.anInt3132 > 4) { - Static82.anInt2231 = 0; - Static127.anInt3132 = 0; - return arg0; - } - Static82.anInt2231 = 0; - if (Static208.worldListPort == Static249.worldListDefaultPort) { - Static208.worldListPort = Static97.worldListAlternatePort; - } else { - Static208.worldListPort = Static249.worldListDefaultPort; - } - return -1; - } - @OriginalMember(owner = "client!an", name = "c", descriptor = "(III)V") public static void method348(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { if (Static189.anInt4457 != arg1) { @@ -76,9 +55,9 @@ 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 + 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] + ","; + @Pc(61) String local61 = "T2 - " + Protocol.opcode + "," + Static5.anInt45 + "," + Static49.anInt1462 + " - " + Protocol.length + "," + (Static225.originX + PlayerList.self.movementQueueX[0]) + "," + (PlayerList.self.movementQueueZ[0] + Static142.originZ) + " - "; + for (@Pc(63) int local63 = 0; local63 < Protocol.length && local63 < 50; local63++) { + local61 = local61 + Protocol.inboundBuffer.data[local63] + ","; } TracingException.report(local61, local19); Static278.processLogout(); @@ -86,18 +65,6 @@ public final class Static10 { } } - @OriginalMember(owner = "client!an", name = "a", descriptor = "(Z)V") - public static void method350() { - Static142.aClass99_23.clear(); - Static267.aClass99_37.clear(); - } - - @OriginalMember(owner = "client!an", name = "i", descriptor = "(I)V") - public static void method351() { - Static79.aClass99_11.clear(); - Static7.sprites.clear(); - } - @OriginalMember(owner = "client!an", name = "a", descriptor = "(IIIIIII)V") public static void method352(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { @Pc(11) int local11 = Static78.method1690(Static106.anInt2869, arg5, Static267.anInt5773); diff --git a/client/src/main/java/Static101.java b/client/src/main/java/Static101.java index 0f72618..e8e1c02 100644 --- a/client/src/main/java/Static101.java +++ b/client/src/main/java/Static101.java @@ -8,21 +8,18 @@ public final class Static101 { public static long aLong98; @OriginalMember(owner = "client!hm", name = "R", descriptor = "Lclient!na;") - public static final JagString aClass100_537 = Static28.parse(""); + public static final JagString aClass100_537 = JagString.parse(""); @OriginalMember(owner = "client!hm", name = "T", descriptor = "Lclient!na;") - public static final JagString aClass100_538 = Static28.parse(" "); + public static final JagString aClass100_538 = JagString.parse(" "); @OriginalMember(owner = "client!hm", name = "Y", descriptor = "Lclient!na;") - public static final JagString aClass100_539 = Static28.parse("Fps:"); + public static final JagString aClass100_539 = JagString.parse("Fps:"); @OriginalMember(owner = "client!hm", name = "ab", descriptor = "I") public static int anInt2640 = 0; - @OriginalMember(owner = "client!hm", name = "fb", descriptor = "[Lclient!ba;") - public static World[] worlds = new World[0]; - - @OriginalMember(owner = "client!hm", name = "a", descriptor = "(Lclient!na;B)I") + @OriginalMember(owner = "client!hm", name = "a", descriptor = "(Lclient!na;B)I") public static int method2053(@OriginalArg(0) JagString arg0) { for (@Pc(12) int local12 = 0; local12 < Static153.aClass100Array113.length; local12++) { if (Static153.aClass100Array113[local12].equalsIgnoreCase(arg0)) { diff --git a/client/src/main/java/Static102.java b/client/src/main/java/Static102.java index c059434..917d196 100644 --- a/client/src/main/java/Static102.java +++ b/client/src/main/java/Static102.java @@ -42,18 +42,6 @@ public final class Static102 { Static20.objectContainerCache = new HashTable(32); } - @OriginalMember(owner = "client!hn", name = "a", descriptor = "(Lclient!ve;ILclient!ve;)V") - public static void load(@OriginalArg(0) Js5 arg0, @OriginalArg(2) Js5 arg1) { - Fonts.p11Full = Static127.method2462(Sprites.p11FullId, arg1, arg0); - if (GlRenderer.enabled) { - Static265.p11FullSoftware = Static122.method2412(Sprites.p11FullId, arg0, arg1); - } else { - Static265.p11FullSoftware = (SoftwareFont) Fonts.p11Full; - } - 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 (PlayerList.self.getSize() == 2) { diff --git a/client/src/main/java/Static103.java b/client/src/main/java/Static103.java index 3b1f1ab..7a82b5b 100644 --- a/client/src/main/java/Static103.java +++ b/client/src/main/java/Static103.java @@ -14,7 +14,7 @@ public final class Static103 { public static final int[] anIntArray253 = new int[256]; @OriginalMember(owner = "client!i", name = "ic", descriptor = "Lclient!na;") - public static final JagString aClass100_558 = Static28.parse("m"); + public static final JagString aClass100_558 = JagString.parse("m"); @OriginalMember(owner = "client!i", name = "a", descriptor = "(Lclient!na;ILclient!na;I)V") public static void method2231(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) JagString arg2) { @@ -43,27 +43,27 @@ public final class Static103 { Static17.milliseconds = 0; Static122.x = Static7.clickX; Static25.y = Static60.clickY; - Static6.outboundBuffer.p1isaac(71); - Static6.outboundBuffer.p2leadd(local36); + Protocol.outboundBuffer.p1isaac(71); + Protocol.outboundBuffer.p2leadd(local36); } } if (local23 == 46) { Static233.method4003(local31, local19, local15); - Static6.outboundBuffer.p1isaac(247); - Static6.outboundBuffer.p2le(Static142.originZ + local19); - Static6.outboundBuffer.p2leadd(local15 + Static225.originX); - Static6.outboundBuffer.p2(Integer.MAX_VALUE & (int) (local31 >>> 32)); + Protocol.outboundBuffer.p1isaac(247); + Protocol.outboundBuffer.p2le(Static142.originZ + local19); + Protocol.outboundBuffer.p2leadd(local15 + Static225.originX); + Protocol.outboundBuffer.p2(Integer.MAX_VALUE & (int) (local31 >>> 32)); } if (local23 == 40) { - Static6.outboundBuffer.p1isaac(27); - Static6.outboundBuffer.p2(Static185.anInt4370); - Static6.outboundBuffer.p4le2(local19); - Static6.outboundBuffer.p2le(local15); - Static6.outboundBuffer.p4le2(Static224.anInt5062); - Static6.outboundBuffer.p2leadd(Static274.anInt4997); - Static6.outboundBuffer.p2leadd(local36); + Protocol.outboundBuffer.p1isaac(27); + Protocol.outboundBuffer.p2(Static185.anInt4370); + Protocol.outboundBuffer.p4le2(local19); + Protocol.outboundBuffer.p2le(local15); + Protocol.outboundBuffer.p4le2(Static224.anInt5062); + Protocol.outboundBuffer.p2leadd(Static274.anInt4997); + Protocol.outboundBuffer.p2leadd(local36); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.getComponent(local19); + Static257.aClass13_7 = InterfaceList.getComponent(local19); Static250.anInt5444 = local15; } @Pc(192) Npc local192; @@ -75,8 +75,8 @@ public final class Static103 { Static70.type = 2; Static17.milliseconds = 0; Static25.y = Static60.clickY; - Static6.outboundBuffer.p1isaac(30); - Static6.outboundBuffer.p2(local36); + Protocol.outboundBuffer.p1isaac(30); + Protocol.outboundBuffer.p2(local36); } } if (local23 == 17) { @@ -87,8 +87,8 @@ public final class Static103 { Static17.milliseconds = 0; Static70.type = 2; Static25.y = Static60.clickY; - Static6.outboundBuffer.p1isaac(78); - Static6.outboundBuffer.p2le(local36); + Protocol.outboundBuffer.p1isaac(78); + Protocol.outboundBuffer.p2le(local36); } } if (local23 == 44) { @@ -99,25 +99,25 @@ public final class Static103 { Static70.type = 2; Static25.y = Static60.clickY; Static17.milliseconds = 0; - Static6.outboundBuffer.p1isaac(133); - Static6.outboundBuffer.p2le(local36); + Protocol.outboundBuffer.p1isaac(133); + Protocol.outboundBuffer.p2le(local36); } } if (local23 == 58) { - Static6.outboundBuffer.p1isaac(135); - Static6.outboundBuffer.p2add(local36); - Static6.outboundBuffer.p2add(local15); - Static6.outboundBuffer.p4me(local19); + Protocol.outboundBuffer.p1isaac(135); + Protocol.outboundBuffer.p2add(local36); + Protocol.outboundBuffer.p2add(local15); + Protocol.outboundBuffer.p4me(local19); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.getComponent(local19); + Static257.aClass13_7 = InterfaceList.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 42) { Static233.method4003(local31, local19, local15); - Static6.outboundBuffer.p1isaac(254); - Static6.outboundBuffer.p2le(local15 + Static225.originX); - Static6.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE); - Static6.outboundBuffer.p2(local19 + Static142.originZ); + Protocol.outboundBuffer.p1isaac(254); + Protocol.outboundBuffer.p2le(local15 + Static225.originX); + Protocol.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE); + Protocol.outboundBuffer.p2(local19 + Static142.originZ); } if (local23 == 28) { Static153.method2909(); @@ -130,10 +130,10 @@ public final class Static103 { Static70.type = 2; Static17.milliseconds = 0; Static25.y = Static60.clickY; - Static6.outboundBuffer.p1isaac(239); - Static6.outboundBuffer.p4le2(Static98.anInt2512); - Static6.outboundBuffer.p2add(Static15.anInt506); - Static6.outboundBuffer.p2leadd(local36); + Protocol.outboundBuffer.p1isaac(239); + Protocol.outboundBuffer.p4le2(Static98.anInt2512); + Protocol.outboundBuffer.p2add(Static15.anInt506); + Protocol.outboundBuffer.p2leadd(local36); } } @Pc(560) boolean local560; @@ -150,57 +150,57 @@ public final class Static103 { Static17.milliseconds = 0; Static70.type = 2; Static25.y = Static60.clickY; - Static6.outboundBuffer.p1isaac(66); - Static6.outboundBuffer.p2le(Static225.originX + local15); - Static6.outboundBuffer.p2(local36); - Static6.outboundBuffer.p2leadd(local19 + Static142.originZ); + Protocol.outboundBuffer.p1isaac(66); + Protocol.outboundBuffer.p2le(Static225.originX + local15); + Protocol.outboundBuffer.p2(local36); + Protocol.outboundBuffer.p2leadd(local19 + Static142.originZ); } if (local23 == 1001) { Static233.method4003(local31, local19, local15); - Static6.outboundBuffer.p1isaac(170); - Static6.outboundBuffer.p2leadd(Integer.MAX_VALUE & (int) (local31 >>> 32)); - Static6.outboundBuffer.p2leadd(local15 + Static225.originX); - Static6.outboundBuffer.p2leadd(local19 + Static142.originZ); + Protocol.outboundBuffer.p1isaac(170); + Protocol.outboundBuffer.p2leadd(Integer.MAX_VALUE & (int) (local31 >>> 32)); + Protocol.outboundBuffer.p2leadd(local15 + Static225.originX); + Protocol.outboundBuffer.p2leadd(local19 + Static142.originZ); } if (local23 == 1002) { Static70.type = 2; Static122.x = Static7.clickX; Static25.y = Static60.clickY; Static17.milliseconds = 0; - Static6.outboundBuffer.p1isaac(92); - Static6.outboundBuffer.p2leadd(local36); + Protocol.outboundBuffer.p1isaac(92); + Protocol.outboundBuffer.p2leadd(local36); } @Pc(693) Component local693; if (local23 == 1006) { - local693 = Static5.getComponent(local19); + local693 = InterfaceList.getComponent(local19); if (local693 == null || local693.objCounts[local15] < 100000) { - Static6.outboundBuffer.p1isaac(92); - Static6.outboundBuffer.p2leadd(local36); + Protocol.outboundBuffer.p1isaac(92); + Protocol.outboundBuffer.p2leadd(local36); } else { - method2231(JagString.EMPTY, 0, JagString.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, ObjTypeList.get(local36).name})); } Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.getComponent(local19); + Static257.aClass13_7 = InterfaceList.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 60) { if (local36 == 0) { Static113.method3556(Static55.level, local15, local19); } else if (local36 == 1) { - if (Static191.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) { + if (LoginManager.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(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); - Static6.outboundBuffer.p1(57); - Static6.outboundBuffer.p1(Static59.anInt1814); - Static6.outboundBuffer.p1(Static273.anInt4130); - Static6.outboundBuffer.p1(89); - Static6.outboundBuffer.p2(PlayerList.self.xFine); - Static6.outboundBuffer.p2(PlayerList.self.zFine); - Static6.outboundBuffer.p1(Static221.anInt4364); - Static6.outboundBuffer.p1(63); + Protocol.outboundBuffer.p1(Static1.anInt5); + Protocol.outboundBuffer.p1(Static107.anInt2878); + Protocol.outboundBuffer.p2((int)Camera.yawTarget); + Protocol.outboundBuffer.p1(57); + Protocol.outboundBuffer.p1(Static59.anInt1814); + Protocol.outboundBuffer.p1(Static273.anInt4130); + Protocol.outboundBuffer.p1(89); + Protocol.outboundBuffer.p2(PlayerList.self.xFine); + Protocol.outboundBuffer.p2(PlayerList.self.zFine); + Protocol.outboundBuffer.p1(Static221.anInt4364); + Protocol.outboundBuffer.p1(63); } } } @@ -216,29 +216,29 @@ public final class Static103 { local884 = local884.getMultiNpc(); } if (local884 != null) { - Static6.outboundBuffer.p1isaac(72); - Static6.outboundBuffer.p2(local884.id); + Protocol.outboundBuffer.p1isaac(72); + Protocol.outboundBuffer.p2(local884.id); } } } if (local23 == 47) { - Static6.outboundBuffer.p1isaac(156); - Static6.outboundBuffer.p2leadd(local15); - Static6.outboundBuffer.p2add(local36); - Static6.outboundBuffer.p4le2(local19); + Protocol.outboundBuffer.p1isaac(156); + Protocol.outboundBuffer.p2leadd(local15); + Protocol.outboundBuffer.p2add(local36); + Protocol.outboundBuffer.p4le2(local19); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.getComponent(local19); + Static257.aClass13_7 = InterfaceList.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 3) { - Static6.outboundBuffer.p1isaac(253); - Static6.outboundBuffer.p4le2(Static98.anInt2512); - Static6.outboundBuffer.p2leadd(local15); - Static6.outboundBuffer.p4le2(local19); - Static6.outboundBuffer.p2add(local36); - Static6.outboundBuffer.p2le(Static15.anInt506); + Protocol.outboundBuffer.p1isaac(253); + Protocol.outboundBuffer.p4le2(Static98.anInt2512); + Protocol.outboundBuffer.p2leadd(local15); + Protocol.outboundBuffer.p4le2(local19); + Protocol.outboundBuffer.p2add(local36); + Protocol.outboundBuffer.p2le(Static15.anInt506); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.getComponent(local19); + Static257.aClass13_7 = InterfaceList.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 10) { @@ -249,8 +249,8 @@ public final class Static103 { Static25.y = Static60.clickY; Static122.x = Static7.clickX; Static17.milliseconds = 0; - Static6.outboundBuffer.p1isaac(4); - Static6.outboundBuffer.p2le(local36); + Protocol.outboundBuffer.p1isaac(4); + Protocol.outboundBuffer.p2le(local36); } } if (local23 == 41 && Static39.aClass13_10 == null) { @@ -260,28 +260,28 @@ public final class Static103 { } if (local23 == 49) { Static233.method4003(local31, local19, local15); - Static6.outboundBuffer.p1isaac(84); - Static6.outboundBuffer.p2leadd(Integer.MAX_VALUE & (int) (local31 >>> 32)); - Static6.outboundBuffer.p2leadd(Static142.originZ + local19); - Static6.outboundBuffer.p2le(local15 + Static225.originX); + Protocol.outboundBuffer.p1isaac(84); + Protocol.outboundBuffer.p2leadd(Integer.MAX_VALUE & (int) (local31 >>> 32)); + Protocol.outboundBuffer.p2leadd(Static142.originZ + local19); + Protocol.outboundBuffer.p2le(local15 + Static225.originX); } if (local23 == 23) { - Static6.outboundBuffer.p1isaac(206); - Static6.outboundBuffer.p2add(local36); - Static6.outboundBuffer.p2le(local15); - Static6.outboundBuffer.p4le2(local19); + Protocol.outboundBuffer.p1isaac(206); + Protocol.outboundBuffer.p2add(local36); + Protocol.outboundBuffer.p2le(local15); + Protocol.outboundBuffer.p4le2(local19); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.getComponent(local19); + Static257.aClass13_7 = InterfaceList.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 14 && Static233.method4003(local31, local19, local15)) { - Static6.outboundBuffer.p1isaac(134); - Static6.outboundBuffer.p2add(Static225.originX + local15); - Static6.outboundBuffer.p2(Static274.anInt4997); - Static6.outboundBuffer.p2le(local19 + Static142.originZ); - Static6.outboundBuffer.p2(Static185.anInt4370); - Static6.outboundBuffer.p4me(Static224.anInt5062); - Static6.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE); + Protocol.outboundBuffer.p1isaac(134); + Protocol.outboundBuffer.p2add(Static225.originX + local15); + Protocol.outboundBuffer.p2(Static274.anInt4997); + Protocol.outboundBuffer.p2le(local19 + Static142.originZ); + Protocol.outboundBuffer.p2(Static185.anInt4370); + Protocol.outboundBuffer.p4me(Static224.anInt5062); + Protocol.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE); } if (local23 == 37) { local43 = Static159.players[local36]; @@ -291,20 +291,20 @@ public final class Static103 { Static70.type = 2; Static25.y = Static60.clickY; Static122.x = Static7.clickX; - Static6.outboundBuffer.p1isaac(114); - Static6.outboundBuffer.p2leadd(local36); + Protocol.outboundBuffer.p1isaac(114); + Protocol.outboundBuffer.p2leadd(local36); } } if (local23 == 9 || local23 == 1003) { Static263.method4512(Static233.aClass100Array160[arg0], local15, local36, local19); } if (local23 == 5) { - Static6.outboundBuffer.p1isaac(55); - Static6.outboundBuffer.p2le(local36); - Static6.outboundBuffer.p2add(local15); - Static6.outboundBuffer.p4rme(local19); + Protocol.outboundBuffer.p1isaac(55); + Protocol.outboundBuffer.p2le(local36); + Protocol.outboundBuffer.p2add(local15); + Protocol.outboundBuffer.p4rme(local19); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.getComponent(local19); + Static257.aClass13_7 = InterfaceList.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 21) { @@ -320,10 +320,10 @@ public final class Static103 { Static122.x = Static7.clickX; Static17.milliseconds = 0; Static25.y = Static60.clickY; - Static6.outboundBuffer.p1isaac(228); - Static6.outboundBuffer.p2(local36); - Static6.outboundBuffer.p2le(Static225.originX + local15); - Static6.outboundBuffer.p2leadd(Static142.originZ + local19); + Protocol.outboundBuffer.p1isaac(228); + Protocol.outboundBuffer.p2(local36); + Protocol.outboundBuffer.p2le(Static225.originX + local15); + Protocol.outboundBuffer.p2leadd(Static142.originZ + local19); } if (local23 == 4) { local192 = Static175.npcs[local36]; @@ -333,8 +333,8 @@ public final class Static103 { Static17.milliseconds = 0; Static25.y = Static60.clickY; Static122.x = Static7.clickX; - Static6.outboundBuffer.p1isaac(148); - Static6.outboundBuffer.p2add(local36); + Protocol.outboundBuffer.p1isaac(148); + Protocol.outboundBuffer.p2add(local36); } } if (local23 == 32) { @@ -364,17 +364,17 @@ public final class Static103 { Static17.milliseconds = 0; Static70.type = 2; Static122.x = Static7.clickX; - Static6.outboundBuffer.p1isaac(180); - Static6.outboundBuffer.p2leadd(local36); + Protocol.outboundBuffer.p1isaac(180); + Protocol.outboundBuffer.p2leadd(local36); } } if (local23 == 35) { - Static6.outboundBuffer.p1isaac(161); - Static6.outboundBuffer.p4le2(local19); - Static6.outboundBuffer.p2leadd(local36); - Static6.outboundBuffer.p2leadd(local15); + Protocol.outboundBuffer.p1isaac(161); + Protocol.outboundBuffer.p4le2(local19); + Protocol.outboundBuffer.p2leadd(local36); + Protocol.outboundBuffer.p2leadd(local15); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.getComponent(local19); + Static257.aClass13_7 = InterfaceList.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 15) { @@ -385,10 +385,10 @@ public final class Static103 { Static70.type = 2; Static122.x = Static7.clickX; Static25.y = Static60.clickY; - Static6.outboundBuffer.p1isaac(195); - Static6.outboundBuffer.p2add(Static15.anInt506); - Static6.outboundBuffer.p4le2(Static98.anInt2512); - Static6.outboundBuffer.p2leadd(local36); + Protocol.outboundBuffer.p1isaac(195); + Protocol.outboundBuffer.p2add(Static15.anInt506); + Protocol.outboundBuffer.p4le2(Static98.anInt2512); + Protocol.outboundBuffer.p2leadd(local36); } } if (local23 == 34) { @@ -404,18 +404,18 @@ public final class Static103 { Static70.type = 2; Static25.y = Static60.clickY; Static17.milliseconds = 0; - Static6.outboundBuffer.p1isaac(109); - Static6.outboundBuffer.p2le(local19 + Static142.originZ); - Static6.outboundBuffer.p2(local15 + Static225.originX); - Static6.outboundBuffer.p2leadd(local36); + Protocol.outboundBuffer.p1isaac(109); + Protocol.outboundBuffer.p2le(local19 + Static142.originZ); + Protocol.outboundBuffer.p2(local15 + Static225.originX); + Protocol.outboundBuffer.p2leadd(local36); } if (local23 == 25) { - Static6.outboundBuffer.p1isaac(81); - Static6.outboundBuffer.p2add(local15); - Static6.outboundBuffer.p2(local36); - Static6.outboundBuffer.p4rme(local19); + Protocol.outboundBuffer.p1isaac(81); + Protocol.outboundBuffer.p2add(local15); + Protocol.outboundBuffer.p2(local36); + Protocol.outboundBuffer.p4rme(local19); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.getComponent(local19); + Static257.aClass13_7 = InterfaceList.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 2) { @@ -426,15 +426,15 @@ public final class Static103 { Static70.type = 2; Static122.x = Static7.clickX; Static17.milliseconds = 0; - Static6.outboundBuffer.p1isaac(218); - Static6.outboundBuffer.p2le(local36); + Protocol.outboundBuffer.p1isaac(218); + Protocol.outboundBuffer.p2le(local36); } } @Pc(1955) int local1955; if (local23 == 51) { - Static6.outboundBuffer.p1isaac(10); - Static6.outboundBuffer.p4(local19); - local693 = Static5.getComponent(local19); + Protocol.outboundBuffer.p1isaac(10); + Protocol.outboundBuffer.p4(local19); + local693 = InterfaceList.getComponent(local19); if (local693.anIntArrayArray4 != null && local693.anIntArrayArray4[0][0] == 5) { local1955 = local693.anIntArrayArray4[0][1]; if (Static7.varps[local1955] != local693.anIntArray48[0]) { @@ -451,17 +451,17 @@ public final class Static103 { Static17.milliseconds = 0; Static25.y = Static60.clickY; Static122.x = Static7.clickX; - Static6.outboundBuffer.p1isaac(115); - Static6.outboundBuffer.p4me(Static224.anInt5062); - Static6.outboundBuffer.p2le(Static185.anInt4370); - Static6.outboundBuffer.p2le(local36); - Static6.outboundBuffer.p2leadd(Static274.anInt4997); + Protocol.outboundBuffer.p1isaac(115); + Protocol.outboundBuffer.p4me(Static224.anInt5062); + Protocol.outboundBuffer.p2le(Static185.anInt4370); + Protocol.outboundBuffer.p2le(local36); + Protocol.outboundBuffer.p2leadd(Static274.anInt4997); } } if (local23 == 59) { - Static6.outboundBuffer.p1isaac(10); - Static6.outboundBuffer.p4(local19); - local693 = Static5.getComponent(local19); + Protocol.outboundBuffer.p1isaac(10); + Protocol.outboundBuffer.p4(local19); + local693 = InterfaceList.getComponent(local19); if (local693.anIntArrayArray4 != null && local693.anIntArrayArray4[0][0] == 5) { local1955 = local693.anIntArrayArray4[0][1]; Static7.varps[local1955] = 1 - Static7.varps[local1955]; @@ -477,43 +477,43 @@ public final class Static103 { Static17.milliseconds = 0; Static25.y = Static60.clickY; Static70.type = 2; - Static6.outboundBuffer.p1isaac(101); - Static6.outboundBuffer.p2leadd(local15 + Static225.originX); - Static6.outboundBuffer.p2le(Static185.anInt4370); - Static6.outboundBuffer.p2le(Static274.anInt4997); - Static6.outboundBuffer.p2le(local36); - Static6.outboundBuffer.p2leadd(Static142.originZ + local19); - Static6.outboundBuffer.p4me(Static224.anInt5062); + Protocol.outboundBuffer.p1isaac(101); + Protocol.outboundBuffer.p2leadd(local15 + Static225.originX); + Protocol.outboundBuffer.p2le(Static185.anInt4370); + Protocol.outboundBuffer.p2le(Static274.anInt4997); + Protocol.outboundBuffer.p2le(local36); + Protocol.outboundBuffer.p2leadd(Static142.originZ + local19); + Protocol.outboundBuffer.p4me(Static224.anInt5062); } if (local23 == 1004) { Static17.milliseconds = 0; Static122.x = Static7.clickX; Static70.type = 2; Static25.y = Static60.clickY; - Static6.outboundBuffer.p1isaac(94); - Static6.outboundBuffer.p2leadd(local36); + Protocol.outboundBuffer.p1isaac(94); + Protocol.outboundBuffer.p2leadd(local36); } if (local23 == 11) { if (local36 == 0) { Static125.anInt3096 = 1; Static113.method3556(Static55.level, local15, local19); } else if (local36 == 1) { - Static6.outboundBuffer.p1isaac(131); - Static6.outboundBuffer.p4me(Static98.anInt2512); - Static6.outboundBuffer.p2add(Static225.originX + local15); - Static6.outboundBuffer.p2leadd(Static15.anInt506); - Static6.outboundBuffer.p2add(local19 + Static142.originZ); + Protocol.outboundBuffer.p1isaac(131); + Protocol.outboundBuffer.p4me(Static98.anInt2512); + Protocol.outboundBuffer.p2add(Static225.originX + local15); + Protocol.outboundBuffer.p2leadd(Static15.anInt506); + Protocol.outboundBuffer.p2add(local19 + Static142.originZ); } } if (local23 == 8) { - local693 = Static5.getComponent(local19); + local693 = InterfaceList.getComponent(local19); @Pc(2287) boolean local2287 = true; if (local693.anInt453 > 0) { local2287 = Static249.method4265(local693); } if (local2287) { - Static6.outboundBuffer.p1isaac(10); - Static6.outboundBuffer.p4(local19); + Protocol.outboundBuffer.p1isaac(10); + Protocol.outboundBuffer.p4(local19); } } if (local23 == 1) { @@ -524,20 +524,20 @@ public final class Static103 { Static25.y = Static60.clickY; Static70.type = 2; Static122.x = Static7.clickX; - Static6.outboundBuffer.p1isaac(248); - Static6.outboundBuffer.p2leadd(local36); - Static6.outboundBuffer.p2(Static274.anInt4997); - Static6.outboundBuffer.p2(Static185.anInt4370); - Static6.outboundBuffer.p4me(Static224.anInt5062); + Protocol.outboundBuffer.p1isaac(248); + Protocol.outboundBuffer.p2leadd(local36); + Protocol.outboundBuffer.p2(Static274.anInt4997); + Protocol.outboundBuffer.p2(Static185.anInt4370); + Protocol.outboundBuffer.p4me(Static224.anInt5062); } } if (local23 == 7) { - Static6.outboundBuffer.p1isaac(85); - Static6.outboundBuffer.p4rme(local19); - Static6.outboundBuffer.p2(local15); - Static6.outboundBuffer.p2add(local36); + Protocol.outboundBuffer.p1isaac(85); + Protocol.outboundBuffer.p4rme(local19); + Protocol.outboundBuffer.p2(local15); + Protocol.outboundBuffer.p2add(local36); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.getComponent(local19); + Static257.aClass13_7 = InterfaceList.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 24) { @@ -553,26 +553,26 @@ public final class Static103 { Static25.y = Static60.clickY; Static122.x = Static7.clickX; Static17.milliseconds = 0; - Static6.outboundBuffer.p1isaac(48); - Static6.outboundBuffer.p2add(local15 + Static225.originX); - Static6.outboundBuffer.p2leadd(local36); - Static6.outboundBuffer.p2le(Static142.originZ + local19); + Protocol.outboundBuffer.p1isaac(48); + Protocol.outboundBuffer.p2add(local15 + Static225.originX); + Protocol.outboundBuffer.p2leadd(local36); + Protocol.outboundBuffer.p2le(Static142.originZ + local19); } if (local23 == 38 && Static233.method4003(local31, local19, local15)) { - Static6.outboundBuffer.p1isaac(233); - Static6.outboundBuffer.p2leadd(local19 + Static142.originZ); - Static6.outboundBuffer.p2add(Static225.originX + local15); - Static6.outboundBuffer.p2leadd(Static15.anInt506); - Static6.outboundBuffer.p4rme(Static98.anInt2512); - Static6.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE); + Protocol.outboundBuffer.p1isaac(233); + Protocol.outboundBuffer.p2leadd(local19 + Static142.originZ); + Protocol.outboundBuffer.p2add(Static225.originX + local15); + Protocol.outboundBuffer.p2leadd(Static15.anInt506); + Protocol.outboundBuffer.p4rme(Static98.anInt2512); + Protocol.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE); } if (local23 == 13) { - Static6.outboundBuffer.p1isaac(6); - Static6.outboundBuffer.p4(local19); - Static6.outboundBuffer.p2add(local15); - Static6.outboundBuffer.p2le(local36); + Protocol.outboundBuffer.p1isaac(6); + Protocol.outboundBuffer.p4(local19); + Protocol.outboundBuffer.p2add(local15); + Protocol.outboundBuffer.p2le(local36); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.getComponent(local19); + Static257.aClass13_7 = InterfaceList.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 57) { @@ -583,19 +583,19 @@ public final class Static103 { Static25.y = Static60.clickY; Static122.x = Static7.clickX; Static17.milliseconds = 0; - Static6.outboundBuffer.p1isaac(175); - Static6.outboundBuffer.p2add(local36); + Protocol.outboundBuffer.p1isaac(175); + Protocol.outboundBuffer.p2add(local36); } } if (local23 == 22) { Static53.method1294(); - local693 = Static5.getComponent(local19); + local693 = InterfaceList.getComponent(local19); Static224.anInt5062 = local19; Static185.anInt4370 = local15; Static260.anInt5014 = 1; Static274.anInt4997 = local36; Static43.redraw(local693); - Static34.aClass100_203 = JagString.concatenate(new JagString[] { Static8.aClass100_32, Static71.get(local36).name, Static204.aClass100_896 }); + Static34.aClass100_203 = JagString.concatenate(new JagString[] { Static8.aClass100_32, ObjTypeList.get(local36).name, Static204.aClass100_896 }); if (Static34.aClass100_203 == null) { Static34.aClass100_203 = Static92.aClass100_510; } @@ -603,18 +603,18 @@ public final class Static103 { } if (local23 == 50) { Static233.method4003(local31, local19, local15); - Static6.outboundBuffer.p1isaac(194); - Static6.outboundBuffer.p2leadd(local19 + Static142.originZ); - Static6.outboundBuffer.p2le(Static225.originX + local15); - Static6.outboundBuffer.p2((int) (local31 >>> 32) & Integer.MAX_VALUE); + Protocol.outboundBuffer.p1isaac(194); + Protocol.outboundBuffer.p2leadd(local19 + Static142.originZ); + Protocol.outboundBuffer.p2le(Static225.originX + local15); + Protocol.outboundBuffer.p2((int) (local31 >>> 32) & Integer.MAX_VALUE); } if (local23 == 48) { - Static6.outboundBuffer.p1isaac(154); - Static6.outboundBuffer.p2le(local15); - Static6.outboundBuffer.p4rme(local19); - Static6.outboundBuffer.p2leadd(local36); + Protocol.outboundBuffer.p1isaac(154); + Protocol.outboundBuffer.p2le(local15); + Protocol.outboundBuffer.p4rme(local19); + Protocol.outboundBuffer.p2leadd(local36); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.getComponent(local19); + Static257.aClass13_7 = InterfaceList.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 30) { @@ -625,17 +625,17 @@ public final class Static103 { Static122.x = Static7.clickX; Static25.y = Static60.clickY; Static70.type = 2; - Static6.outboundBuffer.p1isaac(68); - Static6.outboundBuffer.p2leadd(local36); + Protocol.outboundBuffer.p1isaac(68); + Protocol.outboundBuffer.p2leadd(local36); } } if (local23 == 43) { - Static6.outboundBuffer.p1isaac(153); - Static6.outboundBuffer.p4le2(local19); - Static6.outboundBuffer.p2le(local15); - Static6.outboundBuffer.p2le(local36); + Protocol.outboundBuffer.p1isaac(153); + Protocol.outboundBuffer.p4le2(local19); + Protocol.outboundBuffer.p2le(local15); + Protocol.outboundBuffer.p2le(local36); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.getComponent(local19); + Static257.aClass13_7 = InterfaceList.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 39) { @@ -647,30 +647,30 @@ public final class Static103 { Static122.x = Static7.clickX; Static70.type = 2; Static17.milliseconds = 0; - Static6.outboundBuffer.p1isaac(73); - Static6.outboundBuffer.p4rme(Static98.anInt2512); - Static6.outboundBuffer.p2(Static142.originZ + local19); - Static6.outboundBuffer.p2leadd(local36); - Static6.outboundBuffer.p2leadd(local15 + Static225.originX); - Static6.outboundBuffer.p2le(Static15.anInt506); + Protocol.outboundBuffer.p1isaac(73); + Protocol.outboundBuffer.p4rme(Static98.anInt2512); + Protocol.outboundBuffer.p2(Static142.originZ + local19); + Protocol.outboundBuffer.p2leadd(local36); + Protocol.outboundBuffer.p2leadd(local15 + Static225.originX); + Protocol.outboundBuffer.p2le(Static15.anInt506); } if (local23 == 12) { - Static6.outboundBuffer.p1isaac(82); - Static6.outboundBuffer.p2(Static15.anInt506); - Static6.outboundBuffer.p4rme(local19); - Static6.outboundBuffer.p4(Static98.anInt2512); - Static6.outboundBuffer.p2leadd(local15); + Protocol.outboundBuffer.p1isaac(82); + Protocol.outboundBuffer.p2(Static15.anInt506); + Protocol.outboundBuffer.p4rme(local19); + Protocol.outboundBuffer.p4(Static98.anInt2512); + Protocol.outboundBuffer.p2leadd(local15); } if (local23 == 36) { if (local36 == 0) { Static187.anInt4422 = 1; Static113.method3556(Static55.level, local15, local19); - } else if (Static191.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) { + } else if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) { Static61.teleport(local15 + Static225.originX, Static142.originZ - -local19, Static55.level); } else { - Static6.outboundBuffer.p1isaac(179); - Static6.outboundBuffer.p2(local19 + Static142.originZ); - Static6.outboundBuffer.p2(local15 + Static225.originX); + Protocol.outboundBuffer.p1isaac(179); + Protocol.outboundBuffer.p2(local19 + Static142.originZ); + Protocol.outboundBuffer.p2(local15 + Static225.originX); } } if (local23 == 6) { @@ -681,8 +681,8 @@ public final class Static103 { Static17.milliseconds = 0; Static70.type = 2; Static122.x = Static7.clickX; - Static6.outboundBuffer.p1isaac(106); - Static6.outboundBuffer.p2(local36); + Protocol.outboundBuffer.p1isaac(106); + Protocol.outboundBuffer.p2(local36); } } if (local23 == 20) { @@ -698,10 +698,10 @@ public final class Static103 { Static17.milliseconds = 0; Static122.x = Static7.clickX; Static70.type = 2; - Static6.outboundBuffer.p1isaac(33); - Static6.outboundBuffer.p2(local36); - Static6.outboundBuffer.p2(Static225.originX + local15); - Static6.outboundBuffer.p2le(Static142.originZ + local19); + Protocol.outboundBuffer.p1isaac(33); + Protocol.outboundBuffer.p2(local36); + Protocol.outboundBuffer.p2(Static225.originX + local15); + Protocol.outboundBuffer.p2le(Static142.originZ + local19); } if (local23 == 16) { local192 = Static175.npcs[local36]; @@ -711,13 +711,13 @@ public final class Static103 { Static17.milliseconds = 0; Static25.y = Static60.clickY; Static70.type = 2; - Static6.outboundBuffer.p1isaac(3); - Static6.outboundBuffer.p2leadd(local36); + Protocol.outboundBuffer.p1isaac(3); + Protocol.outboundBuffer.p2leadd(local36); } } if (Static260.anInt5014 != 0) { Static260.anInt5014 = 0; - Static43.redraw(Static5.getComponent(Static224.anInt5062)); + Static43.redraw(InterfaceList.getComponent(Static224.anInt5062)); } if (Static241.aBoolean302) { Static53.method1294(); @@ -786,35 +786,4 @@ public final class Static103 { return arg0 & 0xFF; } - @OriginalMember(owner = "client!i", name = "r", descriptor = "(I)V") - public static void method2239() { - Static27.aClass99_4.method3103(); - Static244.models.method3103(); - Static118.objectSpriteCache.method3103(); - } - - @OriginalMember(owner = "client!i", name = "i", descriptor = "(Z)V") - public static void method2245() { - for (@Pc(6) Class3_Sub31 local6 = (Class3_Sub31) Static119.aClass133_9.head(); local6 != null; local6 = (Class3_Sub31) Static119.aClass133_9.next()) { - @Pc(14) int local14 = local6.anInt5878; - if (Static245.load(local14)) { - @Pc(21) boolean local21 = true; - @Pc(25) Component[] local25 = Static241.components[local14]; - @Pc(27) int local27; - for (local27 = 0; local27 < local25.length; local27++) { - if (local25[local27] != null) { - local21 = local25[local27].aBoolean32; - break; - } - } - if (!local21) { - local27 = (int) local6.key; - @Pc(60) Component local60 = Static5.getComponent(local27); - if (local60 != null) { - Static43.redraw(local60); - } - } - } - } - } } diff --git a/client/src/main/java/Static104.java b/client/src/main/java/Static104.java index d4d68b6..5af704f 100644 --- a/client/src/main/java/Static104.java +++ b/client/src/main/java/Static104.java @@ -16,7 +16,7 @@ public final class Static104 { return; } if (arg0.seqId != -1 && arg0.anInt3420 == 0) { - @Pc(40) SeqType local40 = Static36.get(arg0.seqId); + @Pc(40) SeqType local40 = SeqTypeList.get(arg0.seqId); if (arg0.anInt3405 > 0 && local40.anInt5363 == 0) { arg0.anInt3417++; return; @@ -233,8 +233,4 @@ public final class Static104 { return 0; } - @OriginalMember(owner = "client!ia", name = "a", descriptor = "(I)I") - public static int getTotal() { - return 2; - } } diff --git a/client/src/main/java/Static105.java b/client/src/main/java/Static105.java index b404035..1cd4351 100644 --- a/client/src/main/java/Static105.java +++ b/client/src/main/java/Static105.java @@ -20,10 +20,10 @@ public final class Static105 { public static final int[] anIntArray256 = new int[2048]; @OriginalMember(owner = "client!ib", name = "g", descriptor = "Lclient!na;") - public static final JagString aClass100_559 = Static28.parse(""); + public static final JagString aClass100_559 = JagString.parse(""); @OriginalMember(owner = "client!ib", name = "k", descriptor = "Lclient!na;") - public static final JagString aClass100_561 = Static28.parse(" )2> "); + public static final JagString aClass100_561 = JagString.parse(" )2> "); @OriginalMember(owner = "client!ib", name = "l", descriptor = "I") public static int anInt2863 = 0; diff --git a/client/src/main/java/Static106.java b/client/src/main/java/Static106.java index 4deaf82..f46a3b6 100644 --- a/client/src/main/java/Static106.java +++ b/client/src/main/java/Static106.java @@ -5,10 +5,7 @@ public final class Static106 { @OriginalMember(owner = "client!ic", name = "a", descriptor = "Lclient!qf;") public static Sprite compass; - @OriginalMember(owner = "client!ic", name = "n", descriptor = "I") - public static int anInt2871; - - @OriginalMember(owner = "client!ic", name = "e", descriptor = "[I") + @OriginalMember(owner = "client!ic", name = "e", descriptor = "[I") public static final int[] anIntArray257 = new int[2500]; @OriginalMember(owner = "client!ic", name = "j", descriptor = "I") diff --git a/client/src/main/java/Static107.java b/client/src/main/java/Static107.java index c8d0816..6156f2a 100644 --- a/client/src/main/java/Static107.java +++ b/client/src/main/java/Static107.java @@ -13,7 +13,7 @@ public final class Static107 { public static int anInt2875 = -1; @OriginalMember(owner = "client!id", name = "c", descriptor = "Lclient!na;") - public static final JagString aClass100_566 = Static28.parse("::fpson"); + public static final JagString aClass100_566 = JagString.parse("::fpson"); @OriginalMember(owner = "client!id", name = "d", descriptor = "[[[I") public static final int[][][] anIntArrayArrayArray9 = new int[2][][]; @@ -21,19 +21,6 @@ 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 = "j", descriptor = "Lclient!of;") - public static QuickChatCommandDecoder anInterface3_1 = null; - - @OriginalMember(owner = "client!id", name = "b", descriptor = "(I)V") - public static void loop() { - if (client.soundChannel != null) { - client.soundChannel.loop(); - } - if (client.musicChannel != null) { - client.musicChannel.loop(); - } - } - @OriginalMember(owner = "client!id", name = "a", descriptor = "(IIBII)V") public static void method2263(@OriginalArg(3) int arg0, @OriginalArg(4) int arg1) { Static224.anInt5063 = arg1; @@ -42,8 +29,4 @@ public final class Static107 { Static106.anInt2869 = arg0; } - @OriginalMember(owner = "client!id", name = "a", descriptor = "(Lclient!ve;B)V") - public static void init(@OriginalArg(0) Js5 arg0) { - Static85.aClass153_36 = arg0; - } } diff --git a/client/src/main/java/Static109.java b/client/src/main/java/Static109.java index 8f73799..ebc0e9f 100644 --- a/client/src/main/java/Static109.java +++ b/client/src/main/java/Static109.java @@ -1,4 +1,3 @@ -import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @@ -27,28 +26,4 @@ public final class Static109 { } } - @OriginalMember(owner = "client!ig", name = "a", descriptor = "(BI)V") - public static void method2275(@OriginalArg(1) int arg0) { - if (arg0 == -1 || !Static223.aBooleanArray115[arg0]) { - return; - } - Static202.aClass153_84.method4490(arg0); - if (Static241.components[arg0] == null) { - return; - } - @Pc(27) boolean local27 = true; - for (@Pc(29) int local29 = 0; local29 < Static241.components[arg0].length; local29++) { - if (Static241.components[arg0][local29] != null) { - if (Static241.components[arg0][local29].type == 2) { - local27 = false; - } else { - Static241.components[arg0][local29] = null; - } - } - } - if (local27) { - Static241.components[arg0] = null; - } - Static223.aBooleanArray115[arg0] = false; - } } diff --git a/client/src/main/java/Static11.java b/client/src/main/java/Static11.java index de8ff7d..9fe4643 100644 --- a/client/src/main/java/Static11.java +++ b/client/src/main/java/Static11.java @@ -9,7 +9,7 @@ public final class Static11 { @OriginalMember(owner = "client!ba", name = "e", descriptor = "(I)V") public static void method443() { - Static262.headModels.clear(); + NpcTypeList.headModels.clear(); } @OriginalMember(owner = "client!ba", name = "a", descriptor = "(IB)I") @@ -19,7 +19,7 @@ public final class Static11 { } @Pc(17) Inv local17 = (Inv) Static20.objectContainerCache.get((long) arg0); if (local17 == null) { - return Static246.list(arg0).size; + return InvTypeList.list(arg0).size; } @Pc(31) int freeSpaces = 0; for (@Pc(33) int id = 0; id < local17.objectIds.length; id++) { @@ -27,6 +27,6 @@ public final class Static11 { freeSpaces++; } } - return freeSpaces + Static246.list(arg0).size - local17.objectIds.length; + return freeSpaces + InvTypeList.list(arg0).size - local17.objectIds.length; } } diff --git a/client/src/main/java/Static110.java b/client/src/main/java/Static110.java index fbb32cc..700f968 100644 --- a/client/src/main/java/Static110.java +++ b/client/src/main/java/Static110.java @@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static110 { - @OriginalMember(owner = "client!ih", name = "l", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_15 = new SoftLruHashTable(4); - @OriginalMember(owner = "client!ih", name = "a", descriptor = "(III)Lclient!jh;") public static Wall method2276(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { @Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2]; @@ -19,21 +16,6 @@ public final class Static110 { } } - @OriginalMember(owner = "client!ih", name = "a", descriptor = "(II)Lclient!hn;") - public static ParamType method2277(@OriginalArg(1) int arg0) { - @Pc(6) ParamType local6 = (ParamType) Static272.aClass54_14.get((long) arg0); - if (local6 != null) { - return local6; - } - @Pc(30) byte[] local30 = Static39.aClass153_23.getFile(11, arg0); - local6 = new ParamType(); - if (local30 != null) { - local6.decode(new Buffer(local30)); - } - Static272.aClass54_14.put(local6, (long) arg0); - return local6; - } - @OriginalMember(owner = "client!ih", name = "a", descriptor = "(I[Lclient!hg;)V") public static void method2280(@OriginalArg(0) int arg0, @OriginalArg(1) GlTile[] arg1) { Static182.aClass3_Sub14ArrayArray2[arg0] = arg1; @@ -62,7 +44,7 @@ public final class Static110 { local141 = Static112.getSound(local6.npc); if (local141 != local6.sound) { if (local6.primaryStream != null) { - Static204.soundStream.removeSubStream(local6.primaryStream); + client.soundStream.removeSubStream(local6.primaryStream); local6.primaryStream = null; } local6.sound = local141; @@ -89,7 +71,7 @@ public final class Static110 { local141 = Static140.getSound(local6.player); if (local6.sound != local141) { if (local6.primaryStream != null) { - Static204.soundStream.removeSubStream(local6.primaryStream); + client.soundStream.removeSubStream(local6.primaryStream); local6.primaryStream = null; } local6.sound = local141; diff --git a/client/src/main/java/Static111.java b/client/src/main/java/Static111.java index b709264..f03fb93 100644 --- a/client/src/main/java/Static111.java +++ b/client/src/main/java/Static111.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 Static111 { @@ -17,7 +16,7 @@ public final class Static111 { public static int anInt2901 = 0; @OriginalMember(owner = "client!ii", name = "e", descriptor = "Lclient!na;") - public static final JagString aClass100_570 = Static28.parse(")2"); + public static final JagString aClass100_570 = JagString.parse(")2"); @OriginalMember(owner = "client!ii", name = "a", descriptor = "(Lclient!be;III)V") public static void method2291(@OriginalArg(0) Component arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { @@ -62,19 +61,4 @@ public final class Static111 { } } - @OriginalMember(owner = "client!ii", name = "b", descriptor = "(I)V") - public static void loop() { - @Pc(2) Mouse local2 = Static93.instance; - synchronized (Static93.instance) { - Static22.anInt723 = Static57.anInt1759; - Static215.anInt4873 = Static147.anInt3521; - Static223.anInt5032 = Static165.anInt4039; - Static150.clickButton = Static41.anInt1313; - Static7.clickX = Static34.anInt1034; - Static93.anInt2467++; - Static60.clickY = Static222.anInt4973; - Static133.clickTime = Static209.aLong161; - Static41.anInt1313 = 0; - } - } } diff --git a/client/src/main/java/Static112.java b/client/src/main/java/Static112.java index 3ea810f..dc66cd7 100644 --- a/client/src/main/java/Static112.java +++ b/client/src/main/java/Static112.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static112 { @OriginalMember(owner = "client!ij", name = "a", descriptor = "Lclient!na;") - public static final JagString aClass100_574 = Static28.parse(":duelfriend:"); + public static final JagString aClass100_574 = JagString.parse(":duelfriend:"); @OriginalMember(owner = "client!ij", name = "a", descriptor = "(B)V") public static void method2297() { @@ -14,9 +14,9 @@ public final class Static112 { @Pc(11) int local11 = Static13.anInt436; @Pc(13) int local13 = Static24.anInt761; if (Static39.aClass3_Sub2_Sub1_1 == null || Static181.aClass3_Sub2_Sub1_9 == null) { - if (Static209.js5Archive8.isFileReady(Static55.anInt1736) && Static209.js5Archive8.isFileReady(Static169.anInt4073)) { - Static39.aClass3_Sub2_Sub1_1 = Static80.loadSoftwareAlphaSprite(Static209.js5Archive8, Static55.anInt1736); - Static181.aClass3_Sub2_Sub1_9 = Static80.loadSoftwareAlphaSprite(Static209.js5Archive8, Static169.anInt4073); + if (client.js5Archive8.isFileReady(Static55.anInt1736) && client.js5Archive8.isFileReady(Static169.anInt4073)) { + Static39.aClass3_Sub2_Sub1_1 = Static80.loadSoftwareAlphaSprite(client.js5Archive8, Static55.anInt1736); + Static181.aClass3_Sub2_Sub1_9 = Static80.loadSoftwareAlphaSprite(client.js5Archive8, Static169.anInt4073); if (GlRenderer.enabled) { if (Static39.aClass3_Sub2_Sub1_1 instanceof SoftwareAlphaSprite) { Static39.aClass3_Sub2_Sub1_1 = new GlAlphaSprite((SoftwareSprite) Static39.aClass3_Sub2_Sub1_1); @@ -65,10 +65,10 @@ public final class Static112 { } } } - if ((Static165.aClass3_Sub2_Sub1_8 == null || Static92.aClass3_Sub2_Sub1_6 == null || Static204.aClass3_Sub2_Sub1_10 == null) && Static209.js5Archive8.isFileReady(Static85.anInt2261) && Static209.js5Archive8.isFileReady(Static136.anInt3324) && Static209.js5Archive8.isFileReady(Static254.anInt5556)) { - Static165.aClass3_Sub2_Sub1_8 = Static80.loadSoftwareAlphaSprite(Static209.js5Archive8, Static85.anInt2261); - Static92.aClass3_Sub2_Sub1_6 = Static80.loadSoftwareAlphaSprite(Static209.js5Archive8, Static136.anInt3324); - Static204.aClass3_Sub2_Sub1_10 = Static80.loadSoftwareAlphaSprite(Static209.js5Archive8, Static254.anInt5556); + if ((Static165.aClass3_Sub2_Sub1_8 == null || Static92.aClass3_Sub2_Sub1_6 == null || Static204.aClass3_Sub2_Sub1_10 == null) && client.js5Archive8.isFileReady(Static85.anInt2261) && client.js5Archive8.isFileReady(Static136.anInt3324) && client.js5Archive8.isFileReady(Static254.anInt5556)) { + Static165.aClass3_Sub2_Sub1_8 = Static80.loadSoftwareAlphaSprite(client.js5Archive8, Static85.anInt2261); + Static92.aClass3_Sub2_Sub1_6 = Static80.loadSoftwareAlphaSprite(client.js5Archive8, Static136.anInt3324); + Static204.aClass3_Sub2_Sub1_10 = Static80.loadSoftwareAlphaSprite(client.js5Archive8, Static254.anInt5556); if (GlRenderer.enabled) { if (Static165.aClass3_Sub2_Sub1_8 instanceof SoftwareAlphaSprite) { Static165.aClass3_Sub2_Sub1_8 = new GlAlphaSprite((SoftwareSprite) Static165.aClass3_Sub2_Sub1_8); diff --git a/client/src/main/java/Static113.java b/client/src/main/java/Static113.java index d7b9e35..0413e97 100644 --- a/client/src/main/java/Static113.java +++ b/client/src/main/java/Static113.java @@ -25,7 +25,7 @@ public final class Static113 { if (arg1 >= 5 && arg1 <= 8) { arg1 = 4; } - @Pc(30) LocType local30 = Static271.get(arg0); + @Pc(30) LocType local30 = LocTypeList.get(arg0); return local30.isReady(arg1); } } diff --git a/client/src/main/java/Static114.java b/client/src/main/java/Static114.java index d27f319..233f7c5 100644 --- a/client/src/main/java/Static114.java +++ b/client/src/main/java/Static114.java @@ -6,13 +6,13 @@ import org.openrs2.deob.annotation.Pc; public final class Static114 { @OriginalMember(owner = "client!j", name = "z", descriptor = "Lclient!na;") - public static final JagString aClass100_1099 = Static28.parse("::shiftclick"); + public static final JagString aClass100_1099 = JagString.parse("::shiftclick"); @OriginalMember(owner = "client!j", name = "K", descriptor = "I") public static int anInt5843 = 0; @OriginalMember(owner = "client!j", name = "M", descriptor = "Lclient!na;") - public static final JagString aClass100_1100 = Static28.parse("::replacecanvas"); + public static final JagString aClass100_1100 = JagString.parse("::replacecanvas"); @OriginalMember(owner = "client!j", name = "O", descriptor = "[I") public static final int[] anIntArray565 = new int[] { 1, -1, -1, 1 }; diff --git a/client/src/main/java/Static115.java b/client/src/main/java/Static115.java index 91a13de..01eb43c 100644 --- a/client/src/main/java/Static115.java +++ b/client/src/main/java/Static115.java @@ -14,7 +14,7 @@ public final class Static115 { public static int anInt2937 = 0; @OriginalMember(owner = "client!ja", name = "k", descriptor = "Lclient!na;") - public static final JagString aClass100_579 = Static28.parse("Fps:"); + public static final JagString aClass100_579 = JagString.parse("Fps:"); @OriginalMember(owner = "client!ja", name = "l", descriptor = "[Lclient!wa;") public static final Buffer[] aClass3_Sub15Array1 = new Buffer[2048]; @@ -26,7 +26,7 @@ public final class Static115 { public static int anInt2941 = -1; @OriginalMember(owner = "client!ja", name = "s", descriptor = "Lclient!na;") - public static final JagString aClass100_582 = Static28.parse("http:)4)4"); + public static final JagString aClass100_582 = JagString.parse("http:)4)4"); @OriginalMember(owner = "client!ja", name = "a", descriptor = "([II)[I") public static int[] method2308(@OriginalArg(0) int[] arg0) { @@ -65,13 +65,7 @@ public final class Static115 { Static256.method4392(); } - @OriginalMember(owner = "client!ja", name = "a", descriptor = "(Lclient!ve;Lclient!ve;I)V") - public static void init(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1) { - Static87.aClass153_38 = arg1; - Static29.aClass153_19 = arg0; - } - - @OriginalMember(owner = "client!ja", name = "a", descriptor = "(II)V") + @OriginalMember(owner = "client!ja", name = "a", descriptor = "(II)V") public static void method2312(@OriginalArg(0) int arg0) { GameShell.VARIABLE_RENDER_RATE = 1000 / arg0; } @@ -146,7 +140,7 @@ public final class Static115 { Sprites.hitmarks = null; Sprites.crosses = null; Sprites.nameIcons = null; - Static265.p11FullSoftware = null; + Fonts.p11FullSoftware = null; Sprites.mapfunctions = null; Static67.mapfuncs = null; Sprites.mapmarkhints = null; diff --git a/client/src/main/java/Static116.java b/client/src/main/java/Static116.java index eeaa0fe..160b154 100644 --- a/client/src/main/java/Static116.java +++ b/client/src/main/java/Static116.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static116 { @OriginalMember(owner = "client!jb", name = "c", descriptor = "Lclient!na;") - public static final JagString aClass100_583 = Static28.parse("(Y<)4col>"); + public static final JagString aClass100_583 = JagString.parse("(Y<)4col>"); @OriginalMember(owner = "client!jb", name = "m", descriptor = "I") public static int anInt2951 = 0; @@ -16,47 +16,10 @@ public final class Static116 { @OriginalMember(owner = "client!jb", name = "p", descriptor = "I") public static int anInt2954 = -1; - @OriginalMember(owner = "client!jb", name = "y", descriptor = "I") - public static int anInt2961 = 0; - - @OriginalMember(owner = "client!jb", name = "a", descriptor = "(ILclient!ve;I)Lclient!jk;") + @OriginalMember(owner = "client!jb", name = "a", descriptor = "(ILclient!ve;I)Lclient!jk;") public static MidiInstrument method2320(@OriginalArg(1) Js5 arg0, @OriginalArg(2) int arg1) { @Pc(9) byte[] local9 = arg0.method4500(arg1); return local9 == null ? null : new MidiInstrument(local9); } - @OriginalMember(owner = "client!jb", name = "a", descriptor = "(IZ)V") - public static void clear(@OriginalArg(1) boolean arg0) { - WorldMap.aByteArrayArrayArray8 = null; - WorldMap.underlayColors = null; - Static24.component = null; - 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; - } - 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; - 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 ee3647a..fd81baa 100644 --- a/client/src/main/java/Static118.java +++ b/client/src/main/java/Static118.java @@ -10,10 +10,7 @@ public final class Static118 { @OriginalMember(owner = "client!jd", name = "i", descriptor = "Lclient!be;") public static Component aClass13_15; - @OriginalMember(owner = "client!jd", name = "c", descriptor = "Lclient!n;") - public static final SoftLruHashTable objectSpriteCache = new SoftLruHashTable(100); - - @OriginalMember(owner = "client!jd", name = "a", descriptor = "(B)I") + @OriginalMember(owner = "client!jd", name = "a", descriptor = "(B)I") public static int method2352() { Static232.anInt5212 = 0; return Static119.method2385(); @@ -53,7 +50,7 @@ public final class Static118 { local105 = local15.anInt522; } if (local105 != -1) { - @Pc(118) SeqType local118 = Static36.get(local105); + @Pc(118) SeqType local118 = SeqTypeList.get(local105); if (local118 != null) { local15.anInt500 += Static178.anInt4247; while (local15.anInt500 > local118.anIntArray474[local15.anInt510]) { @@ -91,8 +88,4 @@ public final class Static118 { } } - @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 ea51e85..b3f6c98 100644 --- a/client/src/main/java/Static119.java +++ b/client/src/main/java/Static119.java @@ -14,53 +14,12 @@ public final class Static119 { public static HashTable aClass133_9 = new HashTable(8); @OriginalMember(owner = "client!je", name = "U", descriptor = "Lclient!na;") - public static final JagString aClass100_588 = Static28.parse("showingVideoAd"); + public static final JagString aClass100_588 = JagString.parse("showingVideoAd"); @OriginalMember(owner = "client!je", name = "db", descriptor = "Lclient!na;") - public static final JagString aClass100_589 = Static28.parse(" "); + public static final JagString aClass100_589 = JagString.parse(" "); - @OriginalMember(owner = "client!je", name = "fb", descriptor = "I") - public static int transmitTimer = 1; - - @OriginalMember(owner = "client!je", name = "h", descriptor = "(I)V") - public static void method2380() { - Static252.method4301(); - Static224.method3885(); - Static181.method3342(); - Static179.method3323(); - Static233.method4001(); - Static103.method2239(); - Static227.method3903(); - Static71.method1441(); - Static78.method1694(); - Static3.method4657(); - Static45.method1172(); - Static267.method4529(); - Static92.method1882(); - Static26.method741(); - Static192.method3474(); - Static40.method1019(); - Static180.method3329(); - Static251.method4276(); - Static73.aClass99_10.method3103(); - Static139.aClass99_22.method3103(); - } - - @OriginalMember(owner = "client!je", name = "f", descriptor = "(B)V") - public static void method2381() { - if (Static18.loaded) { - Static243.logo = null; - Static18.loaded = false; - Static78.titleBg = null; - } - } - - @OriginalMember(owner = "client!je", name = "a", descriptor = "(ILclient!ve;)V") - public static void init(@OriginalArg(1) Js5 arg0) { - Static9.aClass153_2 = arg0; - } - - @OriginalMember(owner = "client!je", name = "j", descriptor = "(I)I") + @OriginalMember(owner = "client!je", name = "j", descriptor = "(I)I") public static int method2385() { if (WorldMap.labels == null) { return -1; diff --git a/client/src/main/java/Static12.java b/client/src/main/java/Static12.java index eb37e60..f3f92c8 100644 --- a/client/src/main/java/Static12.java +++ b/client/src/main/java/Static12.java @@ -9,14 +9,11 @@ public final class Static12 { @OriginalMember(owner = "client!bb", name = "g", descriptor = "[[[B") public static final byte[][][] tileSettings = new byte[4][104][104]; - @OriginalMember(owner = "client!bb", name = "m", descriptor = "Lclient!na;") - public static final JagString aClass100_73 = Static28.parse("runes"); - @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;") - public static final JagString aClass100_74 = Static28.parse("::"); + public static final JagString aClass100_74 = JagString.parse("::"); @OriginalMember(owner = "client!bb", name = "E", descriptor = "I") public static int anInt400 = 0; diff --git a/client/src/main/java/Static121.java b/client/src/main/java/Static121.java index 458715b..aa56731 100644 --- a/client/src/main/java/Static121.java +++ b/client/src/main/java/Static121.java @@ -13,10 +13,7 @@ public final class Static121 { @OriginalMember(owner = "client!jg", name = "g", descriptor = "I") public static int anInt3041; - @OriginalMember(owner = "client!jg", name = "j", descriptor = "Lclient!ve;") - public static Js5 modelsArchive; - - @OriginalMember(owner = "client!jg", name = "e", descriptor = "Z") + @OriginalMember(owner = "client!jg", name = "e", descriptor = "Z") public static boolean aBoolean154 = false; @OriginalMember(owner = "client!jg", name = "a", descriptor = "(IBIII)V") diff --git a/client/src/main/java/Static122.java b/client/src/main/java/Static122.java index 81467ad..40308fe 100644 --- a/client/src/main/java/Static122.java +++ b/client/src/main/java/Static122.java @@ -7,17 +7,14 @@ public final class Static122 { @OriginalMember(owner = "client!jh", name = "n", descriptor = "Lclient!bd;") public static QuickChatPhrase aClass12_1; - @OriginalMember(owner = "client!jh", name = "p", descriptor = "Lclient!ve;") - public static Js5 js5Archive21; - - @OriginalMember(owner = "client!jh", name = "b", descriptor = "[Lclient!na;") + @OriginalMember(owner = "client!jh", name = "b", descriptor = "[Lclient!na;") public static final JagString[] aClass100Array92 = new JagString[200]; @OriginalMember(owner = "client!jh", name = "f", descriptor = "D") public static double aDouble1 = -1.0D; @OriginalMember(owner = "client!jh", name = "g", descriptor = "Lclient!na;") - public static final JagString aClass100_591 = Static28.parse("(Udns"); + public static final JagString aClass100_591 = JagString.parse("(Udns"); @OriginalMember(owner = "client!jh", name = "j", descriptor = "I") public static int x = 0; diff --git a/client/src/main/java/Static123.java b/client/src/main/java/Static123.java index 3aeb5fe..0d95d0b 100644 --- a/client/src/main/java/Static123.java +++ b/client/src/main/java/Static123.java @@ -8,36 +8,21 @@ public final class Static123 { public static int anInt3058 = 0; @OriginalMember(owner = "client!jj", name = "g", descriptor = "Lclient!na;") - public static final JagString aClass100_593 = Static28.parse(" (X"); + public static final JagString aClass100_593 = JagString.parse(" (X"); @OriginalMember(owner = "client!jj", name = "j", descriptor = "Z") public static boolean aBoolean155 = false; @OriginalMember(owner = "client!jj", name = "m", descriptor = "Lclient!na;") - public static final JagString aClass100_594 = Static28.parse("<)4col>"); + public static final JagString aClass100_594 = JagString.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) { - @Pc(10) StructType local10 = (StructType) Static231.aClass54_13.get((long) arg0); - if (local10 != null) { - return local10; - } - @Pc(26) byte[] local26 = Static23.aClass153_11.getFile(26, arg0); - local10 = new StructType(); - if (local26 != null) { - local10.decode(new Buffer(local26)); - } - Static231.aClass54_13.put(local10, (long) arg0); - return local10; - } - @OriginalMember(owner = "client!jj", name = "a", descriptor = "(Z)V") public static void topBannerRefresh() { if (!client.advertSuppressed && client.modeWhere != 2) { try { - Static206.aClass100_900.method3157(client.instance); + Static206.aClass100_900.browserControlCall(client.instance); } catch (@Pc(26) Throwable local26) { } } diff --git a/client/src/main/java/Static124.java b/client/src/main/java/Static124.java index 5f3d792..84e4e98 100644 --- a/client/src/main/java/Static124.java +++ b/client/src/main/java/Static124.java @@ -10,23 +10,12 @@ public final class Static124 { @OriginalMember(owner = "client!jk", name = "y", descriptor = "Z") public static boolean aBoolean156 = false; - @OriginalMember(owner = "client!jk", name = "z", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_17 = new SoftLruHashTable(50); - @OriginalMember(owner = "client!jk", name = "F", descriptor = "Lclient!na;") - public static final JagString aClass100_596 = Static28.parse("::tween"); + public static final JagString aClass100_596 = JagString.parse("::tween"); - @OriginalMember(owner = "client!jk", name = "G", descriptor = "Z") - public static boolean aBoolean157 = false; - - @OriginalMember(owner = "client!jk", name = "e", descriptor = "(B)V") - public static void method2433() { - Static262.aClass99_34.clear(); - } - - @OriginalMember(owner = "client!jk", name = "a", descriptor = "(ILclient!na;)Lclient!bn;") + @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()) { + for (@Pc(15) Map local15 = (Map) MapList.aClass69_120.method2289(); local15 != null; local15 = (Map) MapList.aClass69_120.method2288()) { if (local15.group.strEquals(arg0)) { return local15; } diff --git a/client/src/main/java/Static125.java b/client/src/main/java/Static125.java index 7fcf362..c5f5f3d 100644 --- a/client/src/main/java/Static125.java +++ b/client/src/main/java/Static125.java @@ -7,60 +7,32 @@ public final class Static125 { @OriginalMember(owner = "client!jl", name = "v", descriptor = "I") public static int anInt3096 = 0; - @OriginalMember(owner = "client!jl", name = "x", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_18 = new SoftLruHashTable(50); - - @OriginalMember(owner = "client!jl", name = "G", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_19 = new SoftLruHashTable(64); - @OriginalMember(owner = "client!jl", name = "H", descriptor = "I") public static int worldId = -1; - @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; - Static53.anInt1716 = Static216.aClass153_31.method4504(3); - } - - @OriginalMember(owner = "client!jl", name = "a", descriptor = "(IIIII)V") + @OriginalMember(owner = "client!jl", name = "a", descriptor = "(IIIII)V") public static void method2448(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { - Static6.outboundBuffer.offset = 0; - Static6.outboundBuffer.p1(147); - Static6.outboundBuffer.p1(arg2); - Static6.outboundBuffer.p1(arg3); - Static6.outboundBuffer.p2(arg0); - Static6.outboundBuffer.p2(arg1); - Static226.anInt5079 = 0; - Static57.anInt1758 = 0; - Static179.accountCreationStep = 1; - Static223.anInt5034 = -3; - } - - @OriginalMember(owner = "client!jl", name = "a", descriptor = "(IB)Lclient!kk;") - public static VarbitType method2449(@OriginalArg(0) int arg0) { - @Pc(10) VarbitType local10 = (VarbitType) aClass99_19.get((long) arg0); - if (local10 != null) { - return local10; - } - @Pc(31) byte[] local31 = Static172.aClass153_69.getFile(Static254.method4349(arg0), Static274.method3845(arg0)); - local10 = new VarbitType(); - if (local31 != null) { - local10.decode(new Buffer(local31)); - } - aClass99_19.put(local10, (long) arg0); - return local10; + Protocol.outboundBuffer.offset = 0; + Protocol.outboundBuffer.p1(147); + Protocol.outboundBuffer.p1(arg2); + Protocol.outboundBuffer.p1(arg3); + Protocol.outboundBuffer.p2(arg0); + Protocol.outboundBuffer.p2(arg1); + CreateManager.loops = 0; + CreateManager.errors = 0; + CreateManager.step = 1; + CreateManager.reply = -3; } @OriginalMember(owner = "client!jl", name = "c", descriptor = "(I)V") public static void updateLockedCamera() { @Pc(9) int local9 = Static248.anInt4232 * 128 + 64; @Pc(15) int local15 = Static245.anInt5375 * 128 + 64; - @Pc(23) int local23 = Static207.method3685(Static55.level, local15, local9) - Static231.anInt5203; + @Pc(23) int local23 = SceneGraph.getTileHeight(Static55.level, local15, local9) - Static231.anInt5203; if (Static113.anInt4612 >= 100) { Static138.renderX = Static245.anInt5375 * 128 + 64; Static134.renderZ = Static248.anInt4232 * 128 + 64; - Static5.anInt40 = Static207.method3685(Static55.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203; + Static5.anInt40 = SceneGraph.getTileHeight(Static55.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203; } else { if (Static138.renderX < local15) { Static138.renderX += Static233.anInt5225 + Static113.anInt4612 * (local15 - Static138.renderX) / 1000; @@ -101,7 +73,7 @@ public final class Static125 { } local9 = Static265.anInt5765 * 128 + 64; local15 = Static251.anInt5449 * 128 + 64; - local23 = Static207.method3685(Static55.level, local15, local9) - Static57.anInt1744; + local23 = SceneGraph.getTileHeight(Static55.level, local15, local9) - Static57.anInt1744; @Pc(236) int local236 = local23 - Static5.anInt40; @Pc(241) int local241 = local9 - Static134.renderZ; @Pc(246) int local246 = local15 - Static138.renderX; diff --git a/client/src/main/java/Static126.java b/client/src/main/java/Static126.java index f6b09e1..6a57e74 100644 --- a/client/src/main/java/Static126.java +++ b/client/src/main/java/Static126.java @@ -9,12 +9,6 @@ public final class Static126 { @OriginalMember(owner = "client!jm", name = "s", descriptor = "F") public static float aFloat13; - @OriginalMember(owner = "client!jm", name = "A", descriptor = "Lclient!na;") - private static final JagString aClass100_603 = Static28.parse(""); - - @OriginalMember(owner = "client!jm", name = "z", descriptor = "Lclient!na;") - public static JagString mainLoadSecondaryText = aClass100_603; - @OriginalMember(owner = "client!jm", name = "a", descriptor = "(Z)V") public static void method2460() { if (InterfaceList.topLevelInterface != -1) { diff --git a/client/src/main/java/Static127.java b/client/src/main/java/Static127.java index b27d335..0f17874 100644 --- a/client/src/main/java/Static127.java +++ b/client/src/main/java/Static127.java @@ -17,9 +17,6 @@ public final class Static127 { @OriginalMember(owner = "client!k", name = "m", descriptor = "Z") public static boolean neverRemoveRoofs = false; - @OriginalMember(owner = "client!k", name = "t", descriptor = "I") - public static int anInt3132 = 0; - @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 SpriteLoader.decode(arg1, 0, arg0) ? Static29.method799(arg2.getFile(arg0, 0)) : null; @@ -27,26 +24,26 @@ public final class Static127 { @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 || SceneGraph.allLevelsAreVisible())) { + if (Static80.centralZoneX == arg2 && arg1 == Static52.anInt1695 && (Static41.anInt1316 == arg0 || SceneGraph.allLevelsAreVisible())) { return; } - Static80.anInt4701 = arg2; + Static80.centralZoneX = arg2; Static52.anInt1695 = arg1; Static41.anInt1316 = arg0; if (SceneGraph.allLevelsAreVisible()) { Static41.anInt1316 = 0; } if (arg4) { - Static196.setGameState(28); + client.setGameState(28); } else { - Static196.setGameState(25); + client.setGameState(25); } Static114.drawTextOnScreen(true, LocalizedText.LOADING); @Pc(53) int local53 = Static142.originZ; @Pc(55) int local55 = Static225.originX; Static142.originZ = arg1 * 8 - 48; Static225.originX = (arg2 - 6) * 8; - Static158.aClass3_Sub2_Sub4_3 = Static29.method803(Static80.anInt4701 * 8, Static52.anInt1695 * 8); + Static158.aClass3_Sub2_Sub4_3 = Static29.method803(Static80.centralZoneX * 8, Static52.anInt1695 * 8); @Pc(81) int local81 = Static142.originZ - local53; @Pc(86) int local86 = Static225.originX - local55; Static235.mapElementList = null; @@ -144,7 +141,7 @@ public final class Static127 { } else { Static227.cameraType = 1; } - Static189.anInt4451 = 0; + SoundPlayer.anInt4451 = 0; if (Static115.anInt2939 != 0) { Static84.anInt2255 -= local81; Static115.anInt2939 -= local86; @@ -236,12 +233,12 @@ public final class Static127 { @OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!na;Z)V") public static void method2470(@OriginalArg(0) JagString arg0) { - if (Static191.staffModLevel >= 2) { + if (LoginManager.staffModLevel >= 2) { @Pc(18) int local18; @Pc(38) int local38; @Pc(29) Runtime local29; if (arg0.equalsIgnoreCase(Static81.aClass100_476)) { - Static119.method2380(); + client.method2380(); for (local18 = 0; local18 < 10; local18++) { System.gc(); } @@ -251,7 +248,7 @@ public final class Static127 { } @Pc(117) int local117; if (arg0.equalsIgnoreCase(Static154.aClass100_735)) { - Static119.method2380(); + client.method2380(); for (local18 = 0; local18 < 10; local18++) { System.gc(); } @@ -259,20 +256,20 @@ public final class Static127 { local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L); Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Static203.aClass100_893, Static123.parseInt(local38), Static17.aClass100_101 })); Static16.method501(); - Static119.method2380(); + client.method2380(); for (local117 = 0; local117 < 10; local117++) { System.gc(); } local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L); - Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Static270.aClass100_1093, Static123.parseInt(local38), Static17.aClass100_101 })); + Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Cheat.aClass100_1093, Static123.parseInt(local38), Static17.aClass100_101 })); } if (arg0.equalsIgnoreCase(Static240.aClass100_1009)) { 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); + System.out.println("oncard_geometry:" + GlCleaner.anInt1945); + System.out.println("oncard_2d:" + GlCleaner.onCard2d); + System.out.println("oncard_texture:" + GlCleaner.onCardTexture); } if (arg0.equalsIgnoreCase(Cheat.CLIENTDROP)) { Static175.method3279(); @@ -283,7 +280,7 @@ public final class Static127 { if (arg0.equalsIgnoreCase(Cheat.JS5DROP)) { client.js5NetQueue.method2319(); } - if (arg0.equalsIgnoreCase(Static165.aClass100_775)) { + if (arg0.equalsIgnoreCase(Cheat.aClass100_775)) { GameShell.signLink.breakConnection(); Protocol.socket.breakConnection(); client.js5NetQueue.method2323(); @@ -292,7 +289,7 @@ public final class Static127 { GameShell.replaceCanvas = true; } if (arg0.equalsIgnoreCase(Static148.aClass100_677)) { - Static196.setGameState(25); + client.setGameState(25); } if (arg0.equalsIgnoreCase(Static107.aClass100_566)) { Cheat.displayFps = true; @@ -316,23 +313,23 @@ public final class Static127 { for (local18 = 0; local18 < 4; local18++) { for (local38 = 1; local38 < 103; local38++) { for (local117 = 1; local117 < 103; local117++) { - Static148.collisionMaps[local18].anIntArrayArray30[local38][local117] = 0; + PathFinder.collisionMaps[local18].anIntArrayArray30[local38][local117] = 0; } } } } - if (arg0.startsWith(Static241.aClass100_1088)) { + if (arg0.startsWith(Cheat.aClass100_1088)) { Preferences.setParticles(arg0.substring(15).parseInt()); Preferences.write(GameShell.signLink); - Static18.serverUpdatedPreferences = false; + Preferences.sentToServer = false; } - if (arg0.startsWith(Static170.aClass100_623) && client.modeWhere != 0) { + if (arg0.startsWith(Cheat.aClass100_623) && client.modeWhere != 0) { Static115.method2312(arg0.substring(6).parseInt()); } - if (arg0.equalsIgnoreCase(Static272.aClass100_990)) { + if (arg0.equalsIgnoreCase(Cheat.aClass100_990)) { throw new RuntimeException(); } - if (arg0.startsWith(Static211.aClass100_232)) { + if (arg0.startsWith(Cheat.aClass100_232)) { Static199.rectDebug = arg0.substring(12).method3144().parseInt(); Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Static276.aClass100_1096, Static123.parseInt(Static199.rectDebug) })); } @@ -342,7 +339,7 @@ public final class Static127 { if (arg0.equalsIgnoreCase(Static124.aClass100_596)) { if (Static204.applyTweening) { Static204.applyTweening = false; - Static103.method2231(null, 0, Static274.aClass100_943); + Static103.method2231(null, 0, Cheat.aClass100_943); } else { Static204.applyTweening = true; Static103.method2231(null, 0, Static50.aClass100_362); @@ -358,8 +355,8 @@ public final class Static127 { } } } - Static6.outboundBuffer.p1isaac(44); - Static6.outboundBuffer.p1(arg0.length() - 1); - Static6.outboundBuffer.pjstr(arg0.substring(2)); + Protocol.outboundBuffer.p1isaac(44); + Protocol.outboundBuffer.p1(arg0.length() - 1); + Protocol.outboundBuffer.pjstr(arg0.substring(2)); } } diff --git a/client/src/main/java/Static130.java b/client/src/main/java/Static130.java index edc3bff..e749b8d 100644 --- a/client/src/main/java/Static130.java +++ b/client/src/main/java/Static130.java @@ -9,10 +9,7 @@ public final class Static130 { @OriginalMember(owner = "client!kc", name = "p", descriptor = "[I") public static int[] anIntArray299; - @OriginalMember(owner = "client!kc", name = "w", descriptor = "Lclient!ve;") - public static Js5 js5Archive6; - - @OriginalMember(owner = "client!kc", name = "s", descriptor = "[I") + @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;") diff --git a/client/src/main/java/Static132.java b/client/src/main/java/Static132.java index fb97544..9a91f77 100644 --- a/client/src/main/java/Static132.java +++ b/client/src/main/java/Static132.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static132 { - @OriginalMember(owner = "client!ke", name = "R", descriptor = "Lclient!ve;") - public static Js5 aClass153_48; - - @OriginalMember(owner = "client!ke", name = "T", descriptor = "[[I") + @OriginalMember(owner = "client!ke", name = "T", descriptor = "[[I") public static final int[][] anIntArrayArray24 = new int[][] { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, { 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1 }, { 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 }, { 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1 }, { 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, { 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1 }, { 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0 }, { 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1 }, { 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1 } }; @OriginalMember(owner = "client!ke", name = "U", descriptor = "I") @@ -22,10 +19,10 @@ public final class Static132 { @Pc(16) int local16 = arg1.anInt5878; arg1.unlink(); if (arg0) { - Static109.method2275(local16); + InterfaceList.method2275(local16); } Static273.method3214(local16); - @Pc(32) Component local32 = Static5.getComponent(local9); + @Pc(32) Component local32 = InterfaceList.getComponent(local9); if (local32 != null) { Static43.redraw(local32); } diff --git a/client/src/main/java/Static133.java b/client/src/main/java/Static133.java index 62e2033..d6168e9 100644 --- a/client/src/main/java/Static133.java +++ b/client/src/main/java/Static133.java @@ -34,14 +34,9 @@ public final class Static133 { return null; } - @OriginalMember(owner = "client!kf", name = "a", descriptor = "(II)I") - public static int method4010(@OriginalArg(0) int arg0) { - return arg0 & 0xFF; - } - - @OriginalMember(owner = "client!kf", name = "a", descriptor = "(Lclient!na;I)V") + @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()) { + for (@Pc(15) Map local15 = (Map) MapList.aClass69_120.method2289(); local15 != null; local15 = (Map) MapList.aClass69_120.method2288()) { if (local15.group.strEquals(arg0)) { WorldMap.currentMap = local15; return; diff --git a/client/src/main/java/Static134.java b/client/src/main/java/Static134.java index b403651..76ee9b8 100644 --- a/client/src/main/java/Static134.java +++ b/client/src/main/java/Static134.java @@ -17,11 +17,6 @@ public final class Static134 { return local25; } - @OriginalMember(owner = "client!kh", name = "a", descriptor = "(II)V") - public static void method2621() { - Static45.aClass99_6.method3102(5); - } - @OriginalMember(owner = "client!kh", name = "a", descriptor = "(IIIBII)V") public static void method2622(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { @Pc(8) int local8 = arg2 + 1; @@ -36,7 +31,7 @@ public final class Static134 { @OriginalMember(owner = "client!kh", name = "b", descriptor = "(I)V") public static void method2623() { - Static6.outboundBuffer.p1isaac(104); - Static6.outboundBuffer.p8(0L); + Protocol.outboundBuffer.p1isaac(104); + Protocol.outboundBuffer.p8(0L); } } diff --git a/client/src/main/java/Static136.java b/client/src/main/java/Static136.java index f4a0ad7..27beea9 100644 --- a/client/src/main/java/Static136.java +++ b/client/src/main/java/Static136.java @@ -14,7 +14,7 @@ public final class Static136 { public static int anInt3325 = 0; @OriginalMember(owner = "client!kk", name = "m", descriptor = "Lclient!na;") - public static final JagString CS_ERROR = Static28.parse("Clientscript error )2 check log for details"); + public static final JagString CS_ERROR = JagString.parse("Clientscript error )2 check log for details"); @OriginalMember(owner = "client!kk", name = "a", descriptor = "(IIB)V") public static void method2649(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { diff --git a/client/src/main/java/Static137.java b/client/src/main/java/Static137.java index 2e9d70e..f3b2554 100644 --- a/client/src/main/java/Static137.java +++ b/client/src/main/java/Static137.java @@ -4,14 +4,11 @@ import org.openrs2.deob.annotation.Pc; public final class Static137 { - @OriginalMember(owner = "client!kl", name = "r", descriptor = "Lclient!ve;") - public static Js5 js5Archive14; - @OriginalMember(owner = "client!kl", name = "s", descriptor = "I") public static int anInt3337 = 0; @OriginalMember(owner = "client!kl", name = "u", descriptor = "Lclient!na;") - public static final JagString aClass100_637 = Static28.parse(""); + public static final JagString aClass100_637 = JagString.parse(""); @OriginalMember(owner = "client!kl", name = "a", descriptor = "(Lclient!wa;B)Lclient!kc;") public static TextureOp29SubOp2 method2664(@OriginalArg(0) Buffer arg0) { @@ -52,13 +49,13 @@ public final class Static137 { for (local76 = 0; local76 < 104; local76++) { @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(184) LocType local184 = LocTypeList.get((int) (local169 >>> 32) & Integer.MAX_VALUE); @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]); + @Pc(216) LocType local216 = LocTypeList.get(local184.multiLocs[local194]); if (local216.mapElement >= 0) { local187 = local216.mapElement; break; @@ -70,7 +67,7 @@ public final class Static137 { @Pc(237) int local237 = local76; local194 = local37; if (local187 != 22 && local187 != 29 && local187 != 34 && local187 != 36 && local187 != 46 && local187 != 47 && local187 != 48) { - @Pc(269) int[][] local269 = Static148.collisionMaps[Static55.level].anIntArrayArray30; + @Pc(269) int[][] local269 = PathFinder.collisionMaps[Static55.level].anIntArrayArray30; for (@Pc(271) int local271 = 0; local271 < 10; local271++) { @Pc(281) int local281 = (int) (Math.random() * 4.0D); if (local281 == 0 && local194 > 0 && local37 - 3 < local194 && (local269[local194 - 1][local237] & 0x12C0108) == 0) { @@ -87,7 +84,7 @@ public final class Static137 { } } } - Static199.anIntArray417[Static251.anInt5454] = local184.anInt4426; + Static199.anIntArray417[Static251.anInt5454] = local184.id; Static145.anIntArray331[Static251.anInt5454] = local194; Static93.anIntArray219[Static251.anInt5454] = local237; Static251.anInt5454++; @@ -140,9 +137,4 @@ public final class Static137 { return true; } - @OriginalMember(owner = "client!kl", name = "c", descriptor = "(II)V") - public static void method2666() { - Static279.aClass99_38.method3102(5); - Static56.models.method3102(5); - } } diff --git a/client/src/main/java/Static138.java b/client/src/main/java/Static138.java index 5ba2680..7f6a8c4 100644 --- a/client/src/main/java/Static138.java +++ b/client/src/main/java/Static138.java @@ -4,56 +4,47 @@ import org.openrs2.deob.annotation.Pc; public final class Static138 { - @OriginalMember(owner = "client!km", name = "Nc", descriptor = "Lclient!ve;") - public static Js5 js5Archive17; - - @OriginalMember(owner = "client!km", name = "Oc", descriptor = "Lclient!ve;") - public static Js5 js5Archive15; - @OriginalMember(owner = "client!km", name = "Pc", descriptor = "I") public static int renderX; - @OriginalMember(owner = "client!km", name = "Yc", descriptor = "I") - public static int anInt3443; - - @OriginalMember(owner = "client!km", name = "pc", descriptor = "Z") + @OriginalMember(owner = "client!km", name = "pc", descriptor = "Z") public static boolean aBoolean172 = false; @OriginalMember(owner = "client!km", name = "tc", descriptor = "Lclient!na;") - private static final JagString aClass100_641 = Static28.parse("Dec"); + private static final JagString aClass100_641 = JagString.parse("Dec"); @OriginalMember(owner = "client!km", name = "vc", descriptor = "Lclient!na;") - private static final JagString aClass100_642 = Static28.parse("Jul"); + private static final JagString aClass100_642 = JagString.parse("Jul"); @OriginalMember(owner = "client!km", name = "xc", descriptor = "Lclient!na;") - private static final JagString aClass100_644 = Static28.parse("May"); + private static final JagString aClass100_644 = JagString.parse("May"); @OriginalMember(owner = "client!km", name = "yc", descriptor = "Lclient!na;") - private static final JagString aClass100_645 = Static28.parse("Nov"); + private static final JagString aClass100_645 = JagString.parse("Nov"); @OriginalMember(owner = "client!km", name = "zc", descriptor = "Lclient!na;") - private static final JagString aClass100_646 = Static28.parse("Mar"); + private static final JagString aClass100_646 = JagString.parse("Mar"); @OriginalMember(owner = "client!km", name = "Gc", descriptor = "Lclient!na;") - private static final JagString aClass100_649 = Static28.parse("Jan"); + private static final JagString aClass100_649 = JagString.parse("Jan"); @OriginalMember(owner = "client!km", name = "Hc", descriptor = "Lclient!na;") - private static final JagString aClass100_650 = Static28.parse("Feb"); + private static final JagString aClass100_650 = JagString.parse("Feb"); @OriginalMember(owner = "client!km", name = "Tc", descriptor = "Lclient!na;") - private static final JagString aClass100_655 = Static28.parse("Apr"); + private static final JagString aClass100_655 = JagString.parse("Apr"); @OriginalMember(owner = "client!km", name = "Wc", descriptor = "Lclient!na;") - private static final JagString aClass100_656 = Static28.parse("Jun"); + private static final JagString aClass100_656 = JagString.parse("Jun"); @OriginalMember(owner = "client!km", name = "Qc", descriptor = "Lclient!na;") - private static final JagString aClass100_653 = Static28.parse("Aug"); + private static final JagString aClass100_653 = JagString.parse("Aug"); @OriginalMember(owner = "client!km", name = "cd", descriptor = "Lclient!na;") - private static final JagString aClass100_657 = Static28.parse("Sep"); + private static final JagString aClass100_657 = JagString.parse("Sep"); @OriginalMember(owner = "client!km", name = "dd", descriptor = "Lclient!na;") - private static final JagString aClass100_658 = Static28.parse("Oct"); + private static final JagString aClass100_658 = JagString.parse("Oct"); @OriginalMember(owner = "client!km", name = "Ac", descriptor = "[Lclient!na;") public static final JagString[] aClass100Array102 = new JagString[] { aClass100_649, aClass100_650, aClass100_646, aClass100_655, aClass100_644, aClass100_656, aClass100_642, aClass100_653, aClass100_657, aClass100_658, aClass100_645, aClass100_641 }; @@ -62,13 +53,13 @@ public final class Static138 { public static final int[] updatedVarcs = new int[32]; @OriginalMember(owner = "client!km", name = "Mc", descriptor = "Lclient!na;") - public static final JagString LOGINSCREEN = Static28.parse("loginscreen"); + public static final JagString LOGINSCREEN = JagString.parse("loginscreen"); @OriginalMember(owner = "client!km", name = "Rc", descriptor = "[I") public static final int[] anIntArray324 = new int[] { 19, 55, 38, 155, 255, 110, 137, 205, 76 }; @OriginalMember(owner = "client!km", name = "Sc", descriptor = "Lclient!na;") - public static final JagString aClass100_654 = Static28.parse(":trade:"); + public static final JagString aClass100_654 = JagString.parse(":trade:"); @OriginalMember(owner = "client!km", name = "ad", descriptor = "I") public static int fp = 0; diff --git a/client/src/main/java/Static139.java b/client/src/main/java/Static139.java index 1629e1a..60d96c3 100644 --- a/client/src/main/java/Static139.java +++ b/client/src/main/java/Static139.java @@ -11,14 +11,8 @@ public final class Static139 { @OriginalMember(owner = "client!l", name = "l", descriptor = "[I") public static int[] anIntArray325; - @OriginalMember(owner = "client!l", name = "b", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_21 = new SoftLruHashTable(5); - @OriginalMember(owner = "client!l", name = "d", descriptor = "Lclient!na;") - public static final JagString aClass100_659 = Static28.parse(")4j"); - - @OriginalMember(owner = "client!l", name = "f", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_22 = new SoftLruHashTable(4); + public static final JagString aClass100_659 = JagString.parse(")4j"); @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) { diff --git a/client/src/main/java/Static14.java b/client/src/main/java/Static14.java index a37d146..d43b575 100644 --- a/client/src/main/java/Static14.java +++ b/client/src/main/java/Static14.java @@ -4,11 +4,8 @@ import org.openrs2.deob.annotation.Pc; public final class Static14 { - @OriginalMember(owner = "client!bd", name = "g", descriptor = "Lclient!ve;") - public static Js5 modelsArchive; - - @OriginalMember(owner = "client!bd", name = "b", descriptor = "Lclient!na;") - public static final JagString aClass100_80 = Static28.parse("(U(Y"); + @OriginalMember(owner = "client!bd", name = "b", descriptor = "Lclient!na;") + public static final JagString aClass100_80 = JagString.parse("(U(Y"); @OriginalMember(owner = "client!bd", name = "i", descriptor = "I") public static int anInt441 = 0; diff --git a/client/src/main/java/Static140.java b/client/src/main/java/Static140.java index a2aa087..e5dc3ef 100644 --- a/client/src/main/java/Static140.java +++ b/client/src/main/java/Static140.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; @@ -8,28 +7,6 @@ public final class Static140 { @OriginalMember(owner = "client!la", name = "i", descriptor = "[[[I") public static int[][][] anIntArrayArrayArray12; - @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 (client.uid != null) { - try { - client.uid.seek(0L); - client.uid.read(local15); - @Pc(28) int local28; - for (local28 = 0; local28 < 24 && local15[local28] == 0; local28++) { - } - if (local28 >= 24) { - throw new IOException(); - } - } catch (@Pc(55) Exception local55) { - for (@Pc(57) int local57 = 0; local57 < 24; local57++) { - local15[local57] = -1; - } - } - } - arg0.pBytes(local15, 24); - } - @OriginalMember(owner = "client!la", name = "a", descriptor = "(ILclient!e;)I") public static int getSound(@OriginalArg(1) Player arg0) { @Pc(14) int local14 = arg0.anInt1654; @@ -53,7 +30,7 @@ public final class Static140 { Static103.method2231(JagString.EMPTY, 0, LocalizedText.IGNORELISTFULL); return; } - @Pc(34) JagString local34 = Static79.decode37(arg0).method3125(); + @Pc(34) JagString local34 = Base37.decodeLowerCase(arg0).method3125(); @Pc(36) int local36; for (local36 = 0; local36 < Static35.anInt1093; local36++) { if (Static190.aLongArray6[local36] == arg0) { @@ -72,25 +49,10 @@ public final class Static140 { return; } Static190.aLongArray6[Static35.anInt1093] = arg0; - Static193.aClass100Array134[Static35.anInt1093++] = Static79.decode37(arg0); - Static185.anInt4369 = Static119.transmitTimer; - Static6.outboundBuffer.p1isaac(34); - Static6.outboundBuffer.p8(arg0); - } - - @OriginalMember(owner = "client!la", name = "a", descriptor = "(II)Lclient!ic;") - public static LightType method2709(@OriginalArg(1) int arg0) { - @Pc(10) LightType local10 = (LightType) Static220.aClass99_28.get((long) arg0); - if (local10 != null) { - return local10; - } - @Pc(26) byte[] local26 = Static85.aClass153_36.getFile(31, arg0); - local10 = new LightType(); - if (local26 != null) { - local10.method2257(new Buffer(local26), arg0); - } - Static220.aClass99_28.put(local10, (long) arg0); - return local10; + Static193.aClass100Array134[Static35.anInt1093++] = Base37.decodeLowerCase(arg0); + Static185.anInt4369 = InterfaceList.transmitTimer; + Protocol.outboundBuffer.p1isaac(34); + Protocol.outboundBuffer.p8(arg0); } } diff --git a/client/src/main/java/Static141.java b/client/src/main/java/Static141.java index e08b38d..1cdf2ee 100644 --- a/client/src/main/java/Static141.java +++ b/client/src/main/java/Static141.java @@ -11,16 +11,13 @@ public final class Static141 { public static final int[] anIntArray326 = new int[25]; @OriginalMember(owner = "client!lb", name = "s", descriptor = "Lclient!na;") - public static final JagString aClass100_664 = Static28.parse(":clan:"); + public static final JagString aClass100_664 = JagString.parse(":clan:"); - @OriginalMember(owner = "client!lb", name = "u", descriptor = "I") - public static int anInt3469 = 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); - Static153.aClass100_724 = null; + if (WorldMap.aClass100_724 != null) { + Static90.method1853(WorldMap.aClass100_724); + WorldMap.aClass100_724 = null; } } @@ -29,7 +26,7 @@ public final class Static141 { Static65.method1500(); Static89.aClass3_Sub2_Sub1_5 = null; Static107.anInt2875 = -1; - Static217.method3768(); + client.method3768(); Static255.cache.clear(); Static171.aClass139_1 = new Class139(); ((Js5GlTextureProvider) Rasteriser.textureProvider).clear(); @@ -38,8 +35,8 @@ public final class Static141 { Static237.method4120(); Static242.method4203(); Static115.clear(); - Static116.clear(false); - Static119.method2381(); + WorldMap.clear(false); + TitleScreen.clear(); for (@Pc(39) int local39 = 0; local39 < 2048; local39++) { @Pc(46) Player player = Static159.players[local39]; if (player != null) { @@ -50,21 +47,21 @@ public final class Static141 { Static242.method4201(); Static76.method1642(); } - Static102.load(Static261.js5Archive13, Static209.js5Archive8); - Sprites.load(Static209.js5Archive8); + Fonts.load(client.js5Archive13, client.js5Archive8); + Sprites.load(client.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 (client.gameState == 5) { - Static181.load(Static209.js5Archive8); + TitleScreen.load(client.js5Archive8); } if (client.gameState == 10) { Static73.method1596(false); } if (client.gameState == 30) { - Static196.setGameState(25); + client.setGameState(25); } } @@ -78,15 +75,9 @@ public final class Static141 { if (arg0 && Static113.anInt4612 >= 100) { Static138.renderX = Static245.anInt5375 * 128 + 64; Static134.renderZ = Static248.anInt4232 * 128 + 64; - Static5.anInt40 = Static207.method3685(Static55.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203; + Static5.anInt40 = SceneGraph.getTileHeight(Static55.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203; } Static227.cameraType = 2; } - @OriginalMember(owner = "client!lb", name = "a", descriptor = "(Lclient!ve;Lclient!ve;ILclient!ve;)V") - public static void init(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1, @OriginalArg(3) Js5 arg2) { - Static243.aClass153_98 = arg1; - Static5.aClass153_1 = arg0; - Static225.aClass153_92 = arg2; - } } diff --git a/client/src/main/java/Static142.java b/client/src/main/java/Static142.java index 9951d77..b7fa04c 100644 --- a/client/src/main/java/Static142.java +++ b/client/src/main/java/Static142.java @@ -7,11 +7,8 @@ public final class Static142 { @OriginalMember(owner = "client!lc", name = "n", descriptor = "I") public static int originZ; - @OriginalMember(owner = "client!lc", name = "e", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_23 = new SoftLruHashTable(64); - - @OriginalMember(owner = "client!lc", name = "m", descriptor = "Lclient!na;") - public static final JagString aClass100_667 = Static28.parse("settings="); + @OriginalMember(owner = "client!lc", name = "m", descriptor = "Lclient!na;") + public static final JagString aClass100_667 = JagString.parse("settings="); @OriginalMember(owner = "client!lc", name = "a", descriptor = "(IIIIIII)V") public static void method2726(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { @@ -123,11 +120,11 @@ public final class Static142 { @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); + @Pc(528) Sprite[] local528 = (Sprite[]) HitBarList.hitBars.get((long) local518.type.hitBarId); if (local528 == null) { - local528 = SpriteLoader.loadAlphaSprites(local518.type.hitBarId, Static209.js5Archive8); + local528 = SpriteLoader.loadAlphaSprites(local518.type.hitBarId, client.js5Archive8); if (local528 != null) { - Static73.aClass99_10.put(local528, (long) local518.type.hitBarId); + HitBarList.hitBars.put(local528, (long) local518.type.hitBarId); } } if (local528 != null && local528.length == 2) { diff --git a/client/src/main/java/Static143.java b/client/src/main/java/Static143.java index e74fa46..00a93f6 100644 --- a/client/src/main/java/Static143.java +++ b/client/src/main/java/Static143.java @@ -3,10 +3,7 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static143 { - @OriginalMember(owner = "client!ld", name = "k", descriptor = "Ljava/lang/String;") - public static String worldListHostname; - - @OriginalMember(owner = "client!ld", name = "a", descriptor = "[I") + @OriginalMember(owner = "client!ld", name = "a", descriptor = "[I") public static final int[] anIntArray329 = new int[] { 2, 2, 4, 0, 1, 8, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0 }; @OriginalMember(owner = "client!ld", name = "b", descriptor = "[Lclient!nc;") @@ -16,12 +13,9 @@ public final class Static143 { public static int anInt3484 = -1; @OriginalMember(owner = "client!ld", name = "d", descriptor = "Lclient!na;") - public static final JagString aClass100_668 = Static28.parse("Hidden)2use"); + public static final JagString aClass100_668 = JagString.parse("Hidden)2use"); - @OriginalMember(owner = "client!ld", name = "g", descriptor = "[Lclient!na;") - public static JagString[] aClass100Array104 = null; - - @OriginalMember(owner = "client!ld", name = "i", descriptor = "I") + @OriginalMember(owner = "client!ld", name = "i", descriptor = "I") public static int anInt3486 = 0; @OriginalMember(owner = "client!ld", name = "a", descriptor = "(IIIIZI)V") @@ -33,12 +27,7 @@ public final class Static143 { Static199.anInt4675 = arg2; } - @OriginalMember(owner = "client!ld", name = "a", descriptor = "(B)I") - public static int getTotal() { - return 6; - } - - @OriginalMember(owner = "client!ld", name = "a", descriptor = "(IB)I") + @OriginalMember(owner = "client!ld", name = "a", descriptor = "(IB)I") public static int toUpperCase(@OriginalArg(0) int arg0) { if (arg0 >= 97 && arg0 <= 122 || arg0 >= 224 && arg0 <= 254 && arg0 != 247) { return arg0 - 32; diff --git a/client/src/main/java/Static144.java b/client/src/main/java/Static144.java index c98f8ea..9d7fc8f 100644 --- a/client/src/main/java/Static144.java +++ b/client/src/main/java/Static144.java @@ -5,10 +5,7 @@ public final class Static144 { @OriginalMember(owner = "client!le", name = "c", descriptor = "Lclient!rf;") public static Song aClass3_Sub29_1; - @OriginalMember(owner = "client!le", name = "e", descriptor = "I") - public static int anInt3490 = 0; - - @OriginalMember(owner = "client!le", name = "a", descriptor = "(I)I") + @OriginalMember(owner = "client!le", name = "a", descriptor = "(I)I") public static int getWindowMode() { if (GameShell.fullScreenFrame != null) { return 3; diff --git a/client/src/main/java/Static145.java b/client/src/main/java/Static145.java index 0410aa7..ff18f66 100644 --- a/client/src/main/java/Static145.java +++ b/client/src/main/java/Static145.java @@ -16,27 +16,27 @@ public final class Static145 { @OriginalMember(owner = "client!lf", name = "a", descriptor = "(I)V") public static void method2742() { if (client.gameState == 10 && GlRenderer.enabled) { - Static196.setGameState(28); + client.setGameState(28); } if (client.gameState == 30) { - Static196.setGameState(25); + client.setGameState(25); } } @OriginalMember(owner = "client!lf", name = "a", descriptor = "(ILclient!ve;)V") public static void method2743(@OriginalArg(1) Js5 arg0) { - Static233.aClass36_Sub1Array1 = SpriteLoader.method3088(Static138.anInt3443, arg0); + Static233.aClass36_Sub1Array1 = SpriteLoader.method3088(Flames.anInt3443, arg0); Static96.anIntArray235 = new int[256]; @Pc(15) int local15; for (local15 = 0; local15 < 3; local15++) { - @Pc(30) int local30 = Static225.anIntArray445[local15 + 1] >> 16 & 0xFF; - @Pc(39) float local39 = (float) (Static225.anIntArray445[local15] >> 16 & 0xFF); - @Pc(48) float local48 = (float) (Static225.anIntArray445[local15] >> 8 & 0xFF); - @Pc(55) float local55 = (float) (Static225.anIntArray445[local15] & 0xFF); + @Pc(30) int local30 = Flames.anIntArray445[local15 + 1] >> 16 & 0xFF; + @Pc(39) float local39 = (float) (Flames.anIntArray445[local15] >> 16 & 0xFF); + @Pc(48) float local48 = (float) (Flames.anIntArray445[local15] >> 8 & 0xFF); + @Pc(55) float local55 = (float) (Flames.anIntArray445[local15] & 0xFF); @Pc(62) float local62 = ((float) local30 - local39) / 64.0F; - @Pc(72) int local72 = Static225.anIntArray445[local15 + 1] >> 8 & 0xFF; + @Pc(72) int local72 = Flames.anIntArray445[local15 + 1] >> 8 & 0xFF; @Pc(80) float local80 = ((float) local72 - local48) / 64.0F; - @Pc(88) int local88 = Static225.anIntArray445[local15 + 1] & 0xFF; + @Pc(88) int local88 = Flames.anIntArray445[local15 + 1] & 0xFF; @Pc(95) float local95 = ((float) local88 - local55) / 64.0F; for (@Pc(97) int local97 = 0; local97 < 64; local97++) { Static96.anIntArray235[local97 + local15 * 64] = (int) local55 | (int) local48 << 8 | (int) local39 << 16; @@ -46,7 +46,7 @@ public final class Static145 { } } for (local15 = 192; local15 < 255; local15++) { - Static96.anIntArray235[local15] = Static225.anIntArray445[3]; + Static96.anIntArray235[local15] = Flames.anIntArray445[3]; } Static270.anIntArray562 = new int[32768]; Static263.anIntArray516 = new int[32768]; @@ -94,8 +94,4 @@ public final class Static145 { local8.intArg2 = arg1; } - @OriginalMember(owner = "client!lf", name = "c", descriptor = "(I)I") - public static int method2746() { - 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 a149a15..e094de8 100644 --- a/client/src/main/java/Static146.java +++ b/client/src/main/java/Static146.java @@ -7,9 +7,6 @@ public final class Static146 { @OriginalMember(owner = "client!lg", name = "d", descriptor = "F") public static float aFloat15; - @OriginalMember(owner = "client!lg", name = "g", descriptor = "Lclient!ve;") - public static Js5 aClass153_54; - @OriginalMember(owner = "client!lg", name = "b", descriptor = "Z") public static boolean aBoolean174 = false; @@ -24,7 +21,7 @@ public final class Static146 { @Pc(6) int local6 = arg0.offset; @Pc(14) byte[] local14 = arg1.method3148(); arg0.pSmart1or2(local14.length); - arg0.offset += Static62.aClass44_1.method1550(local14.length, arg0.data, local14, 0, arg0.offset); + arg0.offset += WordPack.codec.method1550(local14.length, arg0.data, local14, 0, arg0.offset); return arg0.offset - local6; } diff --git a/client/src/main/java/Static147.java b/client/src/main/java/Static147.java index 1526936..d645c3b 100644 --- a/client/src/main/java/Static147.java +++ b/client/src/main/java/Static147.java @@ -8,7 +8,7 @@ public final class Static147 { public static volatile int anInt3521 = -1; @OriginalMember(owner = "client!lh", name = "z", descriptor = "Lclient!na;") - public static final JagString aClass100_672 = Static28.parse("(U (X"); + public static final JagString aClass100_672 = JagString.parse("(U (X"); @OriginalMember(owner = "client!lh", name = "b", descriptor = "(II)V") public static void method2761(@OriginalArg(0) int arg0) { @@ -85,8 +85,8 @@ public final class Static147 { @OriginalMember(owner = "client!lh", name = "d", descriptor = "(B)V") public static void method2764() { - Static190.aClass99_26.clear(); - Static124.aClass99_17.clear(); - Static87.aClass99_12.clear(); + Component.sprites.clear(); + Component.models.clear(); + Component.fonts.clear(); } } diff --git a/client/src/main/java/Static148.java b/client/src/main/java/Static148.java index 1fe21bd..c8eb0ac 100644 --- a/client/src/main/java/Static148.java +++ b/client/src/main/java/Static148.java @@ -4,35 +4,26 @@ import org.openrs2.deob.annotation.Pc; public final class Static148 { - @OriginalMember(owner = "client!li", name = "l", descriptor = "Lclient!ge;") - public static Cache masterCache; - @OriginalMember(owner = "client!li", name = "t", descriptor = "I") public static int anInt3534; - @OriginalMember(owner = "client!li", name = "v", descriptor = "Lclient!va;") - public static MidiPcmStream musicStream; - @OriginalMember(owner = "client!li", name = "w", descriptor = "Lclient!sc;") public static HashTable aClass133_13; @OriginalMember(owner = "client!li", name = "x", descriptor = "I") public static int screenUpperY; - @OriginalMember(owner = "client!li", name = "h", descriptor = "[Lclient!mj;") - public static final CollisionMap[] collisionMaps = new CollisionMap[4]; - @OriginalMember(owner = "client!li", name = "p", descriptor = "Lclient!na;") - public static final JagString aClass100_677 = Static28.parse("::rebuild"); + public static final JagString aClass100_677 = JagString.parse("::rebuild"); @OriginalMember(owner = "client!li", name = "a", descriptor = "(ZI)V") public static void method2765(@OriginalArg(1) int arg0) { if (arg0 == -1 && !MidiPlayer.jingle) { Static241.method4548(); - } else if (arg0 != -1 && (Static221.anInt4363 != arg0 || !Static136.method2655()) && Preferences.musicVolume != 0 && !MidiPlayer.jingle) { - Static257.method526(arg0, Static130.js5Archive6, Preferences.musicVolume); + } else if (arg0 != -1 && (MusicPlayer.groupId != arg0 || !Static136.method2655()) && Preferences.musicVolume != 0 && !MidiPlayer.jingle) { + MidiPlayer.playFadeOut(arg0, client.js5Archive6, Preferences.musicVolume); } - Static221.anInt4363 = arg0; + MusicPlayer.groupId = arg0; } @OriginalMember(owner = "client!li", name = "a", descriptor = "(III)V") @@ -49,14 +40,14 @@ public final class Static148 { @OriginalMember(owner = "client!li", name = "a", descriptor = "(II)Lclient!dd;") public static SoftwareFont method2768(@OriginalArg(1) int arg0) { - @Pc(16) SoftwareFont local16 = (SoftwareFont) Static139.aClass99_22.get((long) arg0); + @Pc(16) SoftwareFont local16 = (SoftwareFont) FontMetricsList.fontMetrics.get((long) arg0); if (local16 != null) { return local16; } - @Pc(26) byte[] local26 = Static261.js5Archive13.getFile(arg0, 0); + @Pc(26) byte[] local26 = client.js5Archive13.getFile(arg0, 0); local16 = new SoftwareFont(local26); local16.setNameIcons(Sprites.nameIcons, null); - Static139.aClass99_22.put(local16, (long) arg0); + FontMetricsList.fontMetrics.put(local16, (long) arg0); return local16; } } diff --git a/client/src/main/java/Static149.java b/client/src/main/java/Static149.java index a032365..b089fcd 100644 --- a/client/src/main/java/Static149.java +++ b/client/src/main/java/Static149.java @@ -9,9 +9,6 @@ public final class Static149 { @OriginalMember(owner = "client!lj", name = "B", descriptor = "I") public static int anInt3555; - @OriginalMember(owner = "client!lj", name = "p", descriptor = "Lclient!gn;") - public static final LruHashTable aClass54_10 = new LruHashTable(128); - @OriginalMember(owner = "client!lj", name = "w", descriptor = "I") public static int anInt3554 = 0; diff --git a/client/src/main/java/Static15.java b/client/src/main/java/Static15.java index 380375c..fc16c30 100644 --- a/client/src/main/java/Static15.java +++ b/client/src/main/java/Static15.java @@ -8,14 +8,11 @@ public final class Static15 { public static float aFloat4; @OriginalMember(owner = "client!be", name = "ib", descriptor = "Lclient!na;") - public static final JagString EVENT_OPBASE = Static28.parse("event_opbase"); + public static final JagString EVENT_OPBASE = JagString.parse("event_opbase"); @OriginalMember(owner = "client!be", name = "ac", descriptor = "Lclient!na;") public static JagString aClass100_87 = null; - @OriginalMember(owner = "client!be", name = "kc", descriptor = "J") - public static long aLong18 = 0L; - @OriginalMember(owner = "client!be", name = "Ec", descriptor = "I") public static int anInt506 = -1; diff --git a/client/src/main/java/Static150.java b/client/src/main/java/Static150.java index a2a5926..f63597e 100644 --- a/client/src/main/java/Static150.java +++ b/client/src/main/java/Static150.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static150 { @OriginalMember(owner = "client!lk", name = "J", descriptor = "Lclient!na;") - public static final JagString aClass100_687 = Static28.parse(")4p="); + public static final JagString aClass100_687 = JagString.parse(")4p="); @OriginalMember(owner = "client!lk", name = "V", descriptor = "I") public static int anInt3582 = 0; @@ -13,18 +13,6 @@ public final class Static150 { @OriginalMember(owner = "client!lk", name = "Z", descriptor = "I") public static int clickButton = 0; - @OriginalMember(owner = "client!lk", name = "a", descriptor = "(ILclient!ve;)I") - public static int getReady(@OriginalArg(1) Js5 archive) { - @Pc(1) int ready = 0; - if (archive.isFileReady(Static262.bgId)) { - ready++; - } - if (archive.isFileReady(Static136.logoId)) { - ready++; - } - return ready; - } - @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; @@ -103,11 +91,11 @@ public final class Static150 { } if (arg1.radius == 0 || arg1.radius < local20 - 64 || Preferences.ambientSoundsVolume == 0 || arg2 != arg1.anInt2033) { if (arg1.primaryStream != null) { - Static204.soundStream.removeSubStream(arg1.primaryStream); + client.soundStream.removeSubStream(arg1.primaryStream); arg1.primaryStream = null; } if (arg1.secondaryStream != null) { - Static204.soundStream.removeSubStream(arg1.secondaryStream); + client.soundStream.removeSubStream(arg1.secondaryStream); arg1.secondaryStream = null; } return; @@ -120,12 +108,12 @@ public final class Static150 { if (arg1.primaryStream != null) { arg1.primaryStream.method386(local134); } else if (arg1.sound >= 0) { - @Pc(150) SynthSound local150 = SynthSound.create(Static248.js5Archive4, arg1.sound, 0); + @Pc(150) SynthSound local150 = SynthSound.create(client.js5Archive4, arg1.sound, 0); if (local150 != null) { - @Pc(158) PcmSound local158 = local150.method3989().method2648(Static56.resampler); + @Pc(158) PcmSound local158 = local150.method3989().method2648(client.resampler); @Pc(163) SoundPcmStream local163 = Static284.method404(local158, local134); local163.method396(-1); - Static204.soundStream.method1343(local163); + client.soundStream.method1343(local163); arg1.primaryStream = local163; } } @@ -136,12 +124,12 @@ 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 = SynthSound.create(Static248.js5Archive4, arg1.sounds[local219], 0); + @Pc(227) SynthSound local227 = SynthSound.create(client.js5Archive4, arg1.sounds[local219], 0); if (local227 != null) { - @Pc(236) PcmSound local236 = local227.method3989().method2648(Static56.resampler); + @Pc(236) PcmSound local236 = local227.method3989().method2648(client.resampler); @Pc(241) SoundPcmStream local241 = Static284.method404(local236, local134); local241.method396(0); - Static204.soundStream.method1343(local241); + client.soundStream.method1343(local241); arg1.anInt2034 = (int) ((double) (arg1.anInt2040 - arg1.anInt2032) * Math.random()) + arg1.anInt2032; arg1.secondaryStream = local241; } diff --git a/client/src/main/java/Static151.java b/client/src/main/java/Static151.java index 6f44e7d..47232e3 100644 --- a/client/src/main/java/Static151.java +++ b/client/src/main/java/Static151.java @@ -56,26 +56,26 @@ public final class Static151 { local11 = new int[] { anInt3587 }; local4.glDeleteTextures(1, local11, 0); anInt3587 = -1; - Static63.onCardTexture -= aByteBuffer7.limit() * 2; + GlCleaner.onCardTexture -= aByteBuffer7.limit() * 2; } if (anIntArray341 != null) { local4 = GlRenderer.gl; local4.glDeleteTextures(64, anIntArray341, 0); anIntArray341 = null; - Static63.onCardTexture -= aByteBuffer7.limit() * 2; + GlCleaner.onCardTexture -= aByteBuffer7.limit() * 2; } if (waterfallTextureId != -1) { local4 = GlRenderer.gl; local11 = new int[] {waterfallTextureId}; local4.glDeleteTextures(1, local11, 0); waterfallTextureId = -1; - Static63.onCardTexture -= aByteBuffer6.limit() * 2; + GlCleaner.onCardTexture -= aByteBuffer6.limit() * 2; } if (waterfallTextures != null) { local4 = GlRenderer.gl; local4.glDeleteTextures(64, waterfallTextures, 0); waterfallTextures = null; - Static63.onCardTexture -= aByteBuffer6.limit() * 2; + GlCleaner.onCardTexture -= aByteBuffer6.limit() * 2; } } @@ -99,7 +99,7 @@ public final class Static151 { local1.glTexParameteri(GL2.GL_TEXTURE_3D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR); local1.glTexParameteri(GL2.GL_TEXTURE_3D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); anInt3587 = local6[0]; - Static63.onCardTexture += aByteBuffer7.limit() * 2; + GlCleaner.onCardTexture += aByteBuffer7.limit() * 2; } else { anIntArray341 = new int[64]; local1.glGenTextures(64, anIntArray341, 0); @@ -110,7 +110,7 @@ public final class Static151 { local1.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR); local1.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); } - Static63.onCardTexture += aByteBuffer7.limit() * 2; + GlCleaner.onCardTexture += aByteBuffer7.limit() * 2; } } @@ -126,7 +126,7 @@ public final class Static151 { local1.glTexParameteri(GL2.GL_TEXTURE_3D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR); local1.glTexParameteri(GL2.GL_TEXTURE_3D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); waterfallTextureId = local6[0]; - Static63.onCardTexture += aByteBuffer6.limit() * 2; + GlCleaner.onCardTexture += aByteBuffer6.limit() * 2; return; } waterfallTextures = new int[64]; @@ -138,6 +138,6 @@ public final class Static151 { local1.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR); local1.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); } - Static63.onCardTexture += aByteBuffer6.limit() * 2; + GlCleaner.onCardTexture += aByteBuffer6.limit() * 2; } } diff --git a/client/src/main/java/Static153.java b/client/src/main/java/Static153.java index 41e8b62..eb6f7cd 100644 --- a/client/src/main/java/Static153.java +++ b/client/src/main/java/Static153.java @@ -4,32 +4,23 @@ import org.openrs2.deob.annotation.Pc; public final class Static153 { - @OriginalMember(owner = "client!mc", name = "Q", descriptor = "Lclient!na;") - public static JagString aClass100_724; - - @OriginalMember(owner = "client!mc", name = "S", descriptor = "Lclient!mm;") - public static SoftwareSprite aClass3_Sub2_Sub1_Sub1_2; - - @OriginalMember(owner = "client!mc", name = "Z", descriptor = "Lclient!ve;") - public static Js5 aClass153_57; - - @OriginalMember(owner = "client!mc", name = "Y", descriptor = "[Lclient!na;") + @OriginalMember(owner = "client!mc", name = "Y", descriptor = "[Lclient!na;") public static final JagString[] aClass100Array112 = new JagString[100]; @OriginalMember(owner = "client!mc", name = "ab", descriptor = "[I") public static final int[] anIntArray351 = new int[] { 7, 8, 9, 10, 11, 12, 13, 15 }; @OriginalMember(owner = "client!mc", name = "fb", descriptor = "Lclient!na;") - private static final JagString aClass100_725 = Static28.parse("pt"); + private static final JagString aClass100_725 = JagString.parse("pt"); @OriginalMember(owner = "client!mc", name = "mb", descriptor = "Lclient!na;") - private static final JagString aClass100_726 = Static28.parse("en"); + private static final JagString aClass100_726 = JagString.parse("en"); @OriginalMember(owner = "client!mc", name = "vb", descriptor = "Lclient!na;") - private static final JagString aClass100_728 = Static28.parse("de"); + private static final JagString aClass100_728 = JagString.parse("de"); @OriginalMember(owner = "client!mc", name = "pb", descriptor = "Lclient!na;") - private static final JagString aClass100_727 = Static28.parse("fr"); + private static final JagString aClass100_727 = JagString.parse("fr"); @OriginalMember(owner = "client!mc", name = "ob", descriptor = "[Lclient!na;") public static final JagString[] aClass100Array113 = new JagString[] { aClass100_726, aClass100_728, aClass100_727, aClass100_725 }; @@ -67,7 +58,7 @@ public final class Static153 { @OriginalMember(owner = "client!mc", name = "f", descriptor = "(B)V") public static void method2909() { - Static6.outboundBuffer.p1isaac(184); + Protocol.outboundBuffer.p1isaac(184); for (@Pc(18) Class3_Sub31 local18 = (Class3_Sub31) Static119.aClass133_9.head(); local18 != null; local18 = (Class3_Sub31) Static119.aClass133_9.next()) { if (local18.anInt5879 == 0) { Static132.method2605(true, local18); diff --git a/client/src/main/java/Static154.java b/client/src/main/java/Static154.java index 7e4e01c..be05b51 100644 --- a/client/src/main/java/Static154.java +++ b/client/src/main/java/Static154.java @@ -8,13 +8,10 @@ public final class Static154 { public static int anInt3709; @OriginalMember(owner = "client!md", name = "Q", descriptor = "Lclient!na;") - public static final JagString aClass100_735 = Static28.parse("::mm"); + public static final JagString aClass100_735 = JagString.parse("::mm"); @OriginalMember(owner = "client!md", name = "T", descriptor = "Lclient!na;") - public static final JagString aClass100_736 = Static28.parse("Shift)2click disabled)3"); - - @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 } }; + public static final JagString aClass100_736 = JagString.parse("Shift)2click disabled)3"); @OriginalMember(owner = "client!md", name = "a", descriptor = "(Lclient!be;I)Z") public static boolean method2926(@OriginalArg(0) Component arg0) { @@ -55,7 +52,7 @@ public final class Static154 { Static62.anInt1941++; Static26.anIntArray67[0] = arg1; Static153.aClass100Array112[0] = arg4; - Static49.anInt1464 = Static119.transmitTimer; + Static49.anInt1464 = InterfaceList.transmitTimer; Static241.anIntArray521[0] = arg0; Static230.aClass100Array158[0] = arg2; Static64.aClass100Array62[0] = arg3; diff --git a/client/src/main/java/Static155.java b/client/src/main/java/Static155.java index c771a11..9f31778 100644 --- a/client/src/main/java/Static155.java +++ b/client/src/main/java/Static155.java @@ -35,8 +35,8 @@ public final class Static155 { @Pc(8) short[] local8 = new short[16]; @Pc(12) JagString local12 = arg1.toLowerCase(); @Pc(14) int local14 = 0; - for (@Pc(16) int local16 = 0; local16 < Static170.anInt3245; local16++) { - @Pc(27) ObjType local27 = Static71.get(local16); + for (@Pc(16) int local16 = 0; local16 < ObjTypeList.anInt3245; local16++) { + @Pc(27) ObjType local27 = ObjTypeList.get(local16); if ((!arg0 || local27.stockMarket) && local27.certificateTemplate == -1 && local27.lentTemplate == -1 && local27.dummyItem == 0 && local27.name.toLowerCase().indexOf(local12) != -1) { if (local14 >= 250) { Static169.aShortArray52 = null; @@ -58,14 +58,14 @@ public final class Static155 { Static111.anInt2905 = local14; @Pc(117) JagString[] local117 = new JagString[Static111.anInt2905]; for (@Pc(119) int local119 = 0; local119 < Static111.anInt2905; local119++) { - local117[local119] = Static71.get(local8[local119]).name; + local117[local119] = ObjTypeList.get(local8[local119]).name; } Static202.method3656(local117, Static169.aShortArray52); } @OriginalMember(owner = "client!me", name = "a", descriptor = "(II)I") public static int getVarbit(@OriginalArg(1) int arg0) { - @Pc(13) VarbitType local13 = Static125.method2449(arg0); + @Pc(13) VarbitType local13 = VarbitTypeList.get(arg0); @Pc(16) int local16 = local13.baseVar; @Pc(19) int local19 = local13.endBit; @Pc(22) int local22 = local13.startBit; diff --git a/client/src/main/java/Static156.java b/client/src/main/java/Static156.java index 4f4908d..9ea5b64 100644 --- a/client/src/main/java/Static156.java +++ b/client/src/main/java/Static156.java @@ -8,10 +8,7 @@ public final class Static156 { @OriginalMember(owner = "client!mf", name = "O", descriptor = "[[B") public static byte[][] locationMapFilesBuffer; - @OriginalMember(owner = "client!mf", name = "W", descriptor = "Lclient!ve;") - public static Js5 js5Archive22; - - @OriginalMember(owner = "client!mf", name = "X", descriptor = "I") + @OriginalMember(owner = "client!mf", name = "X", descriptor = "I") public static int loginScreenId; @OriginalMember(owner = "client!mf", name = "a", descriptor = "(IIIII[[[B[I[I[I[I[IIBII)V") @@ -107,8 +104,8 @@ public final class Static156 { @OriginalMember(owner = "client!mf", name = "a", descriptor = "(JI)V") public static void method2956(@OriginalArg(0) long arg0) { if ((long) 0 != arg0) { - Static6.outboundBuffer.p1isaac(104); - Static6.outboundBuffer.p8(arg0); + Protocol.outboundBuffer.p1isaac(104); + Protocol.outboundBuffer.p8(arg0); } } diff --git a/client/src/main/java/Static158.java b/client/src/main/java/Static158.java index 6ade8b5..66876eb 100644 --- a/client/src/main/java/Static158.java +++ b/client/src/main/java/Static158.java @@ -1,5 +1,3 @@ -import java.io.IOException; -import java.net.Socket; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @@ -17,116 +15,6 @@ public final class Static158 { @OriginalMember(owner = "client!mh", name = "eb", descriptor = "I") public static int anInt3857 = 0; - @OriginalMember(owner = "client!mh", name = "f", descriptor = "(B)V") - public static void loop() { - if (Static179.accountCreationStep == 0) { - return; - } - try { - if (++Static226.anInt5079 > 2000) { - if (Protocol.socket != null) { - Protocol.socket.close(); - Protocol.socket = null; - } - if (Static57.anInt1758 >= 1) { - Static223.anInt5034 = -5; - Static179.accountCreationStep = 0; - return; - } - Static179.accountCreationStep = 1; - Static226.anInt5079 = 0; - Static57.anInt1758++; - if (Static209.port == Static271.defaultPort) { - Static209.port = Static55.alternatePort; - } else { - Static209.port = Static271.defaultPort; - } - } - if (Static179.accountCreationStep == 1) { - Static72.aClass212_3 = GameShell.signLink.openSocket(Static60.hostname, Static209.port); - Static179.accountCreationStep = 2; - } - @Pc(120) int local120; - if (Static179.accountCreationStep == 2) { - if (Static72.aClass212_3.status == 2) { - throw new IOException(); - } - if (Static72.aClass212_3.status != 1) { - return; - } - Protocol.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, GameShell.signLink); - Static72.aClass212_3 = null; - Protocol.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); - if (client.musicChannel != null) { - client.musicChannel.method3571(); - } - if (client.soundChannel != null) { - client.soundChannel.method3571(); - } - local120 = Protocol.socket.read(); - if (client.musicChannel != null) { - client.musicChannel.method3571(); - } - if (client.soundChannel != null) { - client.soundChannel.method3571(); - } - if (local120 != 21) { - Static223.anInt5034 = local120; - Static179.accountCreationStep = 0; - Protocol.socket.close(); - Protocol.socket = null; - return; - } - Static179.accountCreationStep = 3; - } - if (Static179.accountCreationStep == 3) { - if (Protocol.socket.available() < 1) { - return; - } - Static229.aClass100Array156 = new JagString[Protocol.socket.read()]; - Static179.accountCreationStep = 4; - } - if (Static179.accountCreationStep == 4) { - if (Protocol.socket.available() < Static229.aClass100Array156.length * 8) { - return; - } - Static57.aClass3_Sub15_Sub1_3.offset = 0; - 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; - Protocol.socket.close(); - Protocol.socket = null; - return; - } - } catch (@Pc(238) IOException local238) { - if (Protocol.socket != null) { - Protocol.socket.close(); - Protocol.socket = null; - } - if (Static57.anInt1758 < 1) { - Static57.anInt1758++; - if (Static271.defaultPort == Static209.port) { - Static209.port = Static55.alternatePort; - } else { - Static209.port = Static271.defaultPort; - } - Static226.anInt5079 = 0; - Static179.accountCreationStep = 1; - } else { - Static223.anInt5034 = -4; - Static179.accountCreationStep = 0; - } - } - } - - @OriginalMember(owner = "client!mh", name = "c", descriptor = "(II)V") - public static void method3010() { - Static110.aClass99_15.method3102(5); - } - @OriginalMember(owner = "client!mh", name = "h", descriptor = "(B)V") public static void decodeNpcFiles() { @Pc(10) int local10 = Static191.npcSpawnsFilesBuffer.length; @@ -153,7 +41,7 @@ public final class Static158 { @Pc(125) int local125 = local113 + (Static238.regionBitPacked[local16] >> 8) * 64 - Static225.originX; @Pc(129) int local129 = local103 & 0x3F; @Pc(142) int local142 = local129 + (Static238.regionBitPacked[local16] & 0xFF) * 64 - Static142.originZ; - @Pc(148) NpcType local148 = Static214.get(local74.g2()); + @Pc(148) NpcType local148 = NpcTypeList.get(local74.g2()); if (Static175.npcs[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == Static41.anInt1316 && local125 >= 0 && local148.soze + local125 < 104 && local142 >= 0 && local142 + local148.soze < 104) { Static175.npcs[local97] = new Npc(); @Pc(198) Npc local198 = Static175.npcs[local97]; diff --git a/client/src/main/java/Static159.java b/client/src/main/java/Static159.java index 5571707..693bcab 100644 --- a/client/src/main/java/Static159.java +++ b/client/src/main/java/Static159.java @@ -8,7 +8,7 @@ public final class Static159 { public static int anInt3893; @OriginalMember(owner = "client!mi", name = "R", descriptor = "Lclient!na;") - public static final JagString aClass100_760 = Static28.parse(")1"); + public static final JagString aClass100_760 = JagString.parse(")1"); @OriginalMember(owner = "client!mi", name = "S", descriptor = "[Lclient!e;") public static final Player[] players = new Player[2048]; @@ -30,7 +30,7 @@ public final class Static159 { if (local15 == -1) { arg1.aClass147Array3[local25] = null; } else { - @Pc(60) SeqType local60 = Static36.get(local15); + @Pc(60) SeqType local60 = SeqTypeList.get(local15); @Pc(65) Class147 local65 = arg1.aClass147Array3[local25]; @Pc(68) int local68 = local60.anInt5347; if (local65 != null) { @@ -47,7 +47,7 @@ public final class Static159 { } else if (local68 == 2) { local65.anInt5400 = 0; } - } else if (local60.anInt5355 >= Static36.get(local65.anInt5396).anInt5355) { + } else if (local60.anInt5355 >= SeqTypeList.get(local65.anInt5396).anInt5355) { local65 = arg1.aClass147Array3[local25] = null; } } diff --git a/client/src/main/java/Static16.java b/client/src/main/java/Static16.java index a72a1bd..13b6d9b 100644 --- a/client/src/main/java/Static16.java +++ b/client/src/main/java/Static16.java @@ -3,18 +3,12 @@ import org.openrs2.deob.annotation.Pc; public final class Static16 { - @OriginalMember(owner = "client!bf", name = "s", descriptor = "Lclient!ve;") - public static Js5 js5Archive12; - - @OriginalMember(owner = "client!bf", name = "B", descriptor = "I") + @OriginalMember(owner = "client!bf", name = "B", descriptor = "I") public static int anInt548 = -1; @OriginalMember(owner = "client!bf", name = "C", descriptor = "[I") public static final int[] anIntArray51 = new int[] { 2, 2, 4, 2, 1, 8, 4, 1, 4, 4, 2, 1, 1, 1, 4, 1 }; - @OriginalMember(owner = "client!bf", name = "E", descriptor = "I") - public static int anInt549 = -1; - @OriginalMember(owner = "client!bf", name = "G", descriptor = "I") public static int anInt551 = 0; diff --git a/client/src/main/java/Static160.java b/client/src/main/java/Static160.java index c325595..e49efed 100644 --- a/client/src/main/java/Static160.java +++ b/client/src/main/java/Static160.java @@ -7,22 +7,16 @@ public final class Static160 { @OriginalMember(owner = "client!mj", name = "u", descriptor = "B") public static byte aByte14; - @OriginalMember(owner = "client!mj", name = "C", descriptor = "[S") - public static short[] aShortArray41; - - @OriginalMember(owner = "client!mj", name = "d", descriptor = "[Lclient!na;") + @OriginalMember(owner = "client!mj", name = "d", descriptor = "[Lclient!na;") public static final JagString[] aClass100Array121 = new JagString[8]; @OriginalMember(owner = "client!mj", name = "g", descriptor = "Lclient!na;") - public static final JagString aClass100_761 = Static28.parse("(U3"); + public static final JagString aClass100_761 = JagString.parse("(U3"); @OriginalMember(owner = "client!mj", name = "i", descriptor = "I") public static int anInt3902 = 0; - @OriginalMember(owner = "client!mj", name = "A", descriptor = "J") - public static long prevGc = 0L; - - @OriginalMember(owner = "client!mj", name = "a", descriptor = "(IILclient!be;IB)V") + @OriginalMember(owner = "client!mj", name = "a", descriptor = "(IILclient!be;IB)V") public static void method3047(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Component arg2, @OriginalArg(3) int arg3) { if (GlRenderer.enabled) { Static46.method1187(arg0, arg1, arg2.anInt445 + arg0, arg2.anInt459 + arg1); diff --git a/client/src/main/java/Static163.java b/client/src/main/java/Static163.java index 842e4ea..6dd1483 100644 --- a/client/src/main/java/Static163.java +++ b/client/src/main/java/Static163.java @@ -8,7 +8,7 @@ public final class Static163 { public static byte[][][] aByteArrayArrayArray11; @OriginalMember(owner = "client!n", name = "e", descriptor = "Lclient!na;") - public static final JagString aClass100_767 = Static28.parse(")2"); + public static final JagString aClass100_767 = JagString.parse(")2"); @OriginalMember(owner = "client!n", name = "a", descriptor = "(II)V") public static void method3096(@OriginalArg(0) int arg0) { @@ -16,13 +16,6 @@ public final class Static163 { local8.pushClient(); } - @OriginalMember(owner = "client!n", name = "a", descriptor = "(B)V") - public static void method3097() { - Static240.aFontMetrics1 = null; - Static222.aFont1 = null; - Static149.anImage3 = null; - } - @OriginalMember(owner = "client!n", name = "a", descriptor = "(IIIIII)V") public static void method3105(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { @Pc(11) int local11 = Static78.method1690(Static106.anInt2869, arg2, Static267.anInt5773); diff --git a/client/src/main/java/Static164.java b/client/src/main/java/Static164.java index 2f9c84e..1d0f9b3 100644 --- a/client/src/main/java/Static164.java +++ b/client/src/main/java/Static164.java @@ -7,14 +7,8 @@ public final class Static164 { @OriginalMember(owner = "client!na", name = "W", descriptor = "Z") public static boolean newTab; - @OriginalMember(owner = "client!na", name = "l", descriptor = "I") - public static int anInt3985 = 0; - - @OriginalMember(owner = "client!na", name = "cb", descriptor = "Lclient!na;") - public static final JagString aClass100_770 = Static28.parse(":allyreq:"); - - @OriginalMember(owner = "client!na", name = "mb", descriptor = "[I") - public static final int[] anIntArray362 = new int[50]; + @OriginalMember(owner = "client!na", name = "cb", descriptor = "Lclient!na;") + public static final JagString aClass100_770 = JagString.parse(":allyreq:"); @OriginalMember(owner = "client!na", name = "a", descriptor = "(IIIIIIIZ)Z") public static boolean method3109(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(6) int arg4) { @@ -30,7 +24,7 @@ public final class Static164 { local28 = (int) local14 >> 20 & 0x3; local35 = (int) local14 >> 14 & 0x1F; local42 = Integer.MAX_VALUE & (int) (local14 >>> 32); - local46 = Static271.get(local42); + local46 = LocTypeList.get(local42); if (local46.mapSceneId == -1) { local65 = arg1; if (local14 > 0L) { @@ -104,7 +98,7 @@ public final class Static164 { local28 = (int) local14 >> 20 & 0x3; local35 = (int) local14 >> 14 & 0x1F; local42 = (int) (local14 >>> 32) & Integer.MAX_VALUE; - local46 = Static271.get(local42); + local46 = LocTypeList.get(local42); if (local46.mapSceneId == -1) { if (local35 == 9) { local65 = 15658734; @@ -133,7 +127,7 @@ public final class Static164 { if (local14 != 0L) { local28 = (int) local14 >> 20 & 0x3; local35 = (int) (local14 >>> 32) & Integer.MAX_VALUE; - @Pc(586) LocType local586 = Static271.get(local35); + @Pc(586) LocType local586 = LocTypeList.get(local35); if (local586.mapSceneId != -1 && !Static33.method867(arg0, local586, arg2, local28)) { return false; } @@ -166,7 +160,7 @@ public final class Static164 { @OriginalMember(owner = "client!na", name = "a", descriptor = "(IBZIZIIZ)Lclient!qf;") public static Sprite method3150(@OriginalArg(0) int arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) boolean arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) boolean arg6) { - @Pc(5) ObjType local5 = Static71.get(arg2); + @Pc(5) ObjType local5 = ObjTypeList.get(arg2); if (arg5 > 1 && local5.countObj != null) { @Pc(15) int local15 = -1; for (@Pc(17) int local17 = 0; local17 < 10; local17++) { @@ -175,7 +169,7 @@ public final class Static164 { } } if (local15 != -1) { - local5 = Static71.get(local15); + local5 = ObjTypeList.get(local15); } } @Pc(60) SoftwareModel local60 = local5.getInvModel(); @@ -231,7 +225,7 @@ public final class Static164 { 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); + ObjTypeList.aClass3_Sub2_Sub9_Sub1_1.method2857(Static52.method1288(arg5), 0, 9, 16776960, 1); } SoftwareRaster.method2491(local118, local120, local122); SoftwareRaster.method2488(local125); diff --git a/client/src/main/java/Static165.java b/client/src/main/java/Static165.java index 50678a8..2c559c8 100644 --- a/client/src/main/java/Static165.java +++ b/client/src/main/java/Static165.java @@ -10,26 +10,20 @@ public final class Static165 { @OriginalMember(owner = "client!nb", name = "o", descriptor = "I") public static int anInt4042; - @OriginalMember(owner = "client!nb", name = "p", descriptor = "I") - public static int anInt4043; - - @OriginalMember(owner = "client!nb", name = "a", descriptor = "Lclient!na;") - public static final JagString aClass100_772 = Static28.parse("um"); + @OriginalMember(owner = "client!nb", name = "a", descriptor = "Lclient!na;") + public static final JagString aClass100_772 = JagString.parse("um"); @OriginalMember(owner = "client!nb", name = "d", descriptor = "I") public static int anInt4035 = 0; - @OriginalMember(owner = "client!nb", name = "e", descriptor = "Lclient!na;") - public static final JagString aClass100_775 = Static28.parse("::breakcon"); - @OriginalMember(owner = "client!nb", name = "j", descriptor = "I") public static volatile int anInt4039 = -1; @OriginalMember(owner = "client!nb", name = "m", descriptor = "Lclient!na;") - public static final JagString aClass100_776 = Static28.parse("logo"); + public static final JagString aClass100_776 = JagString.parse("logo"); @OriginalMember(owner = "client!nb", name = "n", descriptor = "Lclient!na;") - public static final JagString DETAILS = Static28.parse("details"); + public static final JagString DETAILS = JagString.parse("details"); @OriginalMember(owner = "client!nb", name = "a", descriptor = "(IIIIIIIIII)V") public static void method3162(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8) { diff --git a/client/src/main/java/Static166.java b/client/src/main/java/Static166.java index 8a2b788..1b9e8e7 100644 --- a/client/src/main/java/Static166.java +++ b/client/src/main/java/Static166.java @@ -5,10 +5,7 @@ public final class Static166 { @OriginalMember(owner = "client!nc", name = "a", descriptor = "I") public static int anInt4044; - @OriginalMember(owner = "client!nc", name = "j", descriptor = "I") - public static int mainLoadState = 0; - - @OriginalMember(owner = "client!nc", name = "m", descriptor = "I") + @OriginalMember(owner = "client!nc", name = "m", descriptor = "I") public static int anInt4054 = 0; @OriginalMember(owner = "client!nc", name = "n", descriptor = "I") diff --git a/client/src/main/java/Static167.java b/client/src/main/java/Static167.java index a1fe10d..f2f5695 100644 --- a/client/src/main/java/Static167.java +++ b/client/src/main/java/Static167.java @@ -4,35 +4,20 @@ import org.openrs2.deob.annotation.Pc; public final class Static167 { - @OriginalMember(owner = "client!nd", name = "n", descriptor = "Lclient!ve;") - public static Js5 aClass153_61; - - @OriginalMember(owner = "client!nd", name = "p", descriptor = "Lclient!ve;") - public static Js5 aClass153_62; - @OriginalMember(owner = "client!nd", name = "s", descriptor = "I") public static int anInt4069; - @OriginalMember(owner = "client!nd", name = "t", descriptor = "Lclient!ve;") - public static Js5 js5Archive26; - - @OriginalMember(owner = "client!nd", name = "v", descriptor = "Lclient!ve;") - public static Js5 aClass153_64; - @OriginalMember(owner = "client!nd", name = "y", descriptor = "Lclient!mm;") public static SoftwareSprite aClass3_Sub2_Sub1_Sub1_3; @OriginalMember(owner = "client!nd", name = "b", descriptor = "Lclient!na;") - public static final JagString aClass100_780 = Static28.parse("Clientscript error in: "); + public static final JagString aClass100_780 = JagString.parse("Clientscript error in: "); @OriginalMember(owner = "client!nd", name = "q", descriptor = "[[I") public static final int[][] anIntArrayArray31 = new int[104][104]; - @OriginalMember(owner = "client!nd", name = "r", descriptor = "Lclient!na;") - public static final JagString aClass100_781 = Static28.parse("zap"); - @OriginalMember(owner = "client!nd", name = "x", descriptor = "Lclient!na;") - public static final JagString aClass100_783 = Static28.parse(")4p="); + public static final JagString aClass100_783 = JagString.parse(")4p="); @OriginalMember(owner = "client!nd", name = "a", descriptor = "(ZLclient!qb;)V") public static void setInactive(@OriginalArg(1) PcmStream arg0) { @@ -45,9 +30,4 @@ public final class Static167 { } } - @OriginalMember(owner = "client!nd", name = "a", descriptor = "(ILclient!ve;)V") - public static void init(@OriginalArg(1) Js5 arg0) { - Static262.bgId = arg0.getGroupId(Static27.aClass100_165); - Static136.logoId = arg0.getGroupId(Static165.aClass100_776); - } } diff --git a/client/src/main/java/Static169.java b/client/src/main/java/Static169.java index 1a85d3e..05bf1ba 100644 --- a/client/src/main/java/Static169.java +++ b/client/src/main/java/Static169.java @@ -14,10 +14,7 @@ public final class Static169 { @OriginalMember(owner = "client!nf", name = "h", descriptor = "Lclient!be;") public static Component aClass13_18; - @OriginalMember(owner = "client!nf", name = "f", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_24 = new SoftLruHashTable(500); - - @OriginalMember(owner = "client!nf", name = "i", descriptor = "I") + @OriginalMember(owner = "client!nf", name = "i", descriptor = "I") public static int anInt4075 = -1; @OriginalMember(owner = "client!nf", name = "a", descriptor = "(Lclient!na;BZ)V") diff --git a/client/src/main/java/Static17.java b/client/src/main/java/Static17.java index 6ca80df..e777c47 100644 --- a/client/src/main/java/Static17.java +++ b/client/src/main/java/Static17.java @@ -4,23 +4,20 @@ import org.openrs2.deob.annotation.Pc; public final class Static17 { - @OriginalMember(owner = "client!bg", name = "g", descriptor = "Lclient!i;") - public static final Packet aClass3_Sub15_Sub1_2 = new Packet(5000); - - @OriginalMember(owner = "client!bg", name = "z", descriptor = "Lclient!na;") - public static final JagString aClass100_101 = Static28.parse("k"); + @OriginalMember(owner = "client!bg", name = "z", descriptor = "Lclient!na;") + public static final JagString aClass100_101 = JagString.parse("k"); @OriginalMember(owner = "client!bg", name = "M", descriptor = "I") public static int milliseconds = 0; @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); + Protocol.inboundBuffer.method2233(); + @Pc(11) int local11 = Protocol.inboundBuffer.method2238(1); if (local11 == 0) { return; } - @Pc(23) int local23 = Static57.aClass3_Sub15_Sub1_3.method2238(2); + @Pc(23) int local23 = Protocol.inboundBuffer.method2238(2); if (local23 == 0) { Static44.anIntArray106[Static116.anInt2951++] = 2047; return; @@ -28,35 +25,35 @@ public final class Static17 { @Pc(54) int local54; @Pc(64) int local64; if (local23 == 1) { - local54 = Static57.aClass3_Sub15_Sub1_3.method2238(3); + local54 = Protocol.inboundBuffer.method2238(3); PlayerList.self.method2684(1, local54); - local64 = Static57.aClass3_Sub15_Sub1_3.method2238(1); + local64 = Protocol.inboundBuffer.method2238(1); if (local64 == 1) { Static44.anIntArray106[Static116.anInt2951++] = 2047; } } else if (local23 == 2) { - if (Static57.aClass3_Sub15_Sub1_3.method2238(1) == 1) { - local54 = Static57.aClass3_Sub15_Sub1_3.method2238(3); + if (Protocol.inboundBuffer.method2238(1) == 1) { + local54 = Protocol.inboundBuffer.method2238(3); PlayerList.self.method2684(2, local54); - local64 = Static57.aClass3_Sub15_Sub1_3.method2238(3); + local64 = Protocol.inboundBuffer.method2238(3); PlayerList.self.method2684(2, local64); } else { - local54 = Static57.aClass3_Sub15_Sub1_3.method2238(3); + local54 = Protocol.inboundBuffer.method2238(3); PlayerList.self.method2684(0, local54); } - local54 = Static57.aClass3_Sub15_Sub1_3.method2238(1); + local54 = Protocol.inboundBuffer.method2238(1); if (local54 == 1) { Static44.anIntArray106[Static116.anInt2951++] = 2047; } } else if (local23 == 3) { - local54 = Static57.aClass3_Sub15_Sub1_3.method2238(7); - local64 = Static57.aClass3_Sub15_Sub1_3.method2238(1); - Static55.level = Static57.aClass3_Sub15_Sub1_3.method2238(2); - @Pc(163) int local163 = Static57.aClass3_Sub15_Sub1_3.method2238(1); + local54 = Protocol.inboundBuffer.method2238(7); + local64 = Protocol.inboundBuffer.method2238(1); + Static55.level = Protocol.inboundBuffer.method2238(2); + @Pc(163) int local163 = Protocol.inboundBuffer.method2238(1); if (local163 == 1) { Static44.anIntArray106[Static116.anInt2951++] = 2047; } - @Pc(181) int local181 = Static57.aClass3_Sub15_Sub1_3.method2238(7); + @Pc(181) int local181 = Protocol.inboundBuffer.method2238(7); PlayerList.self.method1265(local181, local64 == 1, local54); } } @@ -70,7 +67,7 @@ public final class Static17 { public static void method531(@OriginalArg(0) Component arg0, @OriginalArg(1) boolean arg1) { @Pc(20) int local20 = arg0.anInt486 == 0 ? arg0.anInt445 : arg0.anInt486; @Pc(32) int local32 = arg0.anInt491 == 0 ? arg0.anInt459 : arg0.anInt491; - Static266.method4190(arg0.id, arg1, local20, local32, Static241.components[arg0.id >> 16]); + Static266.method4190(arg0.id, arg1, local20, local32, InterfaceList.components[arg0.id >> 16]); if (arg0.createdComponents != null) { Static266.method4190(arg0.id, arg1, local20, local32, arg0.createdComponents); } diff --git a/client/src/main/java/Static170.java b/client/src/main/java/Static170.java index d319050..470c7d7 100644 --- a/client/src/main/java/Static170.java +++ b/client/src/main/java/Static170.java @@ -4,18 +4,12 @@ import org.openrs2.deob.annotation.Pc; public final class Static170 { - @OriginalMember(owner = "client!nh", name = "eb", descriptor = "I") - public static int anInt3245; - - @OriginalMember(owner = "client!nh", name = "Z", descriptor = "I") + @OriginalMember(owner = "client!nh", name = "Z", descriptor = "I") public static int anInt3241 = 128; @OriginalMember(owner = "client!nh", name = "fb", descriptor = "[I") public static final int[] JS5_ARCHIVE_WEIGHTS = new int[] { 4, 4, 1, 2, 6, 4, 2, 49, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; - @OriginalMember(owner = "client!nh", name = "hb", descriptor = "Lclient!na;") - public static final JagString aClass100_623 = Static28.parse("::fps "); - @OriginalMember(owner = "client!nh", name = "a", descriptor = "(IIIII)I") public static int method2569(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) { @Pc(22) int local22 = 65536 - MathUtils.cos[arg2 * 1024 / arg3] >> 1; @@ -40,21 +34,6 @@ public final class Static170 { Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2].aClass15_1 = local6; } - @OriginalMember(owner = "client!nh", name = "a", descriptor = "(I[B)Z") - public static boolean method2572(@OriginalArg(1) byte[] arg0) { - @Pc(13) Buffer local13 = new Buffer(arg0); - @Pc(17) int local17 = local13.g1(); - if (local17 != 1) { - return false; - } - @Pc(33) boolean local33 = local13.g1() == 1; - if (local33) { - Static97.method1962(local13); - } - Static69.method1546(local13); - return true; - } - @OriginalMember(owner = "client!nh", name = "a", descriptor = "(IIIIIIIIIIIII)V") public static void method2574(@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) int arg9, @OriginalArg(11) int arg10, @OriginalArg(12) int arg11) { @Pc(7) Class3_Sub8 local7 = new Class3_Sub8(); diff --git a/client/src/main/java/Static171.java b/client/src/main/java/Static171.java index 6469567..36b924e 100644 --- a/client/src/main/java/Static171.java +++ b/client/src/main/java/Static171.java @@ -8,13 +8,7 @@ public final class Static171 { @OriginalMember(owner = "client!ni", name = "h", descriptor = "I") public static int anInt4153; - @OriginalMember(owner = "client!ni", name = "k", descriptor = "Lclient!ve;") - public static Js5 js5Archive19; - - @OriginalMember(owner = "client!ni", name = "q", descriptor = "I") - public static int anInt4157; - - @OriginalMember(owner = "client!ni", name = "n", descriptor = "Lclient!sm;") + @OriginalMember(owner = "client!ni", name = "n", descriptor = "Lclient!sm;") public static Class139 aClass139_1 = new Class139(); @OriginalMember(owner = "client!ni", name = "a", descriptor = "(ILclient!na;)I") @@ -48,8 +42,8 @@ public final class Static171 { @OriginalMember(owner = "client!ni", name = "a", descriptor = "(ILclient!na;I)V") public static void method3221(@OriginalArg(1) JagString arg0, @OriginalArg(2) int arg1) { - Static6.outboundBuffer.p1isaac(188); - Static6.outboundBuffer.p1a(arg1); - Static6.outboundBuffer.p8(arg0.encode37()); + Protocol.outboundBuffer.p1isaac(188); + Protocol.outboundBuffer.p1a(arg1); + Protocol.outboundBuffer.p8(arg0.encode37()); } } diff --git a/client/src/main/java/Static172.java b/client/src/main/java/Static172.java index b55f894..2b27a76 100644 --- a/client/src/main/java/Static172.java +++ b/client/src/main/java/Static172.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static172 { - @OriginalMember(owner = "client!nj", name = "c", descriptor = "Lclient!ve;") - public static Js5 aClass153_69; - - @OriginalMember(owner = "client!nj", name = "e", descriptor = "Lclient!va;") + @OriginalMember(owner = "client!nj", name = "e", descriptor = "Lclient!va;") public static MidiPcmStream aClass3_Sub3_Sub4_2; @OriginalMember(owner = "client!nj", name = "g", descriptor = "Lclient!ve;") @@ -19,13 +16,7 @@ public final class Static172 { @OriginalMember(owner = "client!nj", name = "k", descriptor = "I") public static int anInt4165; - @OriginalMember(owner = "client!nj", name = "l", descriptor = "Lclient!ve;") - public static Js5 js5Archive18; - - @OriginalMember(owner = "client!nj", name = "m", descriptor = "[[S") - public static short[][] aShortArrayArray7; - - @OriginalMember(owner = "client!nj", name = "a", descriptor = "Z") + @OriginalMember(owner = "client!nj", name = "a", descriptor = "Z") public static boolean shiftClick = false; @OriginalMember(owner = "client!nj", name = "h", descriptor = "Lclient!ih;") diff --git a/client/src/main/java/Static173.java b/client/src/main/java/Static173.java index 356b465..bcd2683 100644 --- a/client/src/main/java/Static173.java +++ b/client/src/main/java/Static173.java @@ -7,13 +7,7 @@ public final class Static173 { @OriginalMember(owner = "client!nk", name = "d", descriptor = "[I") public static int[] anIntArray367; - @OriginalMember(owner = "client!nk", name = "E", descriptor = "I") - public static int redDelta; - - @OriginalMember(owner = "client!nk", name = "n", descriptor = "[Lclient!sl;") - public static final SynthSound[] aClass138Array1 = new SynthSound[50]; - - @OriginalMember(owner = "client!nk", name = "c", descriptor = "(IZ)V") + @OriginalMember(owner = "client!nk", name = "c", descriptor = "(IZ)V") public static void method3240(@OriginalArg(1) boolean arg0) { @Pc(7) int local7; @Pc(16) Npc local16; @@ -122,7 +116,7 @@ public final class Static173 { if (!local16.type.aBoolean183) { local262 |= Long.MIN_VALUE; } - local16.anInt3424 = Static207.method3685(Static55.level, local16.xFine, local16.zFine); + local16.anInt3424 = SceneGraph.getTileHeight(Static55.level, local16.xFine, local16.zFine); Static43.method1141(Static55.level, local16.xFine, local16.zFine, local16.anInt3424, local107 * 64 + 60 - 64, local16, local16.anInt3381, local262, local16.aBoolean171); } } diff --git a/client/src/main/java/Static175.java b/client/src/main/java/Static175.java index ad75fbe..9d0913a 100644 --- a/client/src/main/java/Static175.java +++ b/client/src/main/java/Static175.java @@ -14,11 +14,8 @@ public final class Static175 { @OriginalMember(owner = "client!nm", name = "U", descriptor = "I") public static int mapFilesMissingCount = 0; - @OriginalMember(owner = "client!nm", name = "Y", descriptor = "J") - public static long firstGc = 0L; - @OriginalMember(owner = "client!nm", name = "bb", descriptor = "Lclient!na;") - public static final JagString aClass100_798 = Static28.parse(""); + public static final JagString aClass100_798 = JagString.parse(""); @OriginalMember(owner = "client!nm", name = "a", descriptor = "(Z)V") public static void method3279() { @@ -27,7 +24,7 @@ public final class Static175 { } else { Static233.aClass95_4 = Protocol.socket; Protocol.socket = null; - Static196.setGameState(40); + client.setGameState(40); } } } diff --git a/client/src/main/java/Static176.java b/client/src/main/java/Static176.java index 5c1163b..c76bbed 100644 --- a/client/src/main/java/Static176.java +++ b/client/src/main/java/Static176.java @@ -11,20 +11,13 @@ public final class Static176 { public static final boolean[] aBooleanArray95 = new boolean[5]; @OriginalMember(owner = "client!ob", name = "e", descriptor = "Lclient!na;") - public static final JagString aClass100_800 = Static28.parse(""); + public static final JagString aClass100_800 = JagString.parse(""); @OriginalMember(owner = "client!ob", name = "o", descriptor = "Lclient!na;") - private static final JagString aClass100_801 = Static28.parse(")4a="); + private static final JagString aClass100_801 = JagString.parse(")4a="); @OriginalMember(owner = "client!ob", name = "p", descriptor = "Lclient!na;") - public static final JagString aClass100_802 = Static28.parse("(U0a )2 non)2existant gosub script)2num: "); - - @OriginalMember(owner = "client!ob", name = "a", descriptor = "(B)V") - public static void method3302() { - Static27.aClass99_4.clear(); - Static244.models.clear(); - Static118.objectSpriteCache.clear(); - } + public static final JagString aClass100_802 = JagString.parse("(U0a )2 non)2existant gosub script)2num: "); @OriginalMember(owner = "client!ob", name = "a", descriptor = "(IB)Z") public static boolean hopWorld(@OriginalArg(0) int arg0) { @@ -32,25 +25,25 @@ public final class Static176 { if (local3 == null) { return false; } 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; + @Pc(31) byte[] local31 = local3.hostname.method3148(); + client.hostname = new String(local31, 0, local31.length); + Static125.worldId = local3.id; if (client.modeWhere != 0) { - Static271.defaultPort = Static125.worldId + 43594; // 40000; - Static209.port = Static271.defaultPort; - Static55.alternatePort = Static125.worldId + 43594; // 50000; + client.defaultPort = Static125.worldId + 43594; // 40000; + client.port = client.defaultPort; + client.alternatePort = Static125.worldId + 43594; // 50000; } return true; } else { @Pc(62) JagString local62 = Static211.aClass100_230; if (client.modeWhere != 0) { - local62 = JagString.concatenate(new JagString[] { Static31.aClass100_193, Static123.parseInt(local3.anInt382 + 7000) }); + local62 = JagString.concatenate(new JagString[] { Static31.aClass100_193, Static123.parseInt(local3.id + 7000) }); } @Pc(89) JagString local89 = Static211.aClass100_230; if (client.settings != null) { local89 = JagString.concatenate(new JagString[] { Static167.aClass100_783, client.settings}); } - @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 }); + @Pc(182) JagString local182 = JagString.concatenate(new JagString[] { Static115.aClass100_582, local3.hostname, 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 { client.instance.getAppletContext().showDocument(local182.method3107(), "_self"); return true; @@ -96,7 +89,7 @@ public final class Static176 { local112 = local121; @Pc(240) int local240; if (local133 == 2 && Static257.method523(Static55.level, local47, local147, local121)) { - @Pc(172) LocType local172 = Static271.get(local140); + @Pc(172) LocType local172 = LocTypeList.get(local140); if (local172.multiLocs != null) { local172 = local172.getMultiLoc(); } @@ -106,7 +99,7 @@ public final class Static176 { if (Static260.anInt5014 == 1) { 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); + @Pc(363) ParamType local363 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039); if ((Static274.anInt4999 & 0x4) != 0 && (local363 == null || local172.getParam(local363.defaultInt, Static121.anInt3039) != local363.defaultInt)) { Static98.method1966(Static246.anInt5393, local121, JagString.concatenate(new JagString[] { Static78.aClass100_466, Static27.aClass100_164, local172.name}), local47, (short) 38, Static102.aClass100_545, local147); } @@ -145,7 +138,7 @@ public final class Static176 { } } } - Static98.method1966(Static225.anInt5073, (long) local172.anInt4426, JagString.concatenate(new JagString[] { Static240.aClass100_1008, local172.name}), local47, (short) 1004, LocalizedText.EXAMINE, local147); + Static98.method1966(Static225.anInt5073, (long) local172.id, JagString.concatenate(new JagString[] { Static240.aClass100_1008, local172.name}), local47, (short) 1004, LocalizedText.EXAMINE, local147); } } @Pc(514) int local514; @@ -207,11 +200,11 @@ public final class Static176 { if (local931 != null) { for (@Pc(940) ObjStackNode local940 = (ObjStackNode) local931.method2279(); local940 != null; local940 = (ObjStackNode) local931.method2286()) { local240 = local940.aClass8_Sub7_1.anInt5555; - @Pc(951) ObjType local951 = Static71.get(local240); + @Pc(951) ObjType local951 = ObjTypeList.get(local240); if (Static260.anInt5014 == 1) { 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); + @Pc(1142) ParamType local1142 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039); if ((Static274.anInt4999 & 0x1) != 0 && (local1142 == null || local951.getParam(local1142.defaultInt, Static121.anInt3039) != local1142.defaultInt)) { 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); } diff --git a/client/src/main/java/Static178.java b/client/src/main/java/Static178.java index f5c5bb9..cdaa71e 100644 --- a/client/src/main/java/Static178.java +++ b/client/src/main/java/Static178.java @@ -24,8 +24,8 @@ public final class Static178 { local24++; } if (local24 < Static199.aClass3_Sub22Array1.length && Static199.aClass3_Sub22Array1[local24] != null) { - Static6.outboundBuffer.p1isaac(162); - Static6.outboundBuffer.p8(Static199.aClass3_Sub22Array1[local24].key); + Protocol.outboundBuffer.p1isaac(162); + Protocol.outboundBuffer.p8(Static199.aClass3_Sub22Array1[local24].key); } } @@ -37,8 +37,8 @@ public final class Static178 { } @Pc(27) int local27 = 0; for (@Pc(29) int local29 = 0; local29 < local19.objectIds.length; local29++) { - if (local19.objectIds[local29] >= 0 && Static170.anInt3245 > local19.objectIds[local29]) { - @Pc(56) ObjType local56 = Static71.get(local19.objectIds[local29]); + if (local19.objectIds[local29] >= 0 && ObjTypeList.anInt3245 > local19.objectIds[local29]) { + @Pc(56) ObjType local56 = ObjTypeList.get(local19.objectIds[local29]); if (local56.params != null) { @Pc(68) IntNode local68 = (IntNode) local56.params.get((long) arg2); if (local68 != null) { diff --git a/client/src/main/java/Static179.java b/client/src/main/java/Static179.java index 594a34d..3ff38d1 100644 --- a/client/src/main/java/Static179.java +++ b/client/src/main/java/Static179.java @@ -12,28 +12,15 @@ public final class Static179 { @OriginalMember(owner = "client!oe", name = "i", descriptor = "[[I") public static final int[][] anIntArrayArray33 = new int[5][5000]; - @OriginalMember(owner = "client!oe", name = "j", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_25 = new SoftLruHashTable(64); - - @OriginalMember(owner = "client!oe", name = "l", descriptor = "I") - public static int accountCreationStep = 0; - @OriginalMember(owner = "client!oe", name = "n", descriptor = "I") public static int anInt4262 = 1; @OriginalMember(owner = "client!oe", name = "o", descriptor = "Lclient!na;") - public static final JagString aClass100_807 = Static28.parse("n"); + public static final JagString aClass100_807 = JagString.parse("n"); @OriginalMember(owner = "client!oe", name = "a", descriptor = "(IZ)I") public static int method3322(@OriginalArg(0) int arg0) { return arg0 & 0x7F; } - @OriginalMember(owner = "client!oe", name = "b", descriptor = "(I)V") - public static void method3323() { - aClass99_25.method3103(); - Static169.aClass99_24.method3103(); - Static93.aClass99_14.method3103(); - Static262.aClass99_36.method3103(); - } } diff --git a/client/src/main/java/Static18.java b/client/src/main/java/Static18.java index ee57a5a..0a78dd9 100644 --- a/client/src/main/java/Static18.java +++ b/client/src/main/java/Static18.java @@ -10,11 +10,8 @@ public final class Static18 { @OriginalMember(owner = "client!bh", name = "t", descriptor = "I") public static int anInt588 = 0; - @OriginalMember(owner = "client!bh", name = "z", descriptor = "Z") - public static boolean serverUpdatedPreferences = true; - - @OriginalMember(owner = "client!bh", name = "C", descriptor = "Lclient!na;") - public static final JagString COMPLETE_PERCENT = Static28.parse("
(X100(U(Y"); + @OriginalMember(owner = "client!bh", name = "C", descriptor = "Lclient!na;") + public static final JagString COMPLETE_PERCENT = JagString.parse("
(X100(U(Y"); @OriginalMember(owner = "client!bh", name = "G", descriptor = "[I") public static final int[] anIntArray57 = new int[] { 0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1 }; diff --git a/client/src/main/java/Static180.java b/client/src/main/java/Static180.java index ab8ae94..af99af3 100644 --- a/client/src/main/java/Static180.java +++ b/client/src/main/java/Static180.java @@ -13,41 +13,17 @@ public final class Static180 { @OriginalMember(owner = "client!og", name = "g", descriptor = "[Lclient!na;") public static JagString[] stringLocals; - @OriginalMember(owner = "client!og", name = "a", descriptor = "(Lclient!ve;Lclient!ve;B)V") - public static void init(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1) { - Static250.spritesArchive = arg1; - @Pc(12) int local12 = (int) (Math.random() * 21.0D) - 10; - Static98.aClass153_42 = arg0; - @Pc(21) int local21 = (int) (Math.random() * 21.0D) - 10; - Static98.aClass153_42.method4504(34); - @Pc(33) int local33 = (int) (Math.random() * 21.0D) - 10; - @Pc(40) int local40 = (int) (Math.random() * 41.0D) - 20; - Static266.blueDelta = local40 + local21; - Static85.greenDelta = local12 + local40; - Static173.redDelta = local40 + local33; - } - @OriginalMember(owner = "client!og", name = "a", descriptor = "(BIILclient!fe;III)V") public static void method3326(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) PathingEntity arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { Static198.method1026(arg5, arg1, arg2.zFine, arg4, arg0, arg2.xFine, arg3); } - @OriginalMember(owner = "client!og", name = "a", descriptor = "(Lclient!ve;I)V") - public static void init(@OriginalArg(0) Js5 arg0) { - Static172.aClass153_69 = arg0; - } - - @OriginalMember(owner = "client!og", name = "a", descriptor = "(II)V") + @OriginalMember(owner = "client!og", name = "a", descriptor = "(II)V") public static void method3328(@OriginalArg(0) int arg0) { @Pc(12) DelayedStateChange local12 = Static238.method4143(10, arg0); local12.pushClient(); } - @OriginalMember(owner = "client!og", name = "a", descriptor = "(I)V") - public static void method3329() { - Static110.aClass99_15.method3103(); - } - @OriginalMember(owner = "client!og", name = "a", descriptor = "(III)I") public static int method3330(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { if (arg0 > 22050) { diff --git a/client/src/main/java/Static181.java b/client/src/main/java/Static181.java index 0a50391..70f2c3e 100644 --- a/client/src/main/java/Static181.java +++ b/client/src/main/java/Static181.java @@ -8,10 +8,10 @@ public final class Static181 { public static Sprite aClass3_Sub2_Sub1_9; @OriginalMember(owner = "client!oi", name = "b", descriptor = "Lclient!na;") - public static final JagString aClass100_810 = Static28.parse("::qa_op_test"); + public static final JagString aClass100_810 = JagString.parse("::qa_op_test"); @OriginalMember(owner = "client!oi", name = "j", descriptor = "Lclient!na;") - public static final JagString aClass100_811 = Static28.parse("::wm1"); + public static final JagString aClass100_811 = JagString.parse("::wm1"); @OriginalMember(owner = "client!oi", name = "a", descriptor = "(IIIIIIIIII)V") public static void method3340(@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) { @@ -27,32 +27,6 @@ public final class Static181 { 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") - public static void method3342() { - Static67.aClass99_20.method3103(); - } - - @OriginalMember(owner = "client!oi", name = "a", descriptor = "(Lclient!ve;B)V") - public static void load(@OriginalArg(0) Js5 archive) { - if (Static18.loaded) { - return; - } - - if (GlRenderer.enabled) { - Static46.clear(); - } else { - SoftwareRaster.clear(); - } - - @Pc(20) int height = GameShell.canvasHeight; - @Pc(26) int width = height * 956 / 503; - Static78.titleBg = Static130.loadSpriteAutoDetect(archive, Static262.bgId); - Static78.titleBg.renderResizedTransparent((GameShell.canvasWidth - width) / 2, 0, width, height); - Static243.logo = Static40.loadIndexedSpriteAutoDetect(Static136.logoId, archive); - Static243.logo.renderTransparent(GameShell.canvasWidth / 2 - Static243.logo.width / 2, 18); - Static18.loaded = true; - } - @OriginalMember(owner = "client!oi", name = "b", descriptor = "(II)V") public static void method3345(@OriginalArg(0) int arg0) { @Pc(8) DelayedStateChange local8 = Static238.method4143(5, arg0); @@ -64,15 +38,4 @@ public final class Static181 { Static53.method1292(arg1, arg0.length - 1, arg0, 0); } - @OriginalMember(owner = "client!oi", name = "b", descriptor = "(I)V") - public static void method3347() { - Static110.aClass99_15.clear(); - } - - @OriginalMember(owner = "client!oi", name = "a", descriptor = "(ILclient!ve;Lclient!ve;Z)V") - public static void init(@OriginalArg(1) Js5 arg0, @OriginalArg(2) Js5 arg1) { - Static30.aBoolean61 = true; - Static121.modelsArchive = arg1; - Static146.aClass153_54 = arg0; - } } diff --git a/client/src/main/java/Static182.java b/client/src/main/java/Static182.java index 7274053..5609696 100644 --- a/client/src/main/java/Static182.java +++ b/client/src/main/java/Static182.java @@ -7,9 +7,6 @@ public final class Static182 { @OriginalMember(owner = "client!oj", name = "t", descriptor = "[I") public static int[] anIntArray372; - @OriginalMember(owner = "client!oj", name = "x", descriptor = "Lclient!ve;") - public static Js5 aClass153_77; - @OriginalMember(owner = "client!oj", name = "E", descriptor = "[[Lclient!hg;") public static GlTile[][] aClass3_Sub14ArrayArray2; @@ -19,10 +16,7 @@ public final class Static182 { @OriginalMember(owner = "client!oj", name = "v", descriptor = "I") public static int anInt4311 = -2; - @OriginalMember(owner = "client!oj", name = "y", descriptor = "I") - public static int keyQueueSize = 0; - - @OriginalMember(owner = "client!oj", name = "z", descriptor = "[Z") + @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 = "(IZIJI)Lclient!na;") diff --git a/client/src/main/java/Static183.java b/client/src/main/java/Static183.java index 11d95e0..732a615 100644 --- a/client/src/main/java/Static183.java +++ b/client/src/main/java/Static183.java @@ -27,7 +27,7 @@ public final class Static183 { @OriginalMember(owner = "client!ok", name = "a", descriptor = "(IIB)Lclient!ce;") public static SecondaryLinkedList method3333(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { @Pc(9) SecondaryLinkedList local9 = new SecondaryLinkedList(); - for (@Pc(14) Map local14 = (Map) Static228.aClass69_120.method2289(); local14 != null; local14 = (Map) Static228.aClass69_120.method2288()) { + for (@Pc(14) Map local14 = (Map) MapList.aClass69_120.method2289(); local14 != null; local14 = (Map) MapList.aClass69_120.method2288()) { if (local14.aBoolean50 && local14.method664(arg1, arg0)) { local9.addTail(local14); } diff --git a/client/src/main/java/Static184.java b/client/src/main/java/Static184.java index 600f8f4..887b623 100644 --- a/client/src/main/java/Static184.java +++ b/client/src/main/java/Static184.java @@ -4,17 +4,11 @@ import org.openrs2.deob.annotation.Pc; public final class Static184 { - @OriginalMember(owner = "client!ol", name = "U", descriptor = "Lclient!ve;") - public static Js5 js5Archive10; - - @OriginalMember(owner = "client!ol", name = "ib", descriptor = "I") + @OriginalMember(owner = "client!ol", name = "ib", descriptor = "I") public static int cameraYaw; - @OriginalMember(owner = "client!ol", name = "V", descriptor = "I") - public static int loginStep = 0; - - @OriginalMember(owner = "client!ol", name = "Y", descriptor = "Lclient!na;") - public static final JagString aClass100_819 = Static28.parse(""); + @OriginalMember(owner = "client!ol", name = "Y", descriptor = "Lclient!na;") + public static final JagString aClass100_819 = JagString.parse(""); @OriginalMember(owner = "client!ol", name = "a", descriptor = "(IIIILclient!th;IJIIII)Z") public static boolean method3387(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) int arg5, @OriginalArg(6) long arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10) { diff --git a/client/src/main/java/Static185.java b/client/src/main/java/Static185.java index 3cc1ab7..81a8998 100644 --- a/client/src/main/java/Static185.java +++ b/client/src/main/java/Static185.java @@ -15,8 +15,8 @@ public final class Static185 { @OriginalMember(owner = "client!p", name = "a", descriptor = "(I)V") public static void method3395() { - if (Static184.loginStep == 5) { - Static184.loginStep = 6; + if (LoginManager.step == 5) { + LoginManager.step = 6; } } @@ -33,7 +33,7 @@ public final class Static185 { if (arg2 < Static146.anInt3508) { Static146.anInt3508 = arg2; } - @Pc(62) LocType local62 = Static271.get(arg5); + @Pc(62) LocType local62 = LocTypeList.get(arg5); if (GlRenderer.enabled && local62.aBoolean216) { return; } @@ -343,7 +343,7 @@ public final class Static185 { local1226 = 16; local1889 = Static265.method4521(arg2, arg7, arg8); if (local1889 != 0L) { - local1226 = Static271.get(Integer.MAX_VALUE & (int) (local1889 >>> 32)).wallDecorOffsetScale; + local1226 = LocTypeList.get(Integer.MAX_VALUE & (int) (local1889 >>> 32)).wallDecorOffsetScale; } if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { local1950 = local62.method3428(arg9, local165, local153, 4, local199, local213, arg1, null, local330, local173); @@ -359,7 +359,7 @@ public final class Static185 { local1226 = 8; local1889 = Static265.method4521(arg2, arg7, arg8); if (local1889 != 0L) { - local1226 = Static271.get(Integer.MAX_VALUE & (int) (local1889 >>> 32)).wallDecorOffsetScale / 2; + local1226 = LocTypeList.get(Integer.MAX_VALUE & (int) (local1889 >>> 32)).wallDecorOffsetScale / 2; } if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { local1950 = local62.method3428(arg9 + 4, local165, local153, 4, local199, local213, arg1, null, local330, local173); @@ -387,7 +387,7 @@ public final class Static185 { local1226 = 8; local1889 = Static265.method4521(arg2, arg7, arg8); if (local1889 != 0L) { - local1226 = Static271.get(Integer.MAX_VALUE & (int) (local1889 >>> 32)).wallDecorOffsetScale / 2; + local1226 = LocTypeList.get(Integer.MAX_VALUE & (int) (local1889 >>> 32)).wallDecorOffsetScale / 2; } @Pc(2244) int local2244 = arg9 + 2 & 0x3; @Pc(2289) Entity local2289; diff --git a/client/src/main/java/Static189.java b/client/src/main/java/Static189.java index b9716bd..78b9ebd 100644 --- a/client/src/main/java/Static189.java +++ b/client/src/main/java/Static189.java @@ -1,4 +1,3 @@ -import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; public final class Static189 { @@ -6,17 +5,4 @@ public final class Static189 { @OriginalMember(owner = "client!pe", name = "r", descriptor = "I") public static int anInt4457; - @OriginalMember(owner = "client!pe", name = "a", descriptor = "I") - public static int anInt4443 = 0; - - @OriginalMember(owner = "client!pe", name = "j", descriptor = "I") - public static int anInt4451 = 0; - - @OriginalMember(owner = "client!pe", name = "a", descriptor = "(BZ)V") - public static void method3438(@OriginalArg(1) boolean arg0) { - if (arg0 != Static30.aBoolean61) { - Static30.aBoolean61 = arg0; - Static90.clearLocCache(); - } - } } diff --git a/client/src/main/java/Static19.java b/client/src/main/java/Static19.java index 9521841..f6b8b38 100644 --- a/client/src/main/java/Static19.java +++ b/client/src/main/java/Static19.java @@ -4,14 +4,11 @@ import org.openrs2.deob.annotation.Pc; public final class Static19 { - @OriginalMember(owner = "client!bi", name = "R", descriptor = "I") - public static int anInt636; - @OriginalMember(owner = "client!bi", name = "Y", descriptor = "[[B") public static byte[][] underWaterLocationsMapFilesBuffer; @OriginalMember(owner = "client!bi", name = "W", descriptor = "Lclient!na;") - public static final JagString aClass100_112 = Static28.parse("k"); + public static final JagString aClass100_112 = JagString.parse("k"); @OriginalMember(owner = "client!bi", name = "jb", descriptor = "Z") public static boolean aBoolean43 = true; @@ -34,11 +31,6 @@ public final class Static19 { } } - @OriginalMember(owner = "client!bi", name = "c", descriptor = "(II)V") - public static void method586() { - Static262.aClass99_34.method3102(5); - } - @OriginalMember(owner = "client!bi", name = "f", descriptor = "(B)V") public static void loop() { @Pc(11) int local11; diff --git a/client/src/main/java/Static190.java b/client/src/main/java/Static190.java index 136a318..d646717 100644 --- a/client/src/main/java/Static190.java +++ b/client/src/main/java/Static190.java @@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static190 { - @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") public static final long[] aLongArray6 = new long[100]; @@ -32,14 +29,14 @@ public final class Static190 { public static Sprite method3443(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { @Pc(27) int local27 = (arg2 ? 65536 : 0) + arg1 + (arg0 << 17) + (arg4 << 19); @Pc(37) long local37 = (long) local27 * 3849834839L + (long) arg3 * 3147483667L; - @Pc(43) Sprite local43 = (Sprite) Static118.objectSpriteCache.get(local37); + @Pc(43) Sprite local43 = (Sprite) ObjTypeList.objectSpriteCache.get(local37); if (local43 != null) { return local43; } Rasteriser.textureHasTransparency = false; local43 = Static164.method3150(arg4, false, arg1, arg2, arg0, arg3, false); if (local43 != null && !Rasteriser.textureHasTransparency) { - Static118.objectSpriteCache.put(local43, local37); + ObjTypeList.objectSpriteCache.put(local43, local37); } return local43; } @@ -51,10 +48,4 @@ public final class Static190 { local14.intArg1 = arg0; } - @OriginalMember(owner = "client!pf", name = "c", descriptor = "(II)V") - public static void method3447() { - Static27.aClass99_4.method3102(5); - Static244.models.method3102(5); - Static118.objectSpriteCache.method3102(5); - } } diff --git a/client/src/main/java/Static191.java b/client/src/main/java/Static191.java index 8e79dae..fa1f5e2 100644 --- a/client/src/main/java/Static191.java +++ b/client/src/main/java/Static191.java @@ -17,10 +17,7 @@ public final class Static191 { @OriginalMember(owner = "client!pg", name = "R", descriptor = "[I") public static final int[] anIntArray385 = new int[anInt4506]; - @OriginalMember(owner = "client!pg", name = "S", descriptor = "I") - public static int staffModLevel = 0; - - @OriginalMember(owner = "client!pg", name = "T", descriptor = "[I") + @OriginalMember(owner = "client!pg", name = "T", descriptor = "[I") public static final int[] anIntArray386 = new int[] { 76, 8, 137, 4, 0, 1, 38, 2, 19 }; @OriginalMember(owner = "client!pg", name = "V", descriptor = "I") @@ -36,7 +33,7 @@ public final class Static191 { public static final int[] anIntArray389 = new int[anInt4506]; @OriginalMember(owner = "client!pg", name = "db", descriptor = "Lclient!na;") - public static final JagString aClass100_845 = Static28.parse(":assistreq:"); + public static final JagString aClass100_845 = JagString.parse(":assistreq:"); @OriginalMember(owner = "client!pg", name = "eb", descriptor = "[I") public static final int[] anIntArray390 = new int[anInt4506]; diff --git a/client/src/main/java/Static192.java b/client/src/main/java/Static192.java index 5d3fc44..fc66964 100644 --- a/client/src/main/java/Static192.java +++ b/client/src/main/java/Static192.java @@ -17,7 +17,7 @@ public final class Static192 { @Pc(29) int local29; if (local17.anInt1192 < 0) { local29 = -local17.anInt1192 - 1; - if (local29 == Static16.anInt549) { + if (local29 == PlayerList.selfId) { local40 = PlayerList.self; } else { local40 = Static159.players[local29]; @@ -27,7 +27,7 @@ public final class Static192 { local40 = Static175.npcs[local29]; } if (local40 != null) { - @Pc(63) LocType local63 = Static271.get(local17.anInt1189); + @Pc(63) LocType local63 = LocTypeList.get(local17.anInt1189); if (Static55.level < 3) { } @Pc(86) int local86; @@ -102,7 +102,7 @@ public final class Static192 { @OriginalMember(owner = "client!ph", name = "b", descriptor = "(B)V") public static void method3474() { - Static250.aClass99_33.method3103(); - Static139.aClass99_21.method3103(); + PlayerAppearance.aClass99_33.method3103(); + PlayerAppearance.aClass99_21.method3103(); } } diff --git a/client/src/main/java/Static193.java b/client/src/main/java/Static193.java index 4bd75a2..c9ec1e7 100644 --- a/client/src/main/java/Static193.java +++ b/client/src/main/java/Static193.java @@ -7,11 +7,8 @@ public final class Static193 { @OriginalMember(owner = "client!pi", name = "U", descriptor = "I") public static int anInt4539; - @OriginalMember(owner = "client!pi", name = "P", descriptor = "J") - public static long aLong147 = 0L; - @OriginalMember(owner = "client!pi", name = "Q", descriptor = "Lclient!na;") - public static final JagString aClass100_853 = Static28.parse("null"); + public static final JagString aClass100_853 = JagString.parse("null"); @OriginalMember(owner = "client!pi", name = "V", descriptor = "[Lclient!na;") public static final JagString[] aClass100Array134 = new JagString[100]; @@ -39,9 +36,9 @@ public final class Static193 { Static106.anIntArray258[local41] = Static106.anIntArray258[local41 + 1]; Static3.aBooleanArray135[local41] = Static3.aBooleanArray135[local41 + 1]; } - Static185.anInt4369 = Static119.transmitTimer; - Static6.outboundBuffer.p1isaac(57); - Static6.outboundBuffer.p8(arg0); + Static185.anInt4369 = InterfaceList.transmitTimer; + Protocol.outboundBuffer.p1isaac(57); + Protocol.outboundBuffer.p8(arg0); break; } } @@ -64,7 +61,7 @@ public final class Static193 { local25 = arg2[local11 - 1][local16 - 1]; } if (local25 != 0) { - @Pc(77) FluType local77 = Static199.method3593((local25 & 0xFF) - 1); + @Pc(77) FluType local77 = FluTypeList.get((local25 & 0xFF) - 1); local9[local11][local16] = (local77.anInt4155 + 1 << 16) + local77.anInt4156; } } @@ -281,26 +278,26 @@ public final class Static193 { @Pc(23) int local23 = Static259.anIntArray514[arg0]; @Pc(27) int local27 = Static84.anIntArray209[arg0]; if (arg1 == 0) { - Static6.outboundBuffer.p1isaac(215); - Static6.outboundBuffer.p1(local13 + local13 + 3); + Protocol.outboundBuffer.p1isaac(215); + Protocol.outboundBuffer.p1(local13 + local13 + 3); } if (arg1 == 1) { - Static6.outboundBuffer.p1isaac(39); - Static6.outboundBuffer.p1(local13 + local13 + 3 + 14); + Protocol.outboundBuffer.p1isaac(39); + Protocol.outboundBuffer.p1(local13 + local13 + 3 + 14); } if (arg1 == 2) { - Static6.outboundBuffer.p1isaac(77); - Static6.outboundBuffer.p1(local13 + local13 + 3); + Protocol.outboundBuffer.p1isaac(77); + Protocol.outboundBuffer.p1(local13 + local13 + 3); } - Static6.outboundBuffer.p1a(Keyboard.pressedKeys[Keyboard.KEY_CTRL] ? 1 : 0); - Static6.outboundBuffer.p2(Static225.originX + local23); - Static6.outboundBuffer.p2add(Static142.originZ + local27); + Protocol.outboundBuffer.p1a(Keyboard.pressedKeys[Keyboard.KEY_CTRL] ? 1 : 0); + Protocol.outboundBuffer.p2(Static225.originX + local23); + Protocol.outboundBuffer.p2add(Static142.originZ + local27); Static84.anInt2255 = Static84.anIntArray209[0]; Static115.anInt2939 = Static259.anIntArray514[0]; for (@Pc(126) int local126 = 1; local126 < local13; local126++) { arg0--; - Static6.outboundBuffer.p1a(Static259.anIntArray514[arg0] - local23); - Static6.outboundBuffer.p1sub(Static84.anIntArray209[arg0] - local27); + Protocol.outboundBuffer.p1a(Static259.anIntArray514[arg0] - local23); + Protocol.outboundBuffer.p1sub(Static84.anIntArray209[arg0] - local27); } } } diff --git a/client/src/main/java/Static195.java b/client/src/main/java/Static195.java index e47f114..c66cb83 100644 --- a/client/src/main/java/Static195.java +++ b/client/src/main/java/Static195.java @@ -9,16 +9,10 @@ public final class Static195 { @OriginalMember(owner = "client!pk", name = "Y", descriptor = "I") public static int anInt4581; - @OriginalMember(owner = "client!pk", name = "Z", descriptor = "Lclient!ve;") - public static Js5 js5Archive9; - - @OriginalMember(owner = "client!pk", name = "bb", descriptor = "Lclient!na;") + @OriginalMember(owner = "client!pk", name = "bb", descriptor = "Lclient!na;") public static JagString aClass100_859; - @OriginalMember(owner = "client!pk", name = "V", descriptor = "[S") - public static final short[] aShortArray64 = new short[] { -10304, 9104, -1, -1, -1 }; - - @OriginalMember(owner = "client!pk", name = "f", descriptor = "(B)I") + @OriginalMember(owner = "client!pk", name = "f", descriptor = "(B)I") public static int getIdleLoops() { return Keyboard.idleLoops; } @@ -33,19 +27,19 @@ public final class Static195 { if (local21.anInt4819 > 0) { @Pc(54) Npc local54 = Static175.npcs[local21.anInt4819 - 1]; if (local54 != null && local54.xFine >= 0 && local54.xFine < 13312 && local54.zFine >= 0 && local54.zFine < 13312) { - local21.method3705(local54.zFine, Static83.loop, Static207.method3685(local21.anInt4810, local54.xFine, local54.zFine) - local21.anInt4805, local54.xFine); + local21.method3705(local54.zFine, Static83.loop, SceneGraph.getTileHeight(local21.anInt4810, local54.xFine, local54.zFine) - local21.anInt4805, local54.xFine); } } if (local21.anInt4819 < 0) { @Pc(102) int local102 = -local21.anInt4819 - 1; @Pc(107) Player local107; - if (Static16.anInt549 == local102) { + if (PlayerList.selfId == local102) { local107 = PlayerList.self; } else { local107 = Static159.players[local102]; } if (local107 != null && local107.xFine >= 0 && local107.xFine < 13312 && local107.zFine >= 0 && local107.zFine < 13312) { - local21.method3705(local107.zFine, Static83.loop, Static207.method3685(local21.anInt4810, local107.xFine, local107.zFine) - local21.anInt4805, local107.xFine); + local21.method3705(local107.zFine, Static83.loop, SceneGraph.getTileHeight(local21.anInt4810, local107.xFine, local107.zFine) - local21.anInt4805, local107.xFine); } } local21.method3704(Static178.anInt4247); diff --git a/client/src/main/java/Static196.java b/client/src/main/java/Static196.java index 7e0a407..d788778 100644 --- a/client/src/main/java/Static196.java +++ b/client/src/main/java/Static196.java @@ -4,72 +4,13 @@ import org.openrs2.deob.annotation.Pc; public final class Static196 { - @OriginalMember(owner = "client!pl", name = "a", descriptor = "[Lclient!ba;") - public static World[] aClass10_Sub1Array2; - - @OriginalMember(owner = "client!pl", name = "e", descriptor = "[I") + @OriginalMember(owner = "client!pl", name = "e", descriptor = "[I") public static final int[] anIntArray408 = new int[500]; @OriginalMember(owner = "client!pl", name = "f", descriptor = "Lclient!na;") - public static final JagString aClass100_863 = Static28.parse(":tradereq:"); + public static final JagString aClass100_863 = JagString.parse(":tradereq:"); - @OriginalMember(owner = "client!pl", name = "i", descriptor = "I") - public static int anInt4587 = 0; - - @OriginalMember(owner = "client!pl", name = "a", descriptor = "(II)V") - public static void setGameState(@OriginalArg(0) int arg0) { - if (client.gameState == arg0) { - return; - } - if (client.gameState == 0) { - Static163.method3097(); - } - if (arg0 == 40) { - Static49.method1208(); - } - @Pc(37) boolean local37 = arg0 == 5 || arg0 == 10 || arg0 == 28; - if (arg0 != 40 && Static233.aClass95_4 != null) { - Static233.aClass95_4.close(); - Static233.aClass95_4 = null; - } - if (arg0 == 25 || arg0 == 28) { - Static271.anInt5804 = 0; - Static230.anInt5150 = 1; - Static233.loadingScreenState = 0; - Static38.anInt1196 = 1; - Static175.mapFilesMissingCount = 0; - Static116.clear(true); - } - if (arg0 == 25 || arg0 == 10) { - Static123.topBannerRefresh(); - } - if (arg0 == 5) { - Static181.load(Static209.js5Archive8); - } else { - Static119.method2381(); - } - @Pc(106) boolean local106 = client.gameState == 5 || client.gameState == 10 || client.gameState == 28; - if (local106 != local37) { - if (local37) { - Static221.anInt4363 = Static250.titleSong; - if (Preferences.musicVolume == 0) { - Static29.method801(); - } else { - Static257.method526(Static250.titleSong, Static130.js5Archive6, 255); - } - client.js5NetQueue.method2322(false); - } else { - Static29.method801(); - client.js5NetQueue.method2322(true); - } - } - if (GlRenderer.enabled && (arg0 == 25 || arg0 == 28 || arg0 == 40)) { - GlRenderer.method4160(); - } - client.gameState = arg0; - } - - @OriginalMember(owner = "client!pl", name = "a", descriptor = "(ZI)V") + @OriginalMember(owner = "client!pl", name = "a", descriptor = "(ZI)V") public static void method3535(@OriginalArg(0) boolean arg0) { Static221.anIntArray376 = new int[104]; Static139.anIntArray325 = new int[104]; diff --git a/client/src/main/java/Static197.java b/client/src/main/java/Static197.java index 2f58506..e8b668d 100644 --- a/client/src/main/java/Static197.java +++ b/client/src/main/java/Static197.java @@ -14,7 +14,7 @@ public final class Static197 { public static int anInt4620; @OriginalMember(owner = "client!pm", name = "Y", descriptor = "Lclient!na;") - public static final JagString aClass100_872 = Static28.parse("
"); + public static final JagString aClass100_872 = JagString.parse("
"); @OriginalMember(owner = "client!pm", name = "ab", descriptor = "Z") public static boolean aBoolean228 = true; @@ -45,7 +45,7 @@ public final class Static197 { } @OriginalMember(owner = "client!pm", name = "a", descriptor = "(ZIZIZII)V") - public static void method3560(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { + public static void setWindowMode(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { if (arg2) { GlRenderer.quit(); } @@ -62,7 +62,7 @@ public final class Static197 { } } if (arg1 == 3 && GameShell.fullScreenFrame == null) { - method3560(true, Preferences.favoriteWorlds, true, arg3, -1, -1); + setWindowMode(true, Preferences.favoriteWorlds, true, arg3, -1, -1); return; } @Pc(85) Container local85; @@ -100,7 +100,7 @@ public final class Static197 { } client.instance.addCanvas(); Keyboard.start(GameShell.canvas); - Static88.start(GameShell.canvas); + Mouse.start(GameShell.canvas); if (client.mouseWheel != null) { client.mouseWheel.start(GameShell.canvas); } @@ -155,7 +155,7 @@ public final class Static197 { } } if (!GlRenderer.enabled && arg1 > 0) { - method3560(true, 0, true, arg3, -1, -1); + setWindowMode(true, 0, true, arg3, -1, -1); return; } if (arg1 > 0 && arg3 == 0) { diff --git a/client/src/main/java/Static198.java b/client/src/main/java/Static198.java index 7304fbd..4242726 100644 --- a/client/src/main/java/Static198.java +++ b/client/src/main/java/Static198.java @@ -5,13 +5,10 @@ import org.openrs2.deob.annotation.Pc; public final class Static198 { @OriginalMember(owner = "client!q", name = "a", descriptor = "Lclient!na;") - public static final JagString aClass100_260 = Static28.parse(")1a2)1m"); - - @OriginalMember(owner = "client!q", name = "d", descriptor = "[[S") - public static final short[][] aShortArrayArray4 = new short[][] { { 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898 }, { 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10347, 10582, 10429, 10407, 10359, 8414, 9540, 10456, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898 }, { 4300, 3294, 3303, 3264, 4506, 4382, 4387, 5293, 7622, 7384, 8412, 7496, 86, 123, 111, 99, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 13766, 13745, 13726, 13890, 13743, 13852, 17602, 18605, 21660, 24000, 24997, 24088, 27972, 25903, 26904, 27193, 27175, 27156, 30020, 28975, 29976, 12482, 13485, 10392, 10692, 10669, 10776, 6717, 6695, 7830, 6971, 6951, 5910, 3389, 3369, 3356, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898, 10, 30, 50, 70, 90, 110, 310, 684, 704, 556, 940, 960, 6454, 6952, 6972, 2358, 2732, 2752, 10550, 10924, 10944, 10310, 10556, 10576, 14646, 15020, 15040, 19766, 20140, 20160, -29386, -29012, -28992, 31030, 31276, 31296, -24266, -23892, -23872, -19146, -18772, -18752, -14026, -13652, -13632, -6858, -6484, -6464, 522, 542, 6794, 6814, 11018, 11038, 14986, 15006, 21130, 21150, -28918, -28898, -22006, -21986, -12918, -12898 } }; + public static final JagString aClass100_260 = JagString.parse(")1a2)1m"); @OriginalMember(owner = "client!q", name = "h", descriptor = "Lclient!na;") - public static final JagString aClass100_264 = Static28.parse("Card:"); + public static final JagString aClass100_264 = JagString.parse("Card:"); @OriginalMember(owner = "client!q", name = "a", descriptor = "(BZII)Lclient!na;") public static JagString method1025(@OriginalArg(1) boolean arg0, @OriginalArg(3) int arg1) { @@ -55,7 +52,7 @@ public final class Static198 { Static65.anInt1951 = -1; return; } - @Pc(38) int local38 = Static207.method3685(Static55.level, arg5, arg2) - arg3; + @Pc(38) int local38 = SceneGraph.getTileHeight(Static55.level, arg5, arg2) - arg3; @Pc(42) int local42 = arg2 - Static134.renderZ; @Pc(46) int local46 = local38 - Static5.anInt40; @Pc(50) int local50 = arg5 - Static138.renderX; @@ -84,6 +81,6 @@ public final class Static198 { @OriginalMember(owner = "client!q", name = "a", descriptor = "(B)I") public static int method1029() { - return Static250.aClass99_33.method3100(); + return PlayerAppearance.aClass99_33.method3100(); } } diff --git a/client/src/main/java/Static199.java b/client/src/main/java/Static199.java index 85e326f..d4381dc 100644 --- a/client/src/main/java/Static199.java +++ b/client/src/main/java/Static199.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 Static199 { @@ -13,38 +12,15 @@ public final class Static199 { @OriginalMember(owner = "client!qc", name = "K", descriptor = "Lclient!sc;") public static HashTable aClass133_20 = new HashTable(16); - @OriginalMember(owner = "client!qc", name = "P", descriptor = "I") - public static int mainLoadPercentage = 10; - @OriginalMember(owner = "client!qc", name = "U", descriptor = "I") public static int rectDebug = 0; @OriginalMember(owner = "client!qc", name = "ab", descriptor = "[I") public static final int[] anIntArray417 = new int[1000]; - @OriginalMember(owner = "client!qc", name = "a", descriptor = "(ZI)Lclient!ni;") - public static FluType method3593(@OriginalArg(1) int arg0) { - @Pc(10) FluType local10 = (FluType) Static83.aClass99_3.get((long) arg0); - if (local10 != null) { - return local10; - } - @Pc(27) byte[] local27 = Static182.aClass153_77.getFile(1, arg0); - local10 = new FluType(); - if (local27 != null) { - local10.method3217(arg0, new Buffer(local27)); - } - Static83.aClass99_3.put(local10, (long) arg0); - return local10; - } - @OriginalMember(owner = "client!qc", name = "a", descriptor = "(BI)I") public static int method3594(@OriginalArg(1) int arg0) { return arg0 >> 11 & 0x7F; } - @OriginalMember(owner = "client!qc", name = "a", descriptor = "(ZLclient!ve;)V") - public static void init(@OriginalArg(1) Js5 arg0) { - Static35.aClass153_22 = arg0; - FloTypeList.capacity = Static35.aClass153_22.method4504(4); - } } diff --git a/client/src/main/java/Static2.java b/client/src/main/java/Static2.java index e94e14b..2cf6cf9 100644 --- a/client/src/main/java/Static2.java +++ b/client/src/main/java/Static2.java @@ -13,13 +13,7 @@ public final class Static2 { @OriginalMember(owner = "client!aa", name = "a", descriptor = "I") public static int anInt7 = 0; - @OriginalMember(owner = "client!aa", name = "h", descriptor = "[S") - public static final short[] aShortArray1 = new short[] { 960, 957, -21568, -21571, 22464 }; - - @OriginalMember(owner = "client!aa", name = "l", descriptor = "Z") - public static boolean aBoolean1 = false; - - @OriginalMember(owner = "client!aa", name = "a", descriptor = "(SI)Z") + @OriginalMember(owner = "client!aa", name = "a", descriptor = "(SI)Z") public static boolean method5(@OriginalArg(0) short arg0) { if (arg0 == 47 || arg0 == 5 || arg0 == 43 || arg0 == 35 || arg0 == 58 || arg0 == 22 || arg0 == 40 || arg0 == 3) { return true; @@ -55,7 +49,7 @@ public final class Static2 { } if (arg1 == 1 && local23.anObjectArray8 != null) { if (local23.createdComponentId >= 0) { - @Pc(103) Component local103 = Static5.getComponent(local23.id); + @Pc(103) Component local103 = InterfaceList.getComponent(local23.id); if (local103 == null || local103.createdComponents == null || local23.createdComponentId >= local103.createdComponents.length || local103.createdComponents[local23.createdComponentId] != local23) { continue; } @@ -89,7 +83,7 @@ public final class Static2 { @Pc(61) int local61 = 0; @Pc(64) int local64 = local53 + 1; Static84.anIntArray209[0] = arg3; - @Pc(71) int[][] local71 = Static148.collisionMaps[Static55.level].anIntArrayArray30; + @Pc(71) int[][] local71 = PathFinder.collisionMaps[Static55.level].anIntArrayArray30; @Pc(193) int local193; while (local61 != local64) { local3 = Static259.anIntArray514[local61]; @@ -100,16 +94,16 @@ public final class Static2 { break; } if (arg1 != 0) { - if ((arg1 < 5 || arg1 == 10) && Static148.collisionMaps[Static55.level].method3042(arg4, local3, local8, arg8, arg1 - 1, 2, arg7)) { + if ((arg1 < 5 || arg1 == 10) && PathFinder.collisionMaps[Static55.level].method3042(arg4, local3, local8, arg8, arg1 - 1, 2, arg7)) { local59 = true; break; } - if (arg1 < 10 && Static148.collisionMaps[Static55.level].method3046(arg4, arg1 - 1, arg8, local8, 2, arg7, local3)) { + if (arg1 < 10 && PathFinder.collisionMaps[Static55.level].method3046(arg4, arg1 - 1, arg8, local8, 2, arg7, local3)) { local59 = true; break; } } - if (arg0 != 0 && arg6 != 0 && Static148.collisionMaps[Static55.level].method3052(arg8, local8, local3, 2, arg0, arg2, arg4, arg6)) { + if (arg0 != 0 && arg6 != 0 && PathFinder.collisionMaps[Static55.level].method3052(arg8, local8, local3, 2, arg0, arg2, arg4, arg6)) { local59 = true; break; } @@ -247,9 +241,9 @@ public final class Static2 { @OriginalMember(owner = "client!aa", name = "a", descriptor = "(IZI)V") public static void method10(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { - Static6.outboundBuffer.p1isaac(132); - Static6.outboundBuffer.p4rme(arg1); - Static6.outboundBuffer.p2le(arg0); + Protocol.outboundBuffer.p1isaac(132); + Protocol.outboundBuffer.p4rme(arg1); + Protocol.outboundBuffer.p2le(arg0); } @OriginalMember(owner = "client!aa", name = "a", descriptor = "(BLclient!be;)V") diff --git a/client/src/main/java/Static20.java b/client/src/main/java/Static20.java index e9d874c..5c24c1b 100644 --- a/client/src/main/java/Static20.java +++ b/client/src/main/java/Static20.java @@ -16,10 +16,7 @@ public final class Static20 { @OriginalMember(owner = "client!bj", name = "V", descriptor = "I") public static final int anInt671 = 3353893; - @OriginalMember(owner = "client!bj", name = "Y", descriptor = "I") - public static int anInt673 = 0; - - @OriginalMember(owner = "client!bj", name = "a", descriptor = "(III)J") + @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]; return local7 == null || local7.aClass15_1 == null ? 0L : local7.aClass15_1.aLong26; diff --git a/client/src/main/java/Static200.java b/client/src/main/java/Static200.java index 4ab91a5..87a3e26 100644 --- a/client/src/main/java/Static200.java +++ b/client/src/main/java/Static200.java @@ -3,13 +3,7 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static200 { - @OriginalMember(owner = "client!qe", name = "r", descriptor = "[S") - public static short[] aShortArray65; - - @OriginalMember(owner = "client!qe", name = "t", descriptor = "[I") - public static final int[] anIntArray421 = new int[50]; - - @OriginalMember(owner = "client!qe", name = "b", descriptor = "(II)V") + @OriginalMember(owner = "client!qe", name = "b", descriptor = "(II)V") public static void method3628(@OriginalArg(1) int arg0) { Static231.anInt5204--; if (Static231.anInt5204 == arg0) { diff --git a/client/src/main/java/Static201.java b/client/src/main/java/Static201.java index f886aa5..1e90023 100644 --- a/client/src/main/java/Static201.java +++ b/client/src/main/java/Static201.java @@ -11,20 +11,20 @@ public final class Static201 { public static int anInt1862 = 0; @OriginalMember(owner = "client!qf", name = "N", descriptor = "Lclient!na;") - public static final JagString aClass100_406 = Static28.parse("::cardmem"); + public static final JagString aClass100_406 = JagString.parse("::cardmem"); @OriginalMember(owner = "client!qf", name = "Q", descriptor = "Lclient!na;") - public static final JagString aClass100_407 = Static28.parse(" )2> "); + public static final JagString aClass100_407 = JagString.parse(" )2> "); @OriginalMember(owner = "client!qf", name = "R", descriptor = "Lclient!na;") - public static final JagString aClass100_408 = Static28.parse(" )2> "); + public static final JagString aClass100_408 = JagString.parse(" )2> "); @OriginalMember(owner = "client!qf", name = "X", descriptor = "Lclient!be;") public static Component aClass13_13 = null; @OriginalMember(owner = "client!qf", name = "a", descriptor = "(BII)Lclient!be;") public static Component method1418(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - @Pc(7) Component local7 = Static5.getComponent(arg0); + @Pc(7) Component local7 = InterfaceList.getComponent(arg0); if (arg1 == -1) { return local7; } else if (local7 == null || local7.createdComponents == null || local7.createdComponents.length <= arg1) { diff --git a/client/src/main/java/Static202.java b/client/src/main/java/Static202.java index b4bf384..ae078e2 100644 --- a/client/src/main/java/Static202.java +++ b/client/src/main/java/Static202.java @@ -4,26 +4,14 @@ import org.openrs2.deob.annotation.Pc; public final class Static202 { - @OriginalMember(owner = "client!qg", name = "ab", descriptor = "Lclient!ve;") - public static Js5 aClass153_84; - @OriginalMember(owner = "client!qg", name = "U", descriptor = "Lclient!na;") - public static final JagString aClass100_891 = Static28.parse(""); + public static final JagString aClass100_891 = JagString.parse(""); - @OriginalMember(owner = "client!qg", name = "W", descriptor = "Z") - public static boolean aBoolean233 = false; - - @OriginalMember(owner = "client!qg", name = "Y", descriptor = "[I") + @OriginalMember(owner = "client!qg", name = "Y", descriptor = "[I") public static final int[] anIntArray424 = new int[5]; @OriginalMember(owner = "client!qg", name = "Z", descriptor = "Lclient!na;") - public static final JagString aClass100_892 = Static28.parse("mem="); - - @OriginalMember(owner = "client!qg", name = "h", descriptor = "(I)V") - public static void method3653() { - Static231.aClass99_29.clear(); - Static219.sprites.clear(); - } + public static final JagString aClass100_892 = JagString.parse("mem="); @OriginalMember(owner = "client!qg", name = "a", descriptor = "(Lsignlink!ll;Lclient!wa;IB)V") public static void method3654(@OriginalArg(0) SignLink arg0, @OriginalArg(1) Buffer arg1, @OriginalArg(2) int arg2) { @@ -94,7 +82,7 @@ public final class Static202 { @OriginalMember(owner = "client!qg", name = "a", descriptor = "(IZI)V") public static void setVarbitClient(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { - @Pc(7) VarbitType local7 = Static125.method2449(arg0); + @Pc(7) VarbitType local7 = VarbitTypeList.get(arg0); @Pc(10) int local10 = local7.endBit; @Pc(16) int local16 = local7.startBit; @Pc(19) int local19 = local7.baseVar; @@ -125,18 +113,4 @@ public final class Static202 { } } - @OriginalMember(owner = "client!qg", name = "d", descriptor = "(II)Lclient!ia;") - public static CursorType method3660(@OriginalArg(0) int arg0) { - @Pc(10) CursorType local10 = (CursorType) Static79.aClass99_11.get((long) arg0); - if (local10 != null) { - return local10; - } - @Pc(20) byte[] local20 = Static153.aClass153_57.getFile(33, arg0); - local10 = new CursorType(); - if (local20 != null) { - local10.decode(new Buffer(local20), arg0); - } - Static79.aClass99_11.put(local10, (long) arg0); - return local10; - } } diff --git a/client/src/main/java/Static203.java b/client/src/main/java/Static203.java index bca6ab9..494ca9c 100644 --- a/client/src/main/java/Static203.java +++ b/client/src/main/java/Static203.java @@ -6,17 +6,11 @@ import org.openrs2.deob.annotation.Pc; public final class Static203 { - @OriginalMember(owner = "client!qh", name = "e", descriptor = "[Lclient!ee;") - public static Class32[] aClass32Array1; - - @OriginalMember(owner = "client!qh", name = "g", descriptor = "Lclient!ve;") - public static Js5 aClass153_85; - - @OriginalMember(owner = "client!qh", name = "c", descriptor = "Lclient!na;") - public static final JagString aClass100_893 = Static28.parse("Memory before cleanup="); + @OriginalMember(owner = "client!qh", name = "c", descriptor = "Lclient!na;") + public static final JagString aClass100_893 = JagString.parse("Memory before cleanup="); @OriginalMember(owner = "client!qh", name = "i", descriptor = "Lclient!na;") - public static final JagString aClass100_894 = Static28.parse("Mem:"); + public static final JagString aClass100_894 = JagString.parse("Mem:"); @OriginalMember(owner = "client!qh", name = "a", descriptor = "(Z)V") public static void method3662() { diff --git a/client/src/main/java/Static204.java b/client/src/main/java/Static204.java index 4323c83..9b1b37c 100644 --- a/client/src/main/java/Static204.java +++ b/client/src/main/java/Static204.java @@ -7,9 +7,6 @@ public final class Static204 { @OriginalMember(owner = "client!qi", name = "z", descriptor = "Lclient!qf;") public static Sprite aClass3_Sub2_Sub1_10; - @OriginalMember(owner = "client!qi", name = "C", descriptor = "Lclient!ei;") - public static MixerPcmStream soundStream; - @OriginalMember(owner = "client!qi", name = "t", descriptor = "I") public static int anInt4762 = 0; @@ -22,18 +19,8 @@ public final class Static204 { @OriginalMember(owner = "client!qi", name = "x", descriptor = "[I") public static final int[] anIntArray425 = new int[] { 0, 1, 2, 3, 4, 5, 6, 14 }; - @OriginalMember(owner = "client!qi", name = "A", descriptor = "I") - public static int anInt4765 = -1; - - @OriginalMember(owner = "client!qi", name = "B", descriptor = "Lclient!na;") - public static final JagString aClass100_896 = Static28.parse(""); - - @OriginalMember(owner = "client!qi", name = "e", descriptor = "(B)V") - public static void method3673() { - Static93.aClass99_13.clear(); - Static125.aClass99_18.clear(); - Static262.headModels.clear(); - } + @OriginalMember(owner = "client!qi", name = "B", descriptor = "Lclient!na;") + public static final JagString aClass100_896 = JagString.parse(""); @OriginalMember(owner = "client!qi", name = "b", descriptor = "(II)I") public static int method3674(@OriginalArg(0) int arg0) { diff --git a/client/src/main/java/Static205.java b/client/src/main/java/Static205.java index 0ae1c69..6cc8b03 100644 --- a/client/src/main/java/Static205.java +++ b/client/src/main/java/Static205.java @@ -3,9 +3,6 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static205 { - @OriginalMember(owner = "client!qj", name = "i", descriptor = "[I") - public static final int[] keyChars = new int[128]; - @OriginalMember(owner = "client!qj", name = "a", descriptor = "(Lclient!be;BI)Lclient!na;") public static JagString method3677(@OriginalArg(0) Component arg0, @OriginalArg(2) int arg1) { if (!Static36.method940(arg0).method503(arg1) && arg0.anObjectArray29 == null) { diff --git a/client/src/main/java/Static206.java b/client/src/main/java/Static206.java index a392e55..e807c15 100644 --- a/client/src/main/java/Static206.java +++ b/client/src/main/java/Static206.java @@ -7,14 +7,11 @@ public final class Static206 { @OriginalMember(owner = "client!qk", name = "c", descriptor = "[I") public static int[] anIntArray427; - @OriginalMember(owner = "client!qk", name = "g", descriptor = "Lclient!ma;") - public static BufferedSocket js5Socket; - - @OriginalMember(owner = "client!qk", name = "a", descriptor = "Lclient!na;") - public static final JagString aClass100_899 = Static28.parse("0(U"); + @OriginalMember(owner = "client!qk", name = "a", descriptor = "Lclient!na;") + public static final JagString aClass100_899 = JagString.parse("0(U"); @OriginalMember(owner = "client!qk", name = "b", descriptor = "Lclient!na;") - public static final JagString aClass100_900 = Static28.parse("tbrefresh"); + public static final JagString aClass100_900 = JagString.parse("tbrefresh"); @OriginalMember(owner = "client!qk", name = "f", descriptor = "I") public static int anInt4773 = 0; @@ -53,8 +50,4 @@ public final class Static206 { return local17; } - @OriginalMember(owner = "client!qk", name = "a", descriptor = "(ZI)I") - public static int method3681(@OriginalArg(1) int arg0) { - return arg0 >>> 8; - } } diff --git a/client/src/main/java/Static207.java b/client/src/main/java/Static207.java index 55e5e42..2c6db7a 100644 --- a/client/src/main/java/Static207.java +++ b/client/src/main/java/Static207.java @@ -1,22 +1,17 @@ -import java.io.IOException; -import java.net.Socket; import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; public final class Static207 { - @OriginalMember(owner = "client!ql", name = "c", descriptor = "Z") - public static boolean aBoolean236 = false; - - @OriginalMember(owner = "client!ql", name = "d", descriptor = "I") + @OriginalMember(owner = "client!ql", name = "d", descriptor = "I") public static int anInt4778 = 0; @OriginalMember(owner = "client!ql", name = "h", descriptor = "Lclient!na;") - public static final JagString aClass100_903 = Static28.parse("Hidden)2"); + public static final JagString aClass100_903 = JagString.parse("Hidden)2"); @OriginalMember(owner = "client!ql", name = "i", descriptor = "Lclient!na;") - public static final JagString aClass100_904 = Static28.parse("::wm2"); + public static final JagString aClass100_904 = JagString.parse("::wm2"); @OriginalMember(owner = "client!ql", name = "a", descriptor = "(IFII[[I[[II[[FIBIZLclient!hg;[[FII[[FI)I") public static int method3683(@OriginalArg(0) int arg0, @OriginalArg(1) float arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int[][] arg4, @OriginalArg(5) int[][] arg5, @OriginalArg(6) int arg6, @OriginalArg(7) float[][] arg7, @OriginalArg(8) int arg8, @OriginalArg(10) int arg9, @OriginalArg(11) boolean arg10, @OriginalArg(12) GlTile arg11, @OriginalArg(13) float[][] arg12, @OriginalArg(14) int arg13, @OriginalArg(15) int arg14, @OriginalArg(16) float[][] arg15, @OriginalArg(17) int arg16) { @@ -85,125 +80,4 @@ public final class Static207 { return arg11.method1941(local420, local413, local405, local78, local66, local72, arg10 ? local80 & 0xFFFFFF00 : local80, arg4 == null ? 0.0F : (float) (local413 - Static182.method3361(arg14, arg13, arg4, arg6, arg16)) / arg1); } - @OriginalMember(owner = "client!ql", name = "b", descriptor = "(I)I") - public static int fetch() { - try { - if (Static82.anInt2231 == 0) { - if (MonotonicClock.currentTimeMillis() - 5000L < Static231.aLong174) { - return 0; - } - System.out.println(Static208.worldListPort); - Static72.aClass212_3 = GameShell.signLink.openSocket(Static143.worldListHostname, Static208.worldListPort); - Static15.aLong18 = MonotonicClock.currentTimeMillis(); - Static82.anInt2231 = 1; - } - if (Static15.aLong18 + 30000L < MonotonicClock.currentTimeMillis()) { - return Static10.method347(1000); - } - @Pc(82) int local82; - @Pc(124) int local124; - if (Static82.anInt2231 == 1) { - if (Static72.aClass212_3.status == 2) { - return Static10.method347(1001); - } - if (Static72.aClass212_3.status != 1) { - return -1; - } - Protocol.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, GameShell.signLink); - Static6.outboundBuffer.offset = 0; - Static72.aClass212_3 = null; - local82 = 0; - if (Static61.aBoolean109) { - local82 = Static80.anInt4702; - } - Static6.outboundBuffer.p1(255); - Static6.outboundBuffer.p4(local82); - Protocol.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); - if (client.musicChannel != null) { - client.musicChannel.method3571(); - } - if (client.soundChannel != null) { - client.soundChannel.method3571(); - } - local124 = Protocol.socket.read(); - if (client.musicChannel != null) { - client.musicChannel.method3571(); - } - if (client.soundChannel != null) { - client.soundChannel.method3571(); - } - if (local124 != 0) { - return Static10.method347(local124); - } - Static82.anInt2231 = 2; - } - if (Static82.anInt2231 == 2) { - if (Protocol.socket.available() < 2) { - return -1; - } - Static116.anInt2961 = Protocol.socket.read(); - Static116.anInt2961 <<= 0x8; - Static116.anInt2961 += Protocol.socket.read(); - Static82.anInt2231 = 3; - Static141.anInt3469 = 0; - Static229.aByteArray70 = new byte[Static116.anInt2961]; - } - if (Static82.anInt2231 != 3) { - return -1; - } - local82 = Protocol.socket.available(); - if (local82 < 1) { - return -1; - } - if (local82 > Static116.anInt2961 - Static141.anInt3469) { - local82 = Static116.anInt2961 - Static141.anInt3469; - } - Protocol.socket.read(Static141.anInt3469, local82, Static229.aByteArray70); - Static141.anInt3469 += local82; - if (Static141.anInt3469 < Static116.anInt2961) { - return -1; - } else if (Static170.method2572(Static229.aByteArray70)) { - Static101.worlds = new World[Static106.anInt2871]; - local124 = 0; - for (@Pc(240) int local240 = Static19.anInt636; local240 <= Static171.anInt4157; local240++) { - @Pc(247) World local247 = Static54.getWorld(local240); - if (local247 != null) { - Static101.worlds[local124++] = local247; - } - } - Protocol.socket.close(); - Protocol.socket = null; - Static127.anInt3132 = 0; - Static82.anInt2231 = 0; - Static229.aByteArray70 = null; - Static231.aLong174 = MonotonicClock.currentTimeMillis(); - return 0; - } else { - return Static10.method347(1002); - } - } catch (@Pc(277) IOException local277) { - return Static10.method347(1003); - } - } - - @OriginalMember(owner = "client!ql", name = "a", descriptor = "(IIII)I") - public static int method3685(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { - if (Static83.activeTileHeightMap == null) { - return 0; - } - @Pc(12) int local12 = arg1 >> 7; - @Pc(16) int local16 = arg2 >> 7; - if (local12 < 0 || local16 < 0 || local12 > 103 || local16 > 103) { - return 0; - } - @Pc(36) int local36 = arg1 & 0x7F; - @Pc(40) int local40 = arg2 & 0x7F; - @Pc(42) int local42 = arg0; - if (arg0 < 3 && (Static12.tileSettings[1][local12][local16] & 0x2) == 2) { - local42 = arg0 + 1; - } - @Pc(91) int local91 = local36 * Static83.activeTileHeightMap[local42][local12 + 1][local16 + 1] + Static83.activeTileHeightMap[local42][local12][local16 + 1] * (128 - local36) >> 7; - @Pc(118) int local118 = local36 * Static83.activeTileHeightMap[local42][local12 + 1][local16] + (128 - local36) * Static83.activeTileHeightMap[local42][local12][local16] >> 7; - return local40 * local91 + (128 - local40) * local118 >> 7; - } } diff --git a/client/src/main/java/Static208.java b/client/src/main/java/Static208.java index 5e57641..48985c6 100644 --- a/client/src/main/java/Static208.java +++ b/client/src/main/java/Static208.java @@ -2,12 +2,6 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static208 { - @OriginalMember(owner = "client!r", name = "f", descriptor = "I") - public static int worldListPort; - - @OriginalMember(owner = "client!r", name = "b", descriptor = "[Lclient!tk;") - public static final SeqType[] aClass144Array2 = new SeqType[14]; - @OriginalMember(owner = "client!r", name = "d", descriptor = "Z") public static final boolean aBoolean237 = false; } diff --git a/client/src/main/java/Static209.java b/client/src/main/java/Static209.java index 6c6f307..85c077d 100644 --- a/client/src/main/java/Static209.java +++ b/client/src/main/java/Static209.java @@ -4,12 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static209 { - @OriginalMember(owner = "client!ra", name = "s", descriptor = "I") - public static int port; - - @OriginalMember(owner = "client!ra", name = "K", descriptor = "Lclient!ve;") - public static Js5 js5Archive8; - @OriginalMember(owner = "client!ra", name = "J", descriptor = "I") public static int miscTransmitAt = 0; @@ -19,13 +13,13 @@ public final class Static209 { @OriginalMember(owner = "client!ra", name = "a", descriptor = "(ILclient!pb;BII)V") public static void method3701(@OriginalArg(0) int arg0, @OriginalArg(1) LocType arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { for (@Pc(10) AreaSound local10 = (AreaSound) Static3.aClass69_135.method2289(); local10 != null; local10 = (AreaSound) Static3.aClass69_135.method2288()) { - if (arg3 == local10.anInt2033 && local10.anInt2041 == arg0 * 128 && local10.anInt2029 == arg2 * 128 && arg1.anInt4426 == local10.locType.anInt4426) { + if (arg3 == local10.anInt2033 && local10.anInt2041 == arg0 * 128 && local10.anInt2029 == arg2 * 128 && arg1.id == local10.locType.id) { if (local10.primaryStream != null) { - Static204.soundStream.removeSubStream(local10.primaryStream); + client.soundStream.removeSubStream(local10.primaryStream); local10.primaryStream = null; } if (local10.secondaryStream != null) { - Static204.soundStream.removeSubStream(local10.secondaryStream); + client.soundStream.removeSubStream(local10.secondaryStream); local10.secondaryStream = null; } local10.unlink(); @@ -39,13 +33,6 @@ public final class Static209 { return arg0 == (-arg0 & arg0); } - @OriginalMember(owner = "client!ra", name = "c", descriptor = "(BI)V") - public static void method3706() { - Static93.aClass99_13.method3102(5); - Static125.aClass99_18.method3102(5); - Static262.headModels.method3102(5); - } - @OriginalMember(owner = "client!ra", name = "a", descriptor = "(BIII)V") public static void method3707(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { @Pc(12) DelayedStateChange local12 = Static238.method4143(9, arg0); diff --git a/client/src/main/java/Static210.java b/client/src/main/java/Static210.java index 6ff5177..2d2dd7e 100644 --- a/client/src/main/java/Static210.java +++ b/client/src/main/java/Static210.java @@ -24,14 +24,4 @@ public final class Static210 { Static234.method4017(GameShell.canvasHeight, arg0, InterfaceList.topLevelInterface, GameShell.canvasWidth); } - @OriginalMember(owner = "client!rb", name = "a", descriptor = "(Lclient!wa;Z)Lclient!bn;") - public static Map method3713(@OriginalArg(0) Buffer arg0) { - @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.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 4a52cde..e395d98 100644 --- a/client/src/main/java/Static211.java +++ b/client/src/main/java/Static211.java @@ -14,13 +14,10 @@ public final class Static211 { public static boolean aBoolean72 = false; @OriginalMember(owner = "client!rc", name = "G", descriptor = "Lclient!na;") - public static final JagString aClass100_230 = Static28.parse(""); + public static final JagString aClass100_230 = JagString.parse(""); @OriginalMember(owner = "client!rc", name = "I", descriptor = "Lclient!na;") - public static final JagString aClass100_231 = Static28.parse(")3)3)3"); - - @OriginalMember(owner = "client!rc", name = "K", descriptor = "Lclient!na;") - public static final JagString aClass100_232 = Static28.parse("::rect_debug"); + public static final JagString aClass100_231 = JagString.parse(")3)3)3"); @OriginalMember(owner = "client!rc", name = "M", descriptor = "Z") public static boolean aBoolean73 = false; @@ -33,7 +30,7 @@ public final class Static211 { @OriginalMember(owner = "client!rc", name = "a", descriptor = "(Z)V") public static void method924() { - Static244.models.clear(); + ObjTypeList.models.clear(); } @OriginalMember(owner = "client!rc", name = "d", descriptor = "(I)V") @@ -46,8 +43,8 @@ public final class Static211 { } AudioChannel.init(Preferences.stereo); client.musicChannel = AudioChannel.create(22050, GameShell.signLink, GameShell.canvas, 0); - client.musicChannel.setStream(Static148.musicStream); + client.musicChannel.setStream(client.musicStream); client.soundChannel = AudioChannel.create(2048, GameShell.signLink, GameShell.canvas, 1); - client.soundChannel.setStream(Static204.soundStream); + client.soundChannel.setStream(client.soundStream); } } diff --git a/client/src/main/java/Static212.java b/client/src/main/java/Static212.java deleted file mode 100644 index a548fd7..0000000 --- a/client/src/main/java/Static212.java +++ /dev/null @@ -1,7 +0,0 @@ -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static212 { - - @OriginalMember(owner = "client!rd", name = "d", descriptor = "[F") - public static final float[] aFloatArray24 = new float[4]; -} diff --git a/client/src/main/java/Static213.java b/client/src/main/java/Static213.java index 117edfd..1a888f7 100644 --- a/client/src/main/java/Static213.java +++ b/client/src/main/java/Static213.java @@ -5,31 +5,4 @@ public final class Static213 { @OriginalMember(owner = "client!re", name = "y", descriptor = "I") public static int anInt4851; - @OriginalMember(owner = "client!re", name = "B", descriptor = "Lclient!ve;") - public static Js5 js5Archive0; - - @OriginalMember(owner = "client!re", name = "a", descriptor = "(I)V") - public static void clean() { - Static8.method119(); - Static71.method1443(); - Static238.method4142(); - Static258.method4415(); - Static209.method3706(); - Static190.method3447(); - Static72.method1570(); - Static137.method2666(); - Static269.method2221(); - Static24.method666(); - Static19.method586(); - Static276.method4615(); - Static25.method715(); - Static25.method716(); - Static279.method4662(); - Static53.method1289(); - Static158.method3010(); - Static134.method2621(); - Static73.aClass99_10.method3102(5); - Static139.aClass99_22.method3102(5); - } - } diff --git a/client/src/main/java/Static214.java b/client/src/main/java/Static214.java index 40d3e54..0826019 100644 --- a/client/src/main/java/Static214.java +++ b/client/src/main/java/Static214.java @@ -7,10 +7,7 @@ public final class Static214 { @OriginalMember(owner = "client!rg", name = "y", descriptor = "I") public static int anInt5577; - @OriginalMember(owner = "client!rg", name = "z", descriptor = "Lclient!ve;") - public static Js5 js5Archive11; - - @OriginalMember(owner = "client!rg", name = "r", descriptor = "[Lclient!na;") + @OriginalMember(owner = "client!rg", name = "r", descriptor = "[Lclient!na;") public static final JagString[] aClass100Array170 = new JagString[200]; @OriginalMember(owner = "client!rg", name = "s", descriptor = "I") @@ -48,23 +45,6 @@ public final class Static214 { return WorldMap.currentMap; } - @OriginalMember(owner = "client!rg", name = "b", descriptor = "(II)Lclient!me;") - public static NpcType get(@OriginalArg(0) int arg0) { - @Pc(10) NpcType local10 = (NpcType) Static93.aClass99_13.get((long) arg0); - if (local10 != null) { - return local10; - } - @Pc(26) byte[] local26 = Static58.aClass153_28.getFile(Static60.method1447(arg0), Static179.method3322(arg0)); - local10 = new NpcType(); - local10.id = arg0; - if (local26 != null) { - local10.decode(new Buffer(local26)); - } - local10.method2942(); - Static93.aClass99_13.put(local10, (long) arg0); - return local10; - } - @OriginalMember(owner = "client!rg", name = "a", descriptor = "(IIIIIIIII)V") public static void method4364(@OriginalArg(0) int arg0, @OriginalArg(1) 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(7) int local7 = arg2 - arg7; diff --git a/client/src/main/java/Static216.java b/client/src/main/java/Static216.java index 1f2f89c..235e24c 100644 --- a/client/src/main/java/Static216.java +++ b/client/src/main/java/Static216.java @@ -1,311 +1,11 @@ -import java.io.IOException; -import java.net.Socket; import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; public final class Static216 { - @OriginalMember(owner = "client!ri", name = "c", descriptor = "Lclient!ve;") - public static Js5 aClass153_31; - @OriginalMember(owner = "client!ri", name = "d", descriptor = "[I") public static int[] anIntArray188; - @OriginalMember(owner = "client!ri", name = "b", descriptor = "[I") - public static final int[] anIntArray187 = new int[14]; - - @OriginalMember(owner = "client!ri", name = "a", descriptor = "(B)V") - public static void loop() { - if (Static184.loginStep == 0 || Static184.loginStep == 5) { - return; - } - try { - if (++Static92.anInt2430 > 2000) { - if (Protocol.socket != null) { - Protocol.socket.close(); - Protocol.socket = null; - } - if (Static276.anInt5816 >= 1) { - Static266.reply = -5; - Static184.loginStep = 0; - return; - } - Static92.anInt2430 = 0; - if (Static209.port == Static271.defaultPort) { - Static209.port = Static55.alternatePort; - } else { - Static209.port = Static271.defaultPort; - } - Static184.loginStep = 1; - Static276.anInt5816++; - } - if (Static184.loginStep == 1) { - Static72.aClass212_3 = GameShell.signLink.openSocket(Static60.hostname, Static209.port); - Static184.loginStep = 2; - } - if (Static184.loginStep == 2) { - if (Static72.aClass212_3.status == 2) { - throw new IOException(); - } - if (Static72.aClass212_3.status != 1) { - return; - } - Protocol.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, GameShell.signLink); - Static72.aClass212_3 = null; - @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); - Protocol.socket.write(Static6.outboundBuffer.data, 2); - if (client.musicChannel != null) { - client.musicChannel.method3571(); - } - if (client.soundChannel != null) { - client.soundChannel.method3571(); - } - @Pc(150) int local150 = Protocol.socket.read(); - if (client.musicChannel != null) { - client.musicChannel.method3571(); - } - if (client.soundChannel != null) { - client.soundChannel.method3571(); - } - if (local150 != 0) { - Static266.reply = local150; - Static184.loginStep = 0; - Protocol.socket.close(); - Protocol.socket = null; - return; - } - Static184.loginStep = 3; - } - if (Static184.loginStep == 3) { - if (Protocol.socket.available() < 8) { - return; - } - 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]; - Static6.outboundBuffer.offset = 0; - local210[2] = (int) (Static193.aLong147 >> 32); - local210[3] = (int) Static193.aLong147; - local210[1] = (int) (Math.random() * 9.9999999E7D); - local210[0] = (int) (Math.random() * 9.9999999E7D); - Static6.outboundBuffer.p1(10); - Static6.outboundBuffer.p4(local210[0]); - Static6.outboundBuffer.p4(local210[1]); - Static6.outboundBuffer.p4(local210[2]); - Static6.outboundBuffer.p4(local210[3]); - 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("")); - Static6.outboundBuffer.pjstr(Static28.parse("")); - } - Static6.outboundBuffer.encryptRsa(GlobalConfig.RSA_EXPONENT, GlobalConfig.RSA_MODULUS); - Static17.aClass3_Sub15_Sub1_2.offset = 0; - if (client.gameState == 40) { - Static17.aClass3_Sub15_Sub1_2.p1(18); - } else { - Static17.aClass3_Sub15_Sub1_2.p1(16); - } - int offset = 0; - if (GlobalConfig.LOGIN_FAKE_IDX28) { - // 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(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(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(Preferences.antiAliasingMode); - Static140.method2705(Static17.aClass3_Sub15_Sub1_2); - 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); - Static17.aClass3_Sub15_Sub1_2.p4(Static213.js5Archive0.method4480()); - Static17.aClass3_Sub15_Sub1_2.p4(Static249.js5Archive1.method4480()); - Static17.aClass3_Sub15_Sub1_2.p4(Static274.js5Archive2.method4480()); - Static17.aClass3_Sub15_Sub1_2.p4(Static41.js5Archive3.method4480()); - Static17.aClass3_Sub15_Sub1_2.p4(Static248.js5Archive4.method4480()); - Static17.aClass3_Sub15_Sub1_2.p4(Static26.js5Archive5.method4480()); - Static17.aClass3_Sub15_Sub1_2.p4(Static130.js5Archive6.method4480()); - Static17.aClass3_Sub15_Sub1_2.p4(Static267.js5Archive7.method4480()); - Static17.aClass3_Sub15_Sub1_2.p4(Static209.js5Archive8.method4480()); - Static17.aClass3_Sub15_Sub1_2.p4(Static195.js5Archive9.method4480()); - Static17.aClass3_Sub15_Sub1_2.p4(Static184.js5Archive10.method4480()); - Static17.aClass3_Sub15_Sub1_2.p4(Static214.js5Archive11.method4480()); - Static17.aClass3_Sub15_Sub1_2.p4(Static16.js5Archive12.method4480()); - Static17.aClass3_Sub15_Sub1_2.p4(Static261.js5Archive13.method4480()); - Static17.aClass3_Sub15_Sub1_2.p4(Static137.js5Archive14.method4480()); - Static17.aClass3_Sub15_Sub1_2.p4(Static138.js5Archive15.method4480()); - Static17.aClass3_Sub15_Sub1_2.p4(Static280.js5Archive16.method4480()); - Static17.aClass3_Sub15_Sub1_2.p4(Static138.js5Archive17.method4480()); - Static17.aClass3_Sub15_Sub1_2.p4(Static172.js5Archive18.method4480()); - Static17.aClass3_Sub15_Sub1_2.p4(Static171.js5Archive19.method4480()); - 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(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()); - Static17.aClass3_Sub15_Sub1_2.p4(Static226.js5Archive27.method4480()); - if (GlobalConfig.LOGIN_FAKE_IDX28) { - Static17.aClass3_Sub15_Sub1_2.p4(0); - } - Static17.aClass3_Sub15_Sub1_2.pBytes(Static6.outboundBuffer.data, Static6.outboundBuffer.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; - } - Static57.aClass3_Sub15_Sub1_3.method2240(local210); - Static184.loginStep = 4; - } - if (Static184.loginStep == 4) { - if (Protocol.socket.available() < 1) { - return; - } - @Pc(623) int local623 = Protocol.socket.read(); - if (local623 == 21) { - Static184.loginStep = 7; - } else if (local623 == 29) { - Static184.loginStep = 10; - } else if (local623 == 1) { - Static184.loginStep = 5; - Static266.reply = local623; - return; - } else if (local623 == 2) { - Static184.loginStep = 8; - } else if (local623 == 15) { - Static184.loginStep = 0; - Static266.reply = local623; - return; - } else if (local623 == 23 && Static276.anInt5816 < 1) { - Static184.loginStep = 1; - Static276.anInt5816++; - Static92.anInt2430 = 0; - Protocol.socket.close(); - Protocol.socket = null; - return; - } else { - Static266.reply = local623; - Static184.loginStep = 0; - Protocol.socket.close(); - Protocol.socket = null; - return; - } - } - if (Static184.loginStep == 6) { - Static6.outboundBuffer.offset = 0; - Static6.outboundBuffer.p1isaac(17); - Protocol.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); - Static184.loginStep = 4; - return; - } - if (Static184.loginStep == 7) { - if (Protocol.socket.available() >= 1) { - Static231.anInt5202 = (Protocol.socket.read() + 3) * 60; - Static184.loginStep = 0; - Static266.reply = 21; - Protocol.socket.close(); - Protocol.socket = null; - return; - } - return; - } - if (Static184.loginStep == 10) { - if (Protocol.socket.available() >= 1) { - Static204.anInt4765 = Protocol.socket.read(); - Static184.loginStep = 0; - Static266.reply = 29; - Protocol.socket.close(); - Protocol.socket = null; - return; - } - return; - } - if (Static184.loginStep == 8) { - if (Protocol.socket.available() < 14) { - return; - } - 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(); - Static124.aBoolean157 = Static57.aClass3_Sub15_Sub1_3.g1() == 1; - Static207.aBoolean236 = Static57.aClass3_Sub15_Sub1_3.g1() == 1; - Static25.aBoolean57 = Static57.aClass3_Sub15_Sub1_3.g1() == 1; - Static86.aBoolean129 = Static57.aClass3_Sub15_Sub1_3.g1() == 1; - Static245.enabled = Static57.aClass3_Sub15_Sub1_3.g1() == 1; - Static16.anInt549 = Static57.aClass3_Sub15_Sub1_3.g2(); - Static202.aBoolean233 = Static57.aClass3_Sub15_Sub1_3.g1() == 1; - Static2.aBoolean1 = Static57.aClass3_Sub15_Sub1_3.g1() == 1; - Static189.method3438(Static2.aBoolean1); - Static9.method186(Static2.aBoolean1); - if (!client.advertSuppressed) { - if (Static124.aBoolean157 && !Static25.aBoolean57 || Static202.aBoolean233) { - try { - Static167.aClass100_781.method3157(GameShell.signLink.applet); - } catch (@Pc(910) Throwable local910) { - } - } else { - try { - Static56.aClass100_380.method3157(GameShell.signLink.applet); - } catch (@Pc(920) Throwable local920) { - } - } - } - Static164.anInt3985 = Static57.aClass3_Sub15_Sub1_3.method2243(); - Static223.anInt5028 = Static57.aClass3_Sub15_Sub1_3.g2(); - Static184.loginStep = 9; - } - if (Static184.loginStep == 9) { - if (Protocol.socket.available() < Static223.anInt5028) { - return; - } - Static57.aClass3_Sub15_Sub1_3.offset = 0; - Protocol.socket.read(0, Static223.anInt5028, Static57.aClass3_Sub15_Sub1_3.data); - Static266.reply = 2; - Static184.loginStep = 0; - Static243.method4221(); - Static80.anInt4701 = -1; - Static75.method1629(false); - Static164.anInt3985 = -1; - return; - } - } catch (@Pc(977) IOException local977) { - if (Protocol.socket != null) { - Protocol.socket.close(); - Protocol.socket = null; - } - if (Static276.anInt5816 >= 1) { - Static184.loginStep = 0; - Static266.reply = -4; - } else { - Static184.loginStep = 1; - Static92.anInt2430 = 0; - Static276.anInt5816++; - if (Static271.defaultPort == Static209.port) { - Static209.port = Static55.alternatePort; - } else { - Static209.port = Static271.defaultPort; - } - } - } - } - @OriginalMember(owner = "client!ri", name = "a", descriptor = "(II)I") public static int method1640(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { arg1 = arg1 * (arg0 & 0x7F) >> 7; diff --git a/client/src/main/java/Static217.java b/client/src/main/java/Static217.java index 05cf5ff..6b003b6 100644 --- a/client/src/main/java/Static217.java +++ b/client/src/main/java/Static217.java @@ -7,9 +7,6 @@ public final class Static217 { @OriginalMember(owner = "client!rj", name = "R", descriptor = "I") public static int anInt4903; - @OriginalMember(owner = "client!rj", name = "Y", descriptor = "J") - public static long js5ConnectTime; - @OriginalMember(owner = "client!rj", name = "U", descriptor = "Lclient!ih;") public static final LinkedList aClass69_116 = new LinkedList(); @@ -17,7 +14,7 @@ public final class Static217 { public static final int[] anIntArray434 = new int[64]; @OriginalMember(owner = "client!rj", name = "ab", descriptor = "Lclient!na;") - public static final JagString aClass100_916 = Static28.parse(":clanreq:"); + public static final JagString aClass100_916 = JagString.parse(":clanreq:"); @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) { @@ -85,51 +82,6 @@ public final class Static217 { } } - @OriginalMember(owner = "client!rj", name = "f", descriptor = "(B)V") - public static void method3768() { - Static276.method4612(); - Static54.method1308(); - Static233.method3999(); - Static90.clearLocCache(); - Static204.method3673(); - Static176.method3302(); - Static10.method350(); - Static247.method4249(); - Static53.method1295(); - Static249.method4266(); - Static124.method2433(); - Static202.method3653(); - Static78.method1695(); - Static10.method351(); - Static230.method3947(); - Static147.method2764(); - if (client.modeWhat != 0) { - for (@Pc(54) int local54 = 0; local54 < Static51.aByteArrayArray8.length; local54++) { - Static51.aByteArrayArray8[local54] = null; - } - Static105.anInt2863 = 0; - } - Static181.method3347(); - Static90.method1857(); - Static139.aClass99_22.clear(); - if (!GlRenderer.enabled) { - ((Js5GlTextureProvider) Rasteriser.textureProvider).clear(); - } - Static105.aClass54_9.clear(); - Static213.js5Archive0.method4499(); - Static249.js5Archive1.method4499(); - Static41.js5Archive3.method4499(); - Static248.js5Archive4.method4499(); - Static26.js5Archive5.method4499(); - Static130.js5Archive6.method4499(); - Static267.js5Archive7.method4499(); - Static209.js5Archive8.method4499(); - Static184.js5Archive10.method4499(); - Static214.js5Archive11.method4499(); - Static16.js5Archive12.method4499(); - Static73.aClass99_10.clear(); - } - @OriginalMember(owner = "client!rj", name = "a", descriptor = "([Lclient!mj;I[BIIIIZIIB)V") public static void method3771(@OriginalArg(0) CollisionMap[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) byte[] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9) { @Pc(7) int local7 = -1; @@ -154,7 +106,7 @@ public final class Static217 { @Pc(68) int local68 = local64 >> 2; @Pc(72) int local72 = local64 & 0x3; if (arg3 == local60 && local56 >= arg8 && local56 < arg8 + 8 && arg9 <= local50 && arg9 + 8 > local50) { - @Pc(103) LocType local103 = Static271.get(local7); + @Pc(103) LocType local103 = LocTypeList.get(local7); @Pc(120) int local120 = Static52.method1286(local50 & 0x7, arg4, local72, local103.length, local103.width, local56 & 0x7) + arg5; @Pc(137) int local137 = Static241.method4541(local103.width, arg4, local103.length, local56 & 0x7, local72, local50 & 0x7) + arg6; if (local120 > 0 && local137 > 0 && local120 < 103 && local137 < 103) { diff --git a/client/src/main/java/Static218.java b/client/src/main/java/Static218.java index 988eb1e..291bb69 100644 --- a/client/src/main/java/Static218.java +++ b/client/src/main/java/Static218.java @@ -5,79 +5,79 @@ import org.openrs2.deob.annotation.Pc; public final class Static218 { @OriginalMember(owner = "client!rk", name = "K", descriptor = "Lclient!na;") - public static final JagString TAG_GT = Static28.parse("gt"); + public static final JagString TAG_GT = JagString.parse("gt"); @OriginalMember(owner = "client!rk", name = "L", descriptor = "Lclient!na;") - public static final JagString TAG_LT = Static28.parse("lt"); + public static final JagString TAG_LT = JagString.parse("lt"); @OriginalMember(owner = "client!rk", name = "M", descriptor = "Lclient!na;") - public static final JagString TAG_SHAD1 = Static28.parse("shad="); + public static final JagString TAG_SHAD1 = JagString.parse("shad="); @OriginalMember(owner = "client!rk", name = "N", descriptor = "Lclient!na;") - public static final JagString TAB_SHY = Static28.parse("shy"); + public static final JagString TAB_SHY = JagString.parse("shy"); @OriginalMember(owner = "client!rk", name = "O", descriptor = "Lclient!na;") - public static final JagString TAG_TRANS1 = Static28.parse("trans="); + public static final JagString TAG_TRANS1 = JagString.parse("trans="); @OriginalMember(owner = "client!rk", name = "P", descriptor = "Lclient!na;") - public static final JagString TAG_U1 = Static28.parse("u="); + public static final JagString TAG_U1 = JagString.parse("u="); @OriginalMember(owner = "client!rk", name = "Q", descriptor = "Lclient!na;") - public static final JagString TAG_STR1 = Static28.parse("str="); + public static final JagString TAG_STR1 = JagString.parse("str="); @OriginalMember(owner = "client!rk", name = "R", descriptor = "Lclient!na;") - public static final JagString TAB_EURO = Static28.parse("euro"); + public static final JagString TAB_EURO = JagString.parse("euro"); @OriginalMember(owner = "client!rk", name = "T", descriptor = "Lclient!na;") - public static final JagString TAG_COL2 = Static28.parse(")4col"); + public static final JagString TAG_COL2 = JagString.parse(")4col"); @OriginalMember(owner = "client!rk", name = "X", descriptor = "Lclient!na;") - public static final JagString TAG_SHAD3 = Static28.parse(")4shad"); + public static final JagString TAG_SHAD3 = JagString.parse(")4shad"); @OriginalMember(owner = "client!rk", name = "Y", descriptor = "Lclient!na;") - public static final JagString TAG_COL1 = Static28.parse("col="); + public static final JagString TAG_COL1 = JagString.parse("col="); @OriginalMember(owner = "client!rk", name = "Z", descriptor = "Lclient!na;") - private static final JagString aClass100_706 = Static28.parse(""); + private static final JagString aClass100_706 = JagString.parse(""); @OriginalMember(owner = "client!rk", name = "bb", descriptor = "Lclient!na;") - public static final JagString TAG_U2 = Static28.parse("u"); + public static final JagString TAG_U2 = JagString.parse("u"); @OriginalMember(owner = "client!rk", name = "cb", descriptor = "Lclient!na;") - public static final JagString TAB_TIMES = Static28.parse("times"); + public static final JagString TAB_TIMES = JagString.parse("times"); @OriginalMember(owner = "client!rk", name = "eb", descriptor = "Lclient!na;") - public static final JagString TAG_TRANS2 = Static28.parse(")4trans"); + public static final JagString TAG_TRANS2 = JagString.parse(")4trans"); @OriginalMember(owner = "client!rk", name = "fb", descriptor = "Lclient!na;") - public static final JagString TAG_NBSP = Static28.parse("nbsp"); + public static final JagString TAG_NBSP = JagString.parse("nbsp"); @OriginalMember(owner = "client!rk", name = "hb", descriptor = "Lclient!na;") - private static final JagString aClass100_711 = Static28.parse(""); + private static final JagString aClass100_711 = JagString.parse(""); @OriginalMember(owner = "client!rk", name = "ib", descriptor = "Lclient!na;") - public static final JagString TAG_U3 = Static28.parse(")4u"); + public static final JagString TAG_U3 = JagString.parse(")4u"); @OriginalMember(owner = "client!rk", name = "kb", descriptor = "Lclient!na;") - public static final JagString TAG_BR = Static28.parse("br"); + public static final JagString TAG_BR = JagString.parse("br"); @OriginalMember(owner = "client!rk", name = "lb", descriptor = "Lclient!na;") - public static final JagString TAG_SHAD2 = Static28.parse("shad"); + public static final JagString TAG_SHAD2 = JagString.parse("shad"); @OriginalMember(owner = "client!rk", name = "mb", descriptor = "Lclient!na;") - public static final JagString TAG_IMG = Static28.parse("img="); + public static final JagString TAG_IMG = JagString.parse("img="); @OriginalMember(owner = "client!rk", name = "ob", descriptor = "Lclient!na;") - public static final JagString TAB_COPY = Static28.parse("copy"); + public static final JagString TAB_COPY = JagString.parse("copy"); @OriginalMember(owner = "client!rk", name = "pb", descriptor = "Lclient!na;") - public static final JagString TAG_STR3 = Static28.parse(")4str"); + public static final JagString TAG_STR3 = JagString.parse(")4str"); @OriginalMember(owner = "client!rk", name = "qb", descriptor = "Lclient!na;") - public static final JagString TAG_REG = Static28.parse("reg"); + public static final JagString TAG_REG = JagString.parse("reg"); @OriginalMember(owner = "client!rk", name = "rb", descriptor = "Lclient!na;") - public static final JagString TAG_STR2 = Static28.parse("str"); + public static final JagString TAG_STR2 = JagString.parse("str"); @OriginalMember(owner = "client!rk", name = "sb", descriptor = "Lclient!na;") public static final JagString buffer = Static87.allocate(100); diff --git a/client/src/main/java/Static219.java b/client/src/main/java/Static219.java index 4837850..a6f04fd 100644 --- a/client/src/main/java/Static219.java +++ b/client/src/main/java/Static219.java @@ -3,32 +3,26 @@ import org.openrs2.deob.annotation.Pc; public final class Static219 { - @OriginalMember(owner = "client!rl", name = "P", descriptor = "Lclient!n;") - public static final SoftLruHashTable sprites = new SoftLruHashTable(64); - @OriginalMember(owner = "client!rl", name = "T", descriptor = "Lclient!na;") - private static final JagString aClass100_921 = Static28.parse("Sat"); + private static final JagString aClass100_921 = JagString.parse("Sat"); @OriginalMember(owner = "client!rl", name = "U", descriptor = "Lclient!na;") - private static final JagString aClass100_922 = Static28.parse("Mon"); + private static final JagString aClass100_922 = JagString.parse("Mon"); @OriginalMember(owner = "client!rl", name = "W", descriptor = "Lclient!na;") - private static final JagString aClass100_923 = Static28.parse("Fri"); + private static final JagString aClass100_923 = JagString.parse("Fri"); - @OriginalMember(owner = "client!rl", name = "X", descriptor = "I") - public static int anInt4937 = 0; - - @OriginalMember(owner = "client!rl", name = "db", descriptor = "Lclient!na;") - private static final JagString aClass100_927 = Static28.parse("Sun"); + @OriginalMember(owner = "client!rl", name = "db", descriptor = "Lclient!na;") + private static final JagString aClass100_927 = JagString.parse("Sun"); @OriginalMember(owner = "client!rl", name = "cb", descriptor = "Lclient!na;") - private static final JagString aClass100_926 = Static28.parse("Tue"); + private static final JagString aClass100_926 = JagString.parse("Tue"); @OriginalMember(owner = "client!rl", name = "ab", descriptor = "Lclient!na;") - private static final JagString aClass100_924 = Static28.parse("Wed"); + private static final JagString aClass100_924 = JagString.parse("Wed"); @OriginalMember(owner = "client!rl", name = "bb", descriptor = "Lclient!na;") - private static final JagString aClass100_925 = Static28.parse("Thu"); + private static final JagString aClass100_925 = JagString.parse("Thu"); @OriginalMember(owner = "client!rl", name = "Y", descriptor = "[Lclient!na;") public static final JagString[] aClass100Array149 = new JagString[] { aClass100_927, aClass100_922, aClass100_926, aClass100_924, aClass100_925, aClass100_923, aClass100_921 }; @@ -37,7 +31,7 @@ public final class Static219 { public static final int anInt4938 = 7759444; @OriginalMember(owner = "client!rl", name = "eb", descriptor = "Lclient!na;") - public static final JagString aClass100_928 = Static28.parse("(U0a )2 in: "); + public static final JagString aClass100_928 = JagString.parse("(U0a )2 in: "); @OriginalMember(owner = "client!rl", name = "i", descriptor = "(I)V") public static void method3796() { diff --git a/client/src/main/java/Static22.java b/client/src/main/java/Static22.java index 3a5a33e..ace983b 100644 --- a/client/src/main/java/Static22.java +++ b/client/src/main/java/Static22.java @@ -3,9 +3,6 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static22 { - @OriginalMember(owner = "client!bl", name = "P", descriptor = "I") - public static int js5ConnectDelay = 0; - @OriginalMember(owner = "client!bl", name = "Q", descriptor = "I") public static int anInt723 = 0; diff --git a/client/src/main/java/Static220.java b/client/src/main/java/Static220.java index 1e10e1e..1038351 100644 --- a/client/src/main/java/Static220.java +++ b/client/src/main/java/Static220.java @@ -7,11 +7,8 @@ public final class Static220 { @OriginalMember(owner = "client!rm", name = "c", descriptor = "I") public static int anInt4941 = 1; - @OriginalMember(owner = "client!rm", name = "d", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_28 = new SoftLruHashTable(64); - - @OriginalMember(owner = "client!rm", name = "i", descriptor = "Lclient!na;") - public static final JagString aClass100_930 = Static28.parse("(Z"); + @OriginalMember(owner = "client!rm", name = "i", descriptor = "Lclient!na;") + public static final JagString aClass100_930 = JagString.parse("(Z"); @OriginalMember(owner = "client!rm", name = "a", descriptor = "(IBI)V") public static void spawnGroundObject(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { @@ -24,7 +21,7 @@ public final class Static220 { @Pc(30) ObjStackNode local30 = null; @Pc(35) ObjStackNode local35; for (local35 = (ObjStackNode) local9.method2289(); local35 != null; local35 = (ObjStackNode) local9.method2288()) { - @Pc(44) ObjType local44 = Static71.get(local35.aClass8_Sub7_1.anInt5555); + @Pc(44) ObjType local44 = ObjTypeList.get(local35.aClass8_Sub7_1.anInt5555); @Pc(47) int local47 = local44.cost; if (local44.stackable == 1) { local47 *= local35.aClass8_Sub7_1.anInt5550 + 1; @@ -53,49 +50,7 @@ public final class Static220 { } } @Pc(152) long local152 = (long) ((arg0 << 7) + arg1 + 1610612736); - 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 = "(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; - @Pc(10) Model local10 = (Model) Static110.aClass99_15.get(local4); - if (local10 == null) { - @Pc(22) RawModel local22 = Static77.create(Static267.js5Archive7, arg2); - if (local22 == null) { - return null; - } - local10 = local22.createModel(64, 768, -50, -10, -50); - Static110.aClass99_15.put(local10, local4); - } - @Pc(42) int local42 = arg4.method4562(); - @Pc(45) int local45 = arg4.method4561(); - @Pc(48) int local48 = arg4.method4576(); - @Pc(51) int local51 = arg4.method4550(); - local10 = local10.method4560(true, true, true); - if (arg0 != 0) { - local10.method4554(arg0); - } - @Pc(94) int local94; - if (GlRenderer.enabled) { - @Pc(68) GlModel local68 = (GlModel) local10; - if (arg5 != Static207.method3685(Static55.level, arg3 + local42, arg1 + local48) || arg5 != Static207.method3685(Static55.level, arg3 + local45, local51 + arg1)) { - for (local94 = 0; local94 < local68.anInt5295; local94++) { - local68.anIntArray465[local94] += Static207.method3685(Static55.level, local68.anIntArray461[local94] + arg3, local68.anIntArray466[local94] + arg1) - arg5; - } - local68.aClass127_4.aBoolean235 = false; - local68.aClass5_1.aBoolean3 = false; - } - } else { - @Pc(142) SoftwareModel local142 = (SoftwareModel) local10; - if (arg5 != Static207.method3685(Static55.level, local42 + arg3, local48 + arg1) || arg5 != Static207.method3685(Static55.level, arg3 + local45, local51 + arg1)) { - for (local94 = 0; local94 < local142.anInt5788; local94++) { - local142.anIntArray527[local94] += Static207.method3685(Static55.level, arg3 + local142.anIntArray528[local94], local142.anIntArray531[local94] + arg1) - arg5; - } - local142.aBoolean305 = false; - } - } - return local10; + Static69.method1543(Static55.level, arg1, arg0, SceneGraph.getTileHeight(Static55.level, arg1 * 128 + 64, arg0 * 128 + 64), local30.aClass8_Sub7_1, local152, local89, local91); } @OriginalMember(owner = "client!rm", name = "a", descriptor = "(III)V") diff --git a/client/src/main/java/Static221.java b/client/src/main/java/Static221.java index 43d4ef9..5ef8dca 100644 --- a/client/src/main/java/Static221.java +++ b/client/src/main/java/Static221.java @@ -10,19 +10,11 @@ public final class Static221 { @OriginalMember(owner = "client!s", name = "i", descriptor = "[I") public static int[] anIntArray376; - @OriginalMember(owner = "client!s", name = "c", descriptor = "I") - public static int anInt4363 = -1; - @OriginalMember(owner = "client!s", name = "d", descriptor = "I") public static int anInt4364 = 0; @OriginalMember(owner = "client!s", name = "g", descriptor = "Lclient!na;") - public static final JagString aClass100_821 = Static28.parse("document)3cookie=(R"); - - @OriginalMember(owner = "client!s", name = "a", descriptor = "(II)I") - public static int method3389(@OriginalArg(0) int arg0) { - return arg0 >>> 7; - } + public static final JagString aClass100_821 = JagString.parse("document)3cookie=(R"); @OriginalMember(owner = "client!s", name = "b", descriptor = "(III)V") public static void method3392(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { @@ -116,7 +108,7 @@ public final class Static221 { if (local133 == 0) { continue; } - local151 = Static256.method4395(local133 - 1); + local151 = FloTypeList.method4395(local133 - 1); if (local151.anInt5899 == -1) { continue; } @@ -127,7 +119,7 @@ public final class Static221 { continue; } } else if (local133 != 0) { - local151 = Static256.method4395(local133 - 1); + local151 = FloTypeList.method4395(local133 - 1); @Pc(224) byte local224; if (local151.anInt5899 == -1) { local224 = arg7[local114][local72]; @@ -244,7 +236,7 @@ public final class Static221 { if (local775 == 0) { continue; } - local805 = Static256.method4395(local775 - 1); + local805 = FloTypeList.method4395(local775 - 1); if (local805.anInt5899 == -1) { continue; } @@ -253,7 +245,7 @@ public final class Static221 { continue; } } else if (local775 != 0) { - local805 = Static256.method4395(local775 - 1); + local805 = FloTypeList.method4395(local775 - 1); if (local805.anInt5899 == -1) { Static131.method2578(arg0, arg9, local114, arg6, local72, Static53.anIntArrayArray8[arg7[local114][local72]], local28, local18, arg10, arg2[local114][local72]); continue; diff --git a/client/src/main/java/Static223.java b/client/src/main/java/Static223.java index 18034d2..8e0c04c 100644 --- a/client/src/main/java/Static223.java +++ b/client/src/main/java/Static223.java @@ -4,37 +4,28 @@ import org.openrs2.deob.annotation.Pc; public final class Static223 { - @OriginalMember(owner = "client!sc", name = "m", descriptor = "[Z") - public static boolean[] aBooleanArray115; - - @OriginalMember(owner = "client!sc", name = "f", descriptor = "Lclient!na;") - public static final JagString aClass100_946 = Static28.parse("(R"); + @OriginalMember(owner = "client!sc", name = "f", descriptor = "Lclient!na;") + public static final JagString aClass100_946 = JagString.parse("(R"); @OriginalMember(owner = "client!sc", name = "g", descriptor = "Lclient!na;") - public static final JagString aClass100_947 = Static28.parse(" )2> "); + public static final JagString aClass100_947 = JagString.parse(" )2> "); - @OriginalMember(owner = "client!sc", name = "o", descriptor = "I") - public static int anInt5028 = 0; - - @OriginalMember(owner = "client!sc", name = "p", descriptor = "I") + @OriginalMember(owner = "client!sc", name = "p", descriptor = "I") public static int anInt5029 = 0; @OriginalMember(owner = "client!sc", name = "v", descriptor = "I") public static int anInt5032 = 0; - @OriginalMember(owner = "client!sc", name = "y", descriptor = "I") - public static int anInt5034 = -2; - @OriginalMember(owner = "client!sc", name = "z", descriptor = "[Z") public static final boolean[] aBooleanArray116 = new boolean[100]; @OriginalMember(owner = "client!sc", name = "D", descriptor = "Lclient!na;") - public static final JagString aClass100_951 = Static28.parse(""); + public static final JagString aClass100_951 = JagString.parse(""); @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.seqId == arg1 && arg1 != -1) { - @Pc(10) SeqType local10 = Static36.get(arg1); + @Pc(10) SeqType local10 = SeqTypeList.get(arg1); @Pc(13) int local13 = local10.anInt5347; if (local13 == 1) { arg2.anInt3373 = 1; @@ -47,7 +38,7 @@ public final class Static223 { if (local13 == 2) { arg2.anInt3371 = 0; } - } else if (arg1 == -1 || arg2.seqId == -1 || Static36.get(arg1).anInt5355 >= Static36.get(arg2.seqId).anInt5355) { + } else if (arg1 == -1 || arg2.seqId == -1 || SeqTypeList.get(arg1).anInt5355 >= SeqTypeList.get(arg2.seqId).anInt5355) { arg2.anInt3360 = 0; arg2.seqId = arg1; arg2.anInt3373 = 1; @@ -56,7 +47,7 @@ public final class Static223 { arg2.anInt3405 = arg2.movementQueueSize; arg2.anInt3425 = 0; if (arg2.seqId != -1) { - SoundPlayer.playSeqSound(arg2.zFine, Static36.get(arg2.seqId), arg2.xFine, false, arg2.anInt3425); + SoundPlayer.playSeqSound(arg2.zFine, SeqTypeList.get(arg2.seqId), arg2.xFine, false, arg2.anInt3425); } } } diff --git a/client/src/main/java/Static224.java b/client/src/main/java/Static224.java index 6b3d5ff..cb7c996 100644 --- a/client/src/main/java/Static224.java +++ b/client/src/main/java/Static224.java @@ -16,10 +16,7 @@ public final class Static224 { @OriginalMember(owner = "client!sd", name = "V", descriptor = "[I") public static final int[] anIntArray443 = new int[100]; - @OriginalMember(owner = "client!sd", name = "X", descriptor = "Z") - public static boolean aBoolean247 = false; - - @OriginalMember(owner = "client!sd", name = "c", descriptor = "(II)V") + @OriginalMember(owner = "client!sd", name = "c", descriptor = "(II)V") public static void method3884(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { @Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[0][arg0][arg1]; for (@Pc(9) int local9 = 0; local9 < 3; local9++) { @@ -41,9 +38,4 @@ public final class Static224 { Static130.aClass3_Sub5ArrayArrayArray1[3][arg0][arg1] = null; } - @OriginalMember(owner = "client!sd", name = "f", descriptor = "(B)V") - public static void method3885() { - Static83.aClass99_3.method3103(); - } - } diff --git a/client/src/main/java/Static225.java b/client/src/main/java/Static225.java index 976350b..5d4a3f8 100644 --- a/client/src/main/java/Static225.java +++ b/client/src/main/java/Static225.java @@ -7,23 +7,17 @@ public final class Static225 { @OriginalMember(owner = "client!se", name = "a", descriptor = "I") public static int originX; - @OriginalMember(owner = "client!se", name = "l", descriptor = "Lclient!ve;") - public static Js5 aClass153_92; - - @OriginalMember(owner = "client!se", name = "h", descriptor = "I") + @OriginalMember(owner = "client!se", name = "h", descriptor = "I") public static int anInt5073 = -1; @OriginalMember(owner = "client!se", name = "m", descriptor = "Lclient!na;") - public static final JagString aClass100_961 = Static28.parse(" )2>"); - - @OriginalMember(owner = "client!se", name = "t", descriptor = "[I") - public static final int[] anIntArray445 = new int[] { 12543016, 15504954, 15914854, 16773818 }; + public static final JagString aClass100_961 = JagString.parse(" )2>"); @OriginalMember(owner = "client!se", name = "a", descriptor = "(I)V") public static void method3889() { while (true) { - if (Static57.aClass3_Sub15_Sub1_3.method2241(Static223.anInt5028) >= 11) { - @Pc(20) int local20 = Static57.aClass3_Sub15_Sub1_3.method2238(11); + if (Protocol.inboundBuffer.method2241(Protocol.length) >= 11) { + @Pc(20) int local20 = Protocol.inboundBuffer.method2238(11); if (local20 != 2047) { @Pc(27) boolean local27 = false; if (Static159.players[local20] == null) { @@ -36,20 +30,20 @@ public final class Static225 { Static105.anIntArray256[Static267.anInt5774++] = local20; @Pc(65) Player local65 = Static159.players[local20]; local65.anInt3430 = Static83.loop; - @Pc(73) int local73 = Static57.aClass3_Sub15_Sub1_3.method2238(1); + @Pc(73) int local73 = Protocol.inboundBuffer.method2238(1); if (local73 == 1) { Static44.anIntArray106[Static116.anInt2951++] = local20; } - @Pc(92) int local92 = Static57.aClass3_Sub15_Sub1_3.method2238(5); - @Pc(99) int local99 = Static56.anIntArray141[Static57.aClass3_Sub15_Sub1_3.method2238(3)]; + @Pc(92) int local92 = Protocol.inboundBuffer.method2238(5); + @Pc(99) int local99 = Static56.anIntArray141[Protocol.inboundBuffer.method2238(3)]; if (local92 > 15) { local92 -= 32; } if (local27) { local65.anInt3400 = local65.anInt3381 = local99; } - @Pc(116) int local116 = Static57.aClass3_Sub15_Sub1_3.method2238(1); - @Pc(121) int local121 = Static57.aClass3_Sub15_Sub1_3.method2238(5); + @Pc(116) int local116 = Protocol.inboundBuffer.method2238(1); + @Pc(121) int local121 = Protocol.inboundBuffer.method2238(5); if (local121 > 15) { local121 -= 32; } @@ -57,7 +51,7 @@ public final class Static225 { continue; } } - Static57.aClass3_Sub15_Sub1_3.method2244(); + Protocol.inboundBuffer.method2244(); return; } } @@ -80,15 +74,15 @@ 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) { Player.password = arg1; - Static5.anInt39 = arg2; + LoginManager.anInt39 = arg2; Player.username = arg0; if (Player.username.strEquals(JagString.EMPTY) || Player.password.strEquals(JagString.EMPTY)) { - Static266.reply = 3; + LoginManager.reply = 3; } else if (Static125.worldId == -1) { - Static20.anInt673 = 0; - Static196.anInt4587 = 0; - Static266.reply = -3; - Static219.anInt4937 = 1; + LoginManager.anInt673 = 0; + LoginManager.anInt4587 = 0; + LoginManager.reply = -3; + LoginManager.anInt4937 = 1; @Pc(43) Buffer local43 = new Buffer(128); local43.p1(10); local43.p2((int) (Math.random() * 99999.0D)); @@ -98,12 +92,12 @@ public final class Static225 { local43.pjstr(Player.password); local43.p4((int) (Math.random() * 9.9999999E7D)); local43.encryptRsa(GlobalConfig.RSA_EXPONENT, GlobalConfig.RSA_MODULUS); - Static6.outboundBuffer.offset = 0; - Static6.outboundBuffer.p1(210); - Static6.outboundBuffer.p1(local43.offset); - Static6.outboundBuffer.pBytes(local43.data, local43.offset); + Protocol.outboundBuffer.offset = 0; + Protocol.outboundBuffer.p1(210); + Protocol.outboundBuffer.p1(local43.offset); + Protocol.outboundBuffer.pBytes(local43.data, local43.offset); } else { - Static49.method1208(); + LoginManager.clear(); } } } diff --git a/client/src/main/java/Static226.java b/client/src/main/java/Static226.java index 3f912eb..8cd7e92 100644 --- a/client/src/main/java/Static226.java +++ b/client/src/main/java/Static226.java @@ -4,20 +4,14 @@ import org.openrs2.deob.annotation.Pc; public final class Static226 { - @OriginalMember(owner = "client!sf", name = "b", descriptor = "Lclient!ve;") - public static Js5 js5Archive27; - - @OriginalMember(owner = "client!sf", name = "c", descriptor = "I") + @OriginalMember(owner = "client!sf", name = "c", descriptor = "I") public static int anInt5080; @OriginalMember(owner = "client!sf", name = "j", descriptor = "I") public static int anInt5085; - @OriginalMember(owner = "client!sf", name = "a", descriptor = "I") - public static int anInt5079 = 0; - @OriginalMember(owner = "client!sf", name = "g", descriptor = "Lclient!na;") - public static final JagString aClass100_965 = Static28.parse(""); + public static final JagString aClass100_965 = JagString.parse(""); @OriginalMember(owner = "client!sf", name = "h", descriptor = "[Lclient!na;") public static final JagString[] varcstrs = new JagString[1000]; @@ -55,11 +49,6 @@ public final class Static226 { arg0.anInt923 = local31; } - @OriginalMember(owner = "client!sf", name = "a", descriptor = "(BLclient!ve;)V") - public static void init(@OriginalArg(1) Js5 arg0) { - Static39.aClass153_23 = arg0; - } - @OriginalMember(owner = "client!sf", name = "b", descriptor = "(B)V") public static void method3901() { @Pc(16) int local16 = Fonts.b12Full.getStringWidth(LocalizedText.CHOOSE_OPTION); diff --git a/client/src/main/java/Static227.java b/client/src/main/java/Static227.java index 76da057..23f5fc4 100644 --- a/client/src/main/java/Static227.java +++ b/client/src/main/java/Static227.java @@ -12,14 +12,6 @@ public final class Static227 { public static final int[] anIntArray446 = new int[25]; @OriginalMember(owner = "client!sg", name = "e", descriptor = "Lclient!na;") - public static final JagString SETTINGS = Static28.parse("settings"); + public static final JagString SETTINGS = JagString.parse("settings"); - @OriginalMember(owner = "client!sg", name = "q", descriptor = "[I") - public static final int[] keyCodes = new int[128]; - - @OriginalMember(owner = "client!sg", name = "a", descriptor = "(B)V") - public static void method3903() { - Static142.aClass99_23.method3103(); - Static267.aClass99_37.method3103(); - } } diff --git a/client/src/main/java/Static228.java b/client/src/main/java/Static228.java index 343d9b8..14811d1 100644 --- a/client/src/main/java/Static228.java +++ b/client/src/main/java/Static228.java @@ -4,14 +4,11 @@ import org.openrs2.deob.annotation.Pc; public final class Static228 { - @OriginalMember(owner = "client!sh", name = "a", descriptor = "Lclient!ih;") - public static final LinkedList aClass69_120 = new LinkedList(); - - @OriginalMember(owner = "client!sh", name = "c", descriptor = "I") + @OriginalMember(owner = "client!sh", name = "c", descriptor = "I") public static int anInt5101 = 0; @OriginalMember(owner = "client!sh", name = "e", descriptor = "Lclient!na;") - public static final JagString aClass100_967 = Static28.parse(""); + public static final JagString aClass100_967 = JagString.parse(""); @OriginalMember(owner = "client!sh", name = "f", descriptor = "I") public static int anInt5103 = -1; @@ -44,7 +41,7 @@ public final class Static228 { @OriginalMember(owner = "client!sh", name = "a", descriptor = "(IZBIZ)V") public static void sortWorldList(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) boolean arg3) { - Static79.method1697(arg0, arg2, Static101.worlds.length - 1, arg3, 0, arg1); + Static79.method1697(arg0, arg2, WorldList.sorted.length - 1, arg3, 0, arg1); } @OriginalMember(owner = "client!sh", name = "a", descriptor = "(I[JII[Ljava/lang/Object;)V") diff --git a/client/src/main/java/Static229.java b/client/src/main/java/Static229.java index 2764f71..e673bb8 100644 --- a/client/src/main/java/Static229.java +++ b/client/src/main/java/Static229.java @@ -4,23 +4,17 @@ import org.openrs2.deob.annotation.Pc; public final class Static229 { - @OriginalMember(owner = "client!si", name = "S", descriptor = "[Lclient!na;") - public static JagString[] aClass100Array156; - @OriginalMember(owner = "client!si", name = "ab", descriptor = "I") public static int anInt5138; - @OriginalMember(owner = "client!si", name = "cb", descriptor = "[B") - public static byte[] aByteArray70; - @OriginalMember(owner = "client!si", name = "X", descriptor = "[Lclient!sg;") public static final StockMarketOffer[] aClass136Array1 = new StockMarketOffer[6]; @OriginalMember(owner = "client!si", name = "Z", descriptor = "Lclient!na;") - public static final JagString aClass100_972 = Static28.parse(""); + public static final JagString aClass100_972 = JagString.parse(""); @OriginalMember(owner = "client!si", name = "gb", descriptor = "Lclient!na;") - public static final JagString aClass100_974 = Static28.parse("
(X"); + public static final JagString aClass100_974 = JagString.parse("
(X"); @OriginalMember(owner = "client!si", name = "a", descriptor = "(ZB)I") public static int method3933(@OriginalArg(1) byte arg0) { @@ -35,12 +29,7 @@ public final class Static229 { Static161.method3058(); } - @OriginalMember(owner = "client!si", name = "a", descriptor = "(BLclient!na;)I") - public static int method3937(@OriginalArg(1) JagString arg0) { - return arg0.length() + 1; - } - - @OriginalMember(owner = "client!si", name = "b", descriptor = "(IIB)V") + @OriginalMember(owner = "client!si", name = "b", descriptor = "(IIB)V") public static void method3938(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { @Pc(16) DelayedStateChange local16 = Static238.method4143(12, arg1); local16.pushServer(); diff --git a/client/src/main/java/Static23.java b/client/src/main/java/Static23.java index acfe87a..7b6d6f2 100644 --- a/client/src/main/java/Static23.java +++ b/client/src/main/java/Static23.java @@ -7,14 +7,8 @@ public final class Static23 { @OriginalMember(owner = "client!bm", name = "a", descriptor = "F") public static float aFloat5; - @OriginalMember(owner = "client!bm", name = "e", descriptor = "Lclient!ve;") - public static Js5 aClass153_11; - - @OriginalMember(owner = "client!bm", name = "f", descriptor = "Lclient!ve;") - public static Js5 aClass153_12; - @OriginalMember(owner = "client!bm", name = "p", descriptor = "Lclient!na;") - public static final JagString aClass100_133 = Static28.parse("(U1"); + public static final JagString aClass100_133 = JagString.parse("(U1"); @OriginalMember(owner = "client!bm", name = "a", descriptor = "(IBIIII)V") public static void method645(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { diff --git a/client/src/main/java/Static230.java b/client/src/main/java/Static230.java index e692b28..530c244 100644 --- a/client/src/main/java/Static230.java +++ b/client/src/main/java/Static230.java @@ -5,9 +5,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static230 { - @OriginalMember(owner = "client!sj", name = "r", descriptor = "Lclient!ve;") - public static Js5 modelsArchive; - @OriginalMember(owner = "client!sj", name = "D", descriptor = "I") public static int anInt5158; @@ -24,48 +21,15 @@ public final class Static230 { public static boolean dynamicMapRegion = false; @OriginalMember(owner = "client!sj", name = "w", descriptor = "Lclient!na;") - public static final JagString aClass100_978 = Static28.parse("<)4col>"); + public static final JagString aClass100_978 = JagString.parse("<)4col>"); @OriginalMember(owner = "client!sj", name = "H", descriptor = "I") public static int anInt5161 = 0; @OriginalMember(owner = "client!sj", name = "c", descriptor = "(I)V") public static void method3947() { - Static250.aClass99_33.clear(); - Static139.aClass99_21.clear(); - } - - @OriginalMember(owner = "client!sj", name = "a", descriptor = "(Z)V") - public static void loop() { - try { - if (Static14.anInt441 == 1) { - @Pc(16) int local16 = Static172.aClass3_Sub3_Sub4_2.method4440(); - if (local16 > 0 && Static172.aClass3_Sub3_Sub4_2.method4414()) { - local16 -= Static57.anInt1757; - if (local16 < 0) { - local16 = 0; - } - Static172.aClass3_Sub3_Sub4_2.method4447(local16); - return; - } - Static172.aClass3_Sub3_Sub4_2.method4446(); - Static172.aClass3_Sub3_Sub4_2.method4426(); - Static144.aClass3_Sub29_1 = null; - Static27.aClass89_1 = null; - if (Static172.aClass153_70 == null) { - Static14.anInt441 = 0; - } else { - Static14.anInt441 = 2; - } - } - } catch (@Pc(62) Exception local62) { - local62.printStackTrace(); - Static172.aClass3_Sub3_Sub4_2.method4446(); - Static172.aClass153_70 = null; - Static144.aClass3_Sub29_1 = null; - Static14.anInt441 = 0; - Static27.aClass89_1 = null; - } + PlayerAppearance.aClass99_33.clear(); + PlayerAppearance.aClass99_21.clear(); } @OriginalMember(owner = "client!sj", name = "a", descriptor = "(BII)I") @@ -99,12 +63,6 @@ public final class Static230 { } } - @OriginalMember(owner = "client!sj", name = "a", descriptor = "(Lclient!ve;B)V") - public static void init(@OriginalArg(0) Js5 arg0) { - Static81.aClass153_34 = arg0; - Static165.anInt4043 = Static81.aClass153_34.method4504(16); - } - @OriginalMember(owner = "client!sj", name = "a", descriptor = "(Ljava/lang/String;I)Lclient!na;") public static JagString method3952(@OriginalArg(0) String arg0) { @Pc(14) byte[] local14; @@ -124,29 +82,6 @@ public final class Static230 { return local23; } - @OriginalMember(owner = "client!sj", name = "b", descriptor = "(II)Lclient!cb;") - public static QuickChatPhraseType method3953(@OriginalArg(1) int arg0) { - @Pc(10) QuickChatPhraseType local10 = (QuickChatPhraseType) Static249.aClass54_15.get((long) arg0); - if (local10 != null) { - return local10; - } - @Pc(27) byte[] local27; - if (arg0 < 32768) { - local27 = Static238.aClass153_96.getFile(1, arg0); - } else { - local27 = Static262.aClass153_108.getFile(1, arg0 & 0x7FFF); - } - local10 = new QuickChatPhraseType(); - if (local27 != null) { - local10.method761(new Buffer(local27)); - } - if (arg0 >= 32768) { - local10.method763(); - } - Static249.aClass54_15.put(local10, (long) arg0); - return local10; - } - @OriginalMember(owner = "client!sj", name = "a", descriptor = "(ILclient!na;)V") public static void method3954(@OriginalArg(1) JagString arg0) { client.settings = arg0; diff --git a/client/src/main/java/Static231.java b/client/src/main/java/Static231.java index cc7da94..064743d 100644 --- a/client/src/main/java/Static231.java +++ b/client/src/main/java/Static231.java @@ -10,20 +10,8 @@ public final class Static231 { @OriginalMember(owner = "client!sk", name = "mb", descriptor = "I") public static int anInt5205; - @OriginalMember(owner = "client!sk", name = "bb", descriptor = "Lclient!gn;") - public static final LruHashTable aClass54_13 = new LruHashTable(64); - - @OriginalMember(owner = "client!sk", name = "gb", descriptor = "J") - public static long aLong174 = 0L; - - @OriginalMember(owner = "client!sk", name = "hb", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_29 = new SoftLruHashTable(64); - - @OriginalMember(owner = "client!sk", name = "ib", descriptor = "I") - public static int anInt5202 = 0; - - @OriginalMember(owner = "client!sk", name = "kb", descriptor = "I") + @OriginalMember(owner = "client!sk", name = "kb", descriptor = "I") public static int anInt5204 = 0; @OriginalMember(owner = "client!sk", name = "lb", descriptor = "Z") @@ -222,8 +210,4 @@ public final class Static231 { } } - @OriginalMember(owner = "client!sk", name = "a", descriptor = "(Lclient!ve;I)Z") - public static boolean isReady(@OriginalArg(0) Js5 arg0) { - return arg0.isFileReady(Static138.anInt3443); - } } diff --git a/client/src/main/java/Static232.java b/client/src/main/java/Static232.java index 7797e8d..406cbbd 100644 --- a/client/src/main/java/Static232.java +++ b/client/src/main/java/Static232.java @@ -16,13 +16,7 @@ public final class Static232 { @OriginalMember(owner = "client!sm", name = "m", descriptor = "I") public static int anInt5212; - @OriginalMember(owner = "client!sm", name = "c", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_30 = new SoftLruHashTable(64); - - @OriginalMember(owner = "client!sm", name = "l", descriptor = "[S") - public static short[] aShortArray74 = new short[256]; - - @OriginalMember(owner = "client!sm", name = "a", descriptor = "(IIIIIIIIIII)V") + @OriginalMember(owner = "client!sm", name = "a", descriptor = "(IIIIIIIIIII)V") public static void method3991(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(8) int arg5, @OriginalArg(9) int arg6, @OriginalArg(10) int arg7) { @Pc(9) int local9 = arg2 - arg4; @Pc(11) int local11 = -1; @@ -56,8 +50,8 @@ public final class Static232 { @Pc(203) int local203 = (local50 + arg4 & 0x3F) + ((arg6 + local119 & 0x3F) << 6); @Pc(209) int local209 = local116[local163][local203]; if (local209 != 0) { - @Pc(222) LocType local222 = Static271.get(local209 - 1); - if (!Static258.aBooleanArray130[local222.mapElement]) { + @Pc(222) LocType local222 = LocTypeList.get(local209 - 1); + if (!MapList.aBooleanArray130[local222.mapElement]) { if (local11 != -1 && local222.mapElement == Static9.anInt172) { @Pc(243) MapElement local243 = new MapElement(); local243.anInt4307 = local65; @@ -65,7 +59,7 @@ public final class Static232 { local243.id = local222.mapElement; Static172.aClass69_97.addTail(local243); } else { - Static241.aClass3_Sub2_Sub1_Sub1Array13[local222.mapElement].method1423(local65 - 7, local144 + -7); + MapList.sprites[local222.mapElement].method1423(local65 - 7, local144 + -7); } } } @@ -80,7 +74,7 @@ public final class Static232 { 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); + MapList.sprites[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 814486d..2d94c3d 100644 --- a/client/src/main/java/Static233.java +++ b/client/src/main/java/Static233.java @@ -25,9 +25,6 @@ public final class Static233 { @OriginalMember(owner = "client!t", name = "G", descriptor = "[Lclient!ek;") public static SoftwareIndexedSprite[] aClass36_Sub1Array1; - @OriginalMember(owner = "client!t", name = "p", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_31 = new SoftLruHashTable(64); - @OriginalMember(owner = "client!t", name = "v", descriptor = "[Lclient!na;") public static final JagString[] aClass100Array160 = new JagString[500]; @@ -41,19 +38,11 @@ public final class Static233 { public static int anInt5224 = 0; @OriginalMember(owner = "client!t", name = "C", descriptor = "Lclient!na;") - public static final JagString aClass100_994 = Static28.parse(")3"); + public static final JagString aClass100_994 = JagString.parse(")3"); @OriginalMember(owner = "client!t", name = "E", descriptor = "[I") public static final int[] updatedVarcstrs = new int[32]; - @OriginalMember(owner = "client!t", name = "F", descriptor = "I") - public static int js5PrevErrors = 0; - - @OriginalMember(owner = "client!t", name = "b", descriptor = "(I)V") - public static void method3999() { - Static67.aClass99_20.clear(); - } - @OriginalMember(owner = "client!t", name = "a", descriptor = "(IIIZIII)V") public static void method4000(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { @Pc(3) int local3 = 0; @@ -70,13 +59,6 @@ public final class Static233 { } } - @OriginalMember(owner = "client!t", name = "b", descriptor = "(B)V") - public static void method4001() { - Static93.aClass99_13.method3103(); - Static125.aClass99_18.method3103(); - Static262.headModels.method3103(); - } - @OriginalMember(owner = "client!t", name = "a", descriptor = "(ZB)V") public static void method4002(@OriginalArg(0) boolean arg0) { @Pc(19) byte local19; @@ -89,7 +71,7 @@ public final class Static233 { local21 = Static156.locationMapFilesBuffer; } for (@Pc(29) int local29 = 0; local29 < local19; local29++) { - Static107.loop(); + client.audioLoop(); for (@Pc(36) int local36 = 0; local36 < 13; local36++) { for (@Pc(43) int local43 = 0; local43 < 13; local43++) { @Pc(56) int local56 = Static187.anIntArrayArrayArray18[local29][local36][local43]; @@ -102,7 +84,7 @@ public final class Static233 { @Pc(99) int local99 = local89 / 8 + (local83 / 8 << 8); for (@Pc(101) int local101 = 0; local101 < Static238.regionBitPacked.length; local101++) { if (Static238.regionBitPacked[local101] == local99 && local21[local101] != null) { - Static217.method3771(Static148.collisionMaps, local29, local21[local101], local67, local77, local36 * 8, local43 * 8, arg0, (local83 & 0x7) * 8, (local89 & 0x7) * 8); + Static217.method3771(PathFinder.collisionMaps, local29, local21[local101], local67, local77, local36 * 8, local43 * 8, arg0, (local83 & 0x7) * 8, (local89 & 0x7) * 8); break; } } @@ -119,7 +101,7 @@ public final class Static233 { @Pc(24) int local24 = (int) arg0 >> 20 & 0x3; @Pc(31) int local31 = (int) (arg0 >>> 32) & Integer.MAX_VALUE; if (local12 == 10 || local12 == 11 || local12 == 22) { - @Pc(46) LocType local46 = Static271.get(local31); + @Pc(46) LocType local46 = LocTypeList.get(local31); @Pc(62) int local62; @Pc(59) int local59; if (local24 == 0 || local24 == 2) { diff --git a/client/src/main/java/Static234.java b/client/src/main/java/Static234.java index 2efc4f8..47d0098 100644 --- a/client/src/main/java/Static234.java +++ b/client/src/main/java/Static234.java @@ -7,9 +7,6 @@ public final class Static234 { @OriginalMember(owner = "client!ta", name = "o", descriptor = "[I") public static int[] anIntArray454; - @OriginalMember(owner = "client!ta", name = "p", descriptor = "[I") - public static int[] anIntArray455; - @OriginalMember(owner = "client!ta", name = "z", descriptor = "[I") public static final int[] anIntArray456 = new int[] { -1, 0, 8, 0, 2, 0, 0, 0, 0, 12, 0, 1, 0, 3, 7, 0, 15, 6, 0, 0, 4, 7, -2, -1, 2, 0, 2, 8, 0, 0, 0, 0, -2, 5, 0, 0, 8, 3, 6, 0, 0, 0, -1, 0, -1, 0, 0, 6, -2, 0, 12, 0, 0, 0, -1, -2, 10, 0, 0, 0, 3, 0, -1, 0, 0, 5, 6, 0, 0, 8, -1, -1, 0, 8, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 6, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 5, 0, 0, -2, 0, 0, 0, 0, 0, 12, 2, 0, -2, -2, 20, 0, 0, 10, 0, 15, 0, -1, 0, 8, -2, 0, 0, 0, 8, 0, 12, 0, 0, 7, 0, 0, 0, 0, 0, -1, -1, 0, 4, 5, 0, 0, 0, 6, 0, 0, 0, 0, 8, 9, 0, 0, 0, 2, -1, 0, -2, 0, 4, 14, 0, 0, 0, 24, 0, -2, 5, 0, 0, 0, 10, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 2, 1, 0, 0, 2, -1, 1, 0, 0, 0, 0, 14, 0, 0, 0, 0, 10, 5, 0, 0, 0, 0, 0, -2, 0, 0, 9, 0, 0, 8, 0, 0, 0, 0, -2, 6, 0, 0, 0, -2, 0, 3, 0, 1, 7, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 3, 0, 0 }; @@ -21,46 +18,46 @@ public final class Static234 { for (@Pc(3) int local3 = 0; local3 < Static116.anInt2951; local3++) { @Pc(10) int local10 = Static44.anIntArray106[local3]; @Pc(14) Npc local14 = Static175.npcs[local10]; - @Pc(18) int local18 = Static57.aClass3_Sub15_Sub1_3.g1(); + @Pc(18) int local18 = Protocol.inboundBuffer.g1(); if ((local18 & 0x8) != 0) { - local18 += Static57.aClass3_Sub15_Sub1_3.g1() << 8; + local18 += Protocol.inboundBuffer.g1() << 8; } @Pc(43) int local43; @Pc(47) int local47; if ((local18 & 0x40) != 0) { - local43 = Static57.aClass3_Sub15_Sub1_3.g1(); - local47 = Static57.aClass3_Sub15_Sub1_3.p1neg(); + local43 = Protocol.inboundBuffer.g1(); + local47 = Protocol.inboundBuffer.p1neg(); local14.method2686(local47, Static83.loop, local43); local14.anInt3378 = Static83.loop + 300; - local14.anInt3372 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); + local14.anInt3372 = Protocol.inboundBuffer.g1ssub(); } if ((local18 & 0x2) != 0) { - local43 = Static57.aClass3_Sub15_Sub1_3.p1neg(); - local47 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); + local43 = Protocol.inboundBuffer.p1neg(); + local47 = Protocol.inboundBuffer.g1ssub(); local14.method2686(local47, Static83.loop, local43); } if ((local18 & 0x10) != 0) { - local43 = Static57.aClass3_Sub15_Sub1_3.g2(); - local47 = Static57.aClass3_Sub15_Sub1_3.g1(); + local43 = Protocol.inboundBuffer.g2(); + local47 = Protocol.inboundBuffer.g1(); if (local43 == 65535) { local43 = -1; } Static223.method3855(local47, local43, local14); } if ((local18 & 0x4) != 0) { - local14.anInt3370 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + local14.anInt3370 = Protocol.inboundBuffer.g2sub(); if (local14.anInt3370 == 65535) { local14.anInt3370 = -1; } } if ((local18 & 0x80) != 0) { - local43 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + local43 = Protocol.inboundBuffer.g2sub(); if (local43 == 65535) { local43 = -1; } - local47 = Static57.aClass3_Sub15_Sub1_3.g4me(); + local47 = Protocol.inboundBuffer.g4me(); @Pc(147) boolean local147 = true; - if (local43 != -1 && local14.anInt3432 != -1 && Static36.get(Static34.method877(local43).seqId).anInt5355 < Static36.get(Static34.method877(local14.anInt3432).seqId).anInt5355) { + if (local43 != -1 && local14.anInt3432 != -1 && SeqTypeList.get(SpotAnimTypeList.get(local43).seqId).anInt5355 < SeqTypeList.get(SpotAnimTypeList.get(local14.anInt3432).seqId).anInt5355) { local147 = false; } if (local147) { @@ -74,9 +71,9 @@ public final class Static234 { local14.anInt3399 = -1; } if (local14.anInt3432 != -1 && local14.anInt3359 == Static83.loop) { - @Pc(227) int local227 = Static34.method877(local14.anInt3432).seqId; + @Pc(227) int local227 = SpotAnimTypeList.get(local14.anInt3432).seqId; if (local227 != -1) { - @Pc(236) SeqType local236 = Static36.get(local227); + @Pc(236) SeqType local236 = SeqTypeList.get(local227); if (local236 != null && local236.frames != null) { SoundPlayer.playSeqSound(local14.zFine, local236, local14.xFine, false, 0); } @@ -88,7 +85,7 @@ public final class Static234 { if (local14.type.hasAreaSound()) { Static91.method1877(local14); } - local14.method2698(Static214.get(Static57.aClass3_Sub15_Sub1_3.g2le())); + local14.method2698(NpcTypeList.get(Protocol.inboundBuffer.g2le())); local14.method2692(local14.type.soze); local14.anInt3365 = local14.type.basId; if (local14.type.hasAreaSound()) { @@ -96,49 +93,36 @@ public final class Static234 { } } if ((local18 & 0x20) != 0) { - local14.aClass100_640 = Static57.aClass3_Sub15_Sub1_3.gjstr(); + local14.aClass100_640 = Protocol.inboundBuffer.gjstr(); local14.anInt3408 = 100; } if ((local18 & 0x100) != 0) { - local43 = Static57.aClass3_Sub15_Sub1_3.p1neg(); + local43 = Protocol.inboundBuffer.p1neg(); @Pc(331) int[] local331 = new int[local43]; @Pc(334) int[] local334 = new int[local43]; @Pc(337) int[] local337 = new int[local43]; for (@Pc(339) int local339 = 0; local339 < local43; local339++) { - @Pc(350) int local350 = Static57.aClass3_Sub15_Sub1_3.g2le(); + @Pc(350) int local350 = Protocol.inboundBuffer.g2le(); if (local350 == 65535) { local350 = -1; } local331[local339] = local350; - local334[local339] = Static57.aClass3_Sub15_Sub1_3.g1ssub(); - local337[local339] = Static57.aClass3_Sub15_Sub1_3.g2(); + local334[local339] = Protocol.inboundBuffer.g1ssub(); + local337[local339] = Protocol.inboundBuffer.g2(); } Static159.method3037(local337, local14, local334, local331); } if ((local18 & 0x200) != 0) { - local14.anInt3382 = Static57.aClass3_Sub15_Sub1_3.g2sub(); - local14.anInt3363 = Static57.aClass3_Sub15_Sub1_3.g2(); + local14.anInt3382 = Protocol.inboundBuffer.g2sub(); + local14.anInt3363 = Protocol.inboundBuffer.g2(); } } } @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)) { - Static266.method4190(-1, arg1, arg3, arg0, Static241.components[arg2]); - } - } - - @OriginalMember(owner = "client!ta", name = "a", descriptor = "([Lclient!mm;ILclient!ve;)V") - public static void method4018(@OriginalArg(0) SoftwareSprite[] arg0, @OriginalArg(2) Js5 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 = 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.addTail(Static210.method3713(new Buffer(MapList.archive.getFile(local25, local30[local32])))); + if (InterfaceList.load(arg2)) { + Static266.method4190(-1, arg1, arg3, arg0, InterfaceList.components[arg2]); } } diff --git a/client/src/main/java/Static235.java b/client/src/main/java/Static235.java index 161627d..559be7c 100644 --- a/client/src/main/java/Static235.java +++ b/client/src/main/java/Static235.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 Static235 { @@ -8,7 +6,7 @@ public final class Static235 { public static MapElementList mapElementList; @OriginalMember(owner = "client!tb", name = "P", descriptor = "Lclient!na;") - public static final JagString aClass100_1002 = Static28.parse("(U5"); + public static final JagString aClass100_1002 = JagString.parse("(U5"); @OriginalMember(owner = "client!tb", name = "Q", descriptor = "I") public static int anInt5276 = 0; @@ -18,26 +16,4 @@ public final class Static235 { return Static172.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && Static231.anInt5204 > 2 ? Static190.anIntArray382[Static231.anInt5204 - 2] : Static190.anIntArray382[Static231.anInt5204 - 1]; } - @OriginalMember(owner = "client!tb", name = "b", descriptor = "(IB)Lclient!bc;") - public static QuickChatCatType method4045(@OriginalArg(0) int arg0) { - @Pc(10) QuickChatCatType local10 = (QuickChatCatType) Static73.aClass54_7.get((long) arg0); - if (local10 != null) { - return local10; - } - @Pc(24) byte[] local24; - if (arg0 < 32768) { - local24 = Static87.aClass153_38.getFile(0, arg0); - } else { - local24 = Static29.aClass153_19.getFile(0, arg0 & 0x7FFF); - } - local10 = new QuickChatCatType(); - if (local24 != null) { - local10.method470(new Buffer(local24)); - } - if (arg0 >= 32768) { - local10.method465(); - } - Static73.aClass54_7.put(local10, (long) arg0); - return local10; - } } diff --git a/client/src/main/java/Static238.java b/client/src/main/java/Static238.java index 4878ab5..def1476 100644 --- a/client/src/main/java/Static238.java +++ b/client/src/main/java/Static238.java @@ -4,20 +4,12 @@ import org.openrs2.deob.annotation.Pc; public final class Static238 { - @OriginalMember(owner = "client!te", name = "y", descriptor = "Lclient!ve;") - public static Js5 aClass153_96; - - @OriginalMember(owner = "client!te", name = "H", descriptor = "[I") + @OriginalMember(owner = "client!te", name = "H", descriptor = "[I") public static int[] regionBitPacked; @OriginalMember(owner = "client!te", name = "B", descriptor = "[I") public static final int[] anIntArray469 = new int[] { 0, -1, 0, 1 }; - @OriginalMember(owner = "client!te", name = "a", descriptor = "(IZ)V") - public static void method4142() { - Static67.aClass99_20.method3102(5); - } - @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) DelayedStateChange.changes.get((long) arg1 | (long) arg0 << 32); diff --git a/client/src/main/java/Static24.java b/client/src/main/java/Static24.java index 68c26e9..2e7c488 100644 --- a/client/src/main/java/Static24.java +++ b/client/src/main/java/Static24.java @@ -4,20 +4,12 @@ import org.openrs2.deob.annotation.Pc; public final class Static24 { - @OriginalMember(owner = "client!bn", name = "N", descriptor = "Lclient!be;") - public static Component component; - @OriginalMember(owner = "client!bn", name = "O", descriptor = "I") public static int anInt761; @OriginalMember(owner = "client!bn", name = "eb", descriptor = "I") public static int anInt773 = 0; - @OriginalMember(owner = "client!bn", name = "c", descriptor = "(II)V") - public static void method666() { - Static232.aClass99_30.method3102(5); - } - @OriginalMember(owner = "client!bn", name = "a", descriptor = "(III)I") public static int method667(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { @Pc(8) int local8 = 0; @@ -35,9 +27,9 @@ public final class Static24 { @Pc(11) int local11 = 0; @Pc(22) short[] local22 = new short[16]; @Pc(28) int local28 = arg0 ? 32768 : 0; - @Pc(36) int local36 = (arg0 ? Static34.anInt1047 : Static144.anInt3490) + local28; + @Pc(36) int local36 = (arg0 ? QuickChatPhraseTypeList.anInt1047 : QuickChatPhraseTypeList.anInt3490) + local28; for (@Pc(38) int local38 = local28; local38 < local36; local38++) { - @Pc(45) QuickChatPhraseType local45 = Static230.method3953(local38); + @Pc(45) QuickChatPhraseType local45 = QuickChatPhraseTypeList.get(local38); if (local45.aBoolean60 && local45.method769().toLowerCase().indexOf(local9) != -1) { if (local11 >= 50) { Static111.anInt2905 = -1; @@ -59,7 +51,7 @@ public final class Static24 { Static67.anInt3356 = 0; @Pc(113) JagString[] local113 = new JagString[Static111.anInt2905]; for (@Pc(115) int local115 = 0; local115 < Static111.anInt2905; local115++) { - local113[local115] = Static230.method3953(local22[local115]).method769(); + local113[local115] = QuickChatPhraseTypeList.get(local22[local115]).method769(); } Static202.method3656(local113, Static169.aShortArray52); } diff --git a/client/src/main/java/Static240.java b/client/src/main/java/Static240.java index 89b5b00..869b2f9 100644 --- a/client/src/main/java/Static240.java +++ b/client/src/main/java/Static240.java @@ -12,18 +12,15 @@ public final class Static240 { @OriginalMember(owner = "client!tg", name = "c", descriptor = "I") public static int screenLowerX; - @OriginalMember(owner = "client!tg", name = "f", descriptor = "Z") - public static boolean aBoolean276; - @OriginalMember(owner = "client!tg", name = "g", descriptor = "[[[B") public static byte[][][] aByteArrayArrayArray14; @OriginalMember(owner = "client!tg", name = "e", descriptor = "Lclient!na;") - public static final JagString aClass100_1008 = Static28.parse(""); + public static final JagString aClass100_1008 = JagString.parse(""); @OriginalMember(owner = "client!tg", name = "h", descriptor = "I") public static int anInt5335 = 0; @OriginalMember(owner = "client!tg", name = "i", descriptor = "Lclient!na;") - public static final JagString aClass100_1009 = Static28.parse("::pcachesize"); + public static final JagString aClass100_1009 = JagString.parse("::pcachesize"); } diff --git a/client/src/main/java/Static241.java b/client/src/main/java/Static241.java index d436f97..59e5797 100644 --- a/client/src/main/java/Static241.java +++ b/client/src/main/java/Static241.java @@ -4,22 +4,13 @@ import org.openrs2.deob.annotation.Pc; public final class Static241 { - @OriginalMember(owner = "client!th", name = "j", descriptor = "[[Lclient!be;") - public static Component[][] components; - - @OriginalMember(owner = "client!th", name = "m", descriptor = "[Lclient!be;") + @OriginalMember(owner = "client!th", name = "m", descriptor = "[Lclient!be;") public static Component[] aClass13Array13; @OriginalMember(owner = "client!th", name = "o", descriptor = "[I") public static int[] anIntArray522; - @OriginalMember(owner = "client!th", name = "p", descriptor = "[Lclient!mm;") - public static SoftwareSprite[] aClass3_Sub2_Sub1_Sub1Array13; - - @OriginalMember(owner = "client!th", name = "h", descriptor = "Lclient!na;") - public static final JagString aClass100_1088 = Static28.parse("::setparticles"); - - @OriginalMember(owner = "client!th", name = "i", descriptor = "[I") + @OriginalMember(owner = "client!th", name = "i", descriptor = "[I") public static final int[] anIntArray520 = new int[14]; @OriginalMember(owner = "client!th", name = "l", descriptor = "[I") @@ -54,7 +45,7 @@ public final class Static241 { if (arg0 && arg1 > 0) { local44 = true; } - Static197.method3560(arg0, arg1, local44, local4, arg2, arg3); + Static197.setWindowMode(arg0, arg1, local44, local4, arg2, arg3); } @OriginalMember(owner = "client!th", name = "a", descriptor = "(IIBIIII)I") @@ -76,19 +67,7 @@ public final class Static241 { } } - @OriginalMember(owner = "client!th", name = "a", descriptor = "(ZBLclient!ve;Lclient!dd;Lclient!ve;)V") - public static void init(@OriginalArg(2) Js5 arg0, @OriginalArg(3) SoftwareFont arg1, @OriginalArg(4) Js5 arg2) { - Static240.aBoolean276 = true; - Static230.modelsArchive = arg2; - Static167.aClass153_61 = arg0; - @Pc(23) int local23 = Static167.aClass153_61.method4483() - 1; - Static170.anInt3245 = Static167.aClass153_61.method4504(local23) + local23 * 256; - Static143.aClass100Array104 = new JagString[] { null, null, null, null, LocalizedText.DROP}; - Static269.aClass100Array87 = new JagString[] { null, null, LocalizedText.TAKE, null, null }; - Static256.aClass3_Sub2_Sub9_Sub1_1 = arg1; - } - - @OriginalMember(owner = "client!th", name = "a", descriptor = "(BIIIII)V") + @OriginalMember(owner = "client!th", name = "a", descriptor = "(BIIIII)V") public static void method4547(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { @Pc(9) int local9 = arg1 - arg2; @Pc(14) int local14 = arg3 - arg4; diff --git a/client/src/main/java/Static243.java b/client/src/main/java/Static243.java index 307d4d5..8ffc525 100644 --- a/client/src/main/java/Static243.java +++ b/client/src/main/java/Static243.java @@ -4,15 +4,9 @@ import org.openrs2.deob.annotation.Pc; public final class Static243 { - @OriginalMember(owner = "client!tk", name = "j", descriptor = "Lclient!ve;") - public static Js5 spritesArchive; - - @OriginalMember(owner = "client!tk", name = "o", descriptor = "Lclient!ok;") + @OriginalMember(owner = "client!tk", name = "o", descriptor = "Lclient!ok;") public static IndexedSprite logo; - @OriginalMember(owner = "client!tk", name = "s", descriptor = "Lclient!ve;") - public static Js5 aClass153_98; - @OriginalMember(owner = "client!tk", name = "D", descriptor = "[Lclient!ec;") public static Scenery[] aClass31Array3; @@ -40,13 +34,13 @@ public final class Static243 { Static114.method4625(); Static49.anInt1462 = -1; Static5.anInt45 = -1; - Static164.anInt3985 = -1; + Protocol.opcode = -1; Static267.anInt5775 = 0; Static60.rebootTimer = 0; - Static6.outboundBuffer.offset = 0; + Protocol.outboundBuffer.offset = 0; Static230.anInt5152 = -1; Static201.anInt1862 = 0; - Static57.aClass3_Sub15_Sub1_3.offset = 0; + Protocol.inboundBuffer.offset = 0; @Pc(3506) int local3506; for (local3506 = 0; local3506 < Static143.aClass102Array1.length; local3506++) { Static143.aClass102Array1[local3506] = null; @@ -67,7 +61,7 @@ public final class Static243 { Static206.anInt4774 = (int) (Math.random() * 110.0D) - 55; Static241.aBoolean302 = false; Static273.anInt4130 = (int) (Math.random() * 30.0D) - 20; - Static189.anInt4451 = 0; + SoundPlayer.anInt4451 = 0; Static115.anInt2939 = 0; Static59.anInt1814 = (int) (Math.random() * 120.0D) - 60; Static62.anInt1941 = 0; @@ -111,14 +105,14 @@ public final class Static243 { Static155.varcs[local3506] = -1; } if (InterfaceList.topLevelInterface != -1) { - Static109.method2275(InterfaceList.topLevelInterface); + InterfaceList.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); } InterfaceList.topLevelInterface = -1; Static119.aClass133_9 = new HashTable(8); - Static52.method1287(); + InterfaceList.method1287(); Static39.aClass13_10 = null; Static60.aBoolean108 = false; Static231.anInt5204 = 0; @@ -148,10 +142,10 @@ public final class Static243 { Static86.setInstantFade(); } Static197.aBoolean228 = true; - Static189.anInt4443 = 0; + Protocol.verifyId = 0; Static195.aClass100_859 = LocalizedText.WALKHERE; Static127.neverRemoveRoofs = false; - Static259.aShortArray88 = Static62.aShortArray19 = Static232.aShortArray74 = Static259.aShortArray87 = new short[256]; + client.aShortArray88 = client.aShortArray19 = client.aShortArray74 = client.aShortArray87 = new short[256]; Static114.method4637(); Static261.aBoolean298 = false; Static59.method1373(); diff --git a/client/src/main/java/Static244.java b/client/src/main/java/Static244.java index 84e34be..a3e3a21 100644 --- a/client/src/main/java/Static244.java +++ b/client/src/main/java/Static244.java @@ -4,15 +4,12 @@ import org.openrs2.deob.annotation.Pc; 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 = "f", descriptor = "Lclient!na;") - public static final JagString aClass100_1014 = Static28.parse(":assist:"); + public static final JagString aClass100_1014 = JagString.parse(":assist:"); @OriginalMember(owner = "client!tl", name = "i", descriptor = "Lclient!na;") - public static final JagString aClass100_1017 = Static28.parse(")1"); + public static final JagString aClass100_1017 = JagString.parse(")1"); @OriginalMember(owner = "client!tl", name = "a", descriptor = "(IIIIIIII)V") public static void method4222(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) { diff --git a/client/src/main/java/Static245.java b/client/src/main/java/Static245.java index 26a08d6..d1203fa 100644 --- a/client/src/main/java/Static245.java +++ b/client/src/main/java/Static245.java @@ -8,12 +8,9 @@ public final class Static245 { public static int anInt5375; @OriginalMember(owner = "client!tm", name = "d", descriptor = "Lclient!na;") - public static final JagString aClass100_1018 = Static28.parse("; Expires=Thu)1 01)2Jan)21970 00:00:00 GMT; Max)2Age=0"); + public static final JagString aClass100_1018 = JagString.parse("; Expires=Thu)1 01)2Jan)21970 00:00:00 GMT; Max)2Age=0"); - @OriginalMember(owner = "client!tm", name = "e", descriptor = "Z") - public static boolean enabled = false; - - @OriginalMember(owner = "client!tm", name = "i", descriptor = "I") + @OriginalMember(owner = "client!tm", name = "i", descriptor = "I") public static int anInt5377 = 0; @OriginalMember(owner = "client!tm", name = "a", descriptor = "(II)V") @@ -22,48 +19,14 @@ public final class Static245 { local16.pushClient(); } - @OriginalMember(owner = "client!tm", name = "b", descriptor = "(II)Z") - public static boolean load(@OriginalArg(0) int arg0) { - if (Static223.aBooleanArray115[arg0]) { - return true; - } else if (Static202.aClass153_84.method4479(arg0)) { - @Pc(25) int local25 = Static202.aClass153_84.method4504(arg0); - if (local25 == 0) { - Static223.aBooleanArray115[arg0] = true; - return true; - } - if (Static241.components[arg0] == null) { - Static241.components[arg0] = new Component[local25]; - } - for (@Pc(46) int local46 = 0; local46 < local25; local46++) { - if (Static241.components[arg0][local46] == null) { - @Pc(62) byte[] local62 = Static202.aClass153_84.getFile(arg0, local46); - if (local62 != null) { - @Pc(74) Component local74 = Static241.components[arg0][local46] = new Component(); - local74.id = local46 + (arg0 << 16); - if (local62[0] == -1) { - local74.method490(new Buffer(local62)); - } else { - local74.method481(new Buffer(local62)); - } - } - } - } - Static223.aBooleanArray115[arg0] = true; - return true; - } else { - return false; - } - } - @OriginalMember(owner = "client!tm", name = "a", descriptor = "(I)V") public static void method4226() { for (@Pc(7) int local7 = 0; local7 < Static116.anInt2951; local7++) { @Pc(31) int local31 = Static44.anIntArray106[local7]; @Pc(35) Player local35 = Static159.players[local31]; - @Pc(39) int local39 = Static57.aClass3_Sub15_Sub1_3.g1(); + @Pc(39) int local39 = Protocol.inboundBuffer.g1(); if ((local39 & 0x10) != 0) { - local39 += Static57.aClass3_Sub15_Sub1_3.g1() << 8; + local39 += Protocol.inboundBuffer.g1() << 8; } Static84.method1768(local39, local31, local35); } @@ -197,7 +160,7 @@ public final class Static245 { for (local232 = 0; local232 < local497; local232++) { @Pc(517) Light local517 = new Light(local96); if (local517.anInt2243 == 31) { - @Pc(529) LightType local529 = Static140.method2709(local96.g2()); + @Pc(529) LightType local529 = LightTypeList.get(local96.g2()); local517.method1762(local529.anInt2865, local529.anInt2873, local529.anInt2867, local529.anInt2872); } local417 = local517.anInt2240 >> 7; diff --git a/client/src/main/java/Static246.java b/client/src/main/java/Static246.java index 1422abd..c8995ef 100644 --- a/client/src/main/java/Static246.java +++ b/client/src/main/java/Static246.java @@ -11,13 +11,7 @@ public final class Static246 { public static int anInt5388 = 0; @OriginalMember(owner = "client!u", name = "g", descriptor = "Lclient!na;") - public static final JagString aClass100_1029 = Static28.parse("cookiehost"); - - @OriginalMember(owner = "client!u", name = "a", descriptor = "(BLclient!ve;Lclient!ve;)V") - public static void init(@OriginalArg(1) Js5 arg0, @OriginalArg(2) Js5 arg1) { - Static153.aClass153_57 = arg0; - Static243.spritesArchive = arg1; - } + public static final JagString aClass100_1029 = JagString.parse("cookiehost"); @OriginalMember(owner = "client!u", name = "a", descriptor = "(Z)V") public static void method4239() { @@ -55,7 +49,7 @@ public final class Static246 { if (Static260.anInt5014 == 1) { 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); + @Pc(378) ParamType local378 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039); if ((Static274.anInt4999 & 0x2) != 0 && (local378 == null || arg0.getParam(Static121.anInt3039, local378.defaultInt) != local378.defaultInt)) { Static98.method1966(anInt5393, (long) arg2, JagString.concatenate(new JagString[] { Static78.aClass100_466, Static201.aClass100_407, local35 }), arg1, (short) 45, Static102.aClass100_545, arg3); } @@ -129,18 +123,4 @@ public final class Static246 { } } - @OriginalMember(owner = "client!u", name = "a", descriptor = "(II)Lclient!md;") - public static InvType list(@OriginalArg(0) int id) { - @Pc(16) InvType invType = (InvType) Static89.recentUse.get((long) id); - if (invType != null) { - return invType; - } - @Pc(27) byte[] data = Static9.aClass153_2.getFile(5, id); - invType = new InvType(); - if (data != null) { - invType.decode(new Buffer(data)); - } - Static89.recentUse.put(invType, (long) id); - return invType; - } } diff --git a/client/src/main/java/Static247.java b/client/src/main/java/Static247.java index 38fe9c3..7d20542 100644 --- a/client/src/main/java/Static247.java +++ b/client/src/main/java/Static247.java @@ -682,24 +682,4 @@ public final class Static247 { return arg0 & 0xFF; } - @OriginalMember(owner = "client!ub", name = "a", descriptor = "(II)Lclient!eh;") - public static VarpType method4248(@OriginalArg(1) int arg0) { - @Pc(10) VarpType local10 = (VarpType) Static232.aClass99_30.get((long) arg0); - if (local10 != null) { - return local10; - } - @Pc(20) byte[] local20 = Static81.aClass153_34.getFile(16, arg0); - local10 = new VarpType(); - if (local20 != null) { - local10.decode(new Buffer(local20)); - } - Static232.aClass99_30.put(local10, (long) arg0); - return local10; - } - - @OriginalMember(owner = "client!ub", name = "a", descriptor = "(Z)V") - public static void method4249() { - Static279.aClass99_38.clear(); - Static56.models.clear(); - } } diff --git a/client/src/main/java/Static248.java b/client/src/main/java/Static248.java index 2434406..44620a9 100644 --- a/client/src/main/java/Static248.java +++ b/client/src/main/java/Static248.java @@ -5,10 +5,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static248 { - @OriginalMember(owner = "client!uc", name = "c", descriptor = "Lclient!ve;") - public static Js5 js5Archive4; - - @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") @@ -16,7 +13,7 @@ public final class Static248 { @OriginalMember(owner = "client!uc", name = "a", descriptor = "(IB)Z") public static boolean method3288(@OriginalArg(0) int arg0) { - Static189.anInt4443 = arg0 + 1 & 0xFFFF; + Protocol.verifyId = arg0 + 1 & 0xFFFF; Static34.verifyIdChanged = true; return true; } @@ -101,7 +98,7 @@ public final class Static248 { Static156.method2959(); Static27.setMaterial(-1, 3); Static119.aBoolean153 = true; - Static275.method4609(); + UnderwaterMaterialRenderer.method4609(); Static152.anInt3604 = -1; Static22.anInt730 = -1; for (local32 = 0; local32 < Static182.aClass3_Sub14ArrayArray2[0].length; local32++) { @@ -114,7 +111,7 @@ public final class Static248 { } local285.method1944(Static130.aClass3_Sub5ArrayArrayArray1, local294, false); } - Static275.method4608(); + UnderwaterMaterialRenderer.method4608(); } else { local32 = Static235.anInt5276; while (true) { diff --git a/client/src/main/java/Static249.java b/client/src/main/java/Static249.java index 029f83b..bf65117 100644 --- a/client/src/main/java/Static249.java +++ b/client/src/main/java/Static249.java @@ -3,20 +3,8 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static249 { - @OriginalMember(owner = "client!ud", name = "J", descriptor = "Lclient!ve;") - public static Js5 js5Archive1; - - @OriginalMember(owner = "client!ud", name = "K", descriptor = "I") - public static int worldListDefaultPort; - - @OriginalMember(owner = "client!ud", name = "O", descriptor = "I") - public static int anInt5431 = 0; - - @OriginalMember(owner = "client!ud", name = "P", descriptor = "Lclient!gn;") - public static final LruHashTable aClass54_15 = new LruHashTable(64); - - @OriginalMember(owner = "client!ud", name = "Q", descriptor = "Lclient!na;") - public static final JagString aClass100_1039 = Static28.parse(" x "); + @OriginalMember(owner = "client!ud", name = "Q", descriptor = "Lclient!na;") + public static final JagString aClass100_1039 = JagString.parse(" x "); @OriginalMember(owner = "client!ud", name = "T", descriptor = "[I") public static final int[] anIntArray478 = new int[32]; @@ -31,8 +19,4 @@ public final class Static249 { } } - @OriginalMember(owner = "client!ud", name = "d", descriptor = "(I)V") - public static void method4266() { - Static232.aClass99_30.clear(); - } } diff --git a/client/src/main/java/Static25.java b/client/src/main/java/Static25.java index b3273ee..22fc8d9 100644 --- a/client/src/main/java/Static25.java +++ b/client/src/main/java/Static25.java @@ -5,23 +5,7 @@ public final class Static25 { @OriginalMember(owner = "client!c", name = "bb", descriptor = "[Lclient!ec;") public static Scenery[] aClass31Array2; - @OriginalMember(owner = "client!c", name = "Y", descriptor = "Lclient!na;") - public static final JagString aClass100_154 = Static28.parse("Mem:"); - @OriginalMember(owner = "client!c", name = "eb", descriptor = "I") public static int y = 0; - @OriginalMember(owner = "client!c", name = "hb", descriptor = "Z") - public static boolean aBoolean57 = false; - - @OriginalMember(owner = "client!c", name = "c", descriptor = "(II)V") - public static void method715() { - Static220.aClass99_28.method3102(5); - } - - @OriginalMember(owner = "client!c", name = "d", descriptor = "(II)V") - public static void method716() { - Static79.aClass99_11.method3102(5); - Static7.sprites.method3102(5); - } } diff --git a/client/src/main/java/Static250.java b/client/src/main/java/Static250.java index ddd24eb..7fd1bc0 100644 --- a/client/src/main/java/Static250.java +++ b/client/src/main/java/Static250.java @@ -3,26 +3,17 @@ import org.openrs2.deob.annotation.Pc; public final class Static250 { - @OriginalMember(owner = "client!uf", name = "m", descriptor = "I") - public static int titleSong; - - @OriginalMember(owner = "client!uf", name = "p", descriptor = "I") + @OriginalMember(owner = "client!uf", name = "p", descriptor = "I") public static int anInt5443; - @OriginalMember(owner = "client!uf", name = "r", descriptor = "Lclient!ve;") - public static Js5 spritesArchive; - @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 = "q", descriptor = "Lclient!na;") - public static final JagString aClass100_1042 = Static28.parse("Null"); + @OriginalMember(owner = "client!uf", name = "q", descriptor = "Lclient!na;") + public static final JagString aClass100_1042 = JagString.parse("Null"); @OriginalMember(owner = "client!uf", name = "s", descriptor = "Lclient!na;") - public static final JagString aClass100_1043 = Static28.parse(" "); + public static final JagString aClass100_1043 = JagString.parse(" "); @OriginalMember(owner = "client!uf", name = "t", descriptor = "I") public static int anInt5444 = 0; @@ -42,8 +33,8 @@ public final class Static250 { Static81.cameraX += (playerX - Static81.cameraX) / 16; } if (Preferences.aBoolean63) { - for (@Pc(93) int local93 = 0; local93 < Static182.keyQueueSize; local93++) { - @Pc(104) int code = Static227.keyCodes[local93]; + for (@Pc(93) int local93 = 0; local93 < InterfaceList.keyQueueSize; local93++) { + @Pc(104) int code = InterfaceList.keyCodes[local93]; if (code == Keyboard.KEY_UP) { Camera.pitchDirection = 1; Camera.pitchTarget += 47; diff --git a/client/src/main/java/Static251.java b/client/src/main/java/Static251.java index 2fa676a..f056b30 100644 --- a/client/src/main/java/Static251.java +++ b/client/src/main/java/Static251.java @@ -54,11 +54,6 @@ public final class Static251 { } } - @OriginalMember(owner = "client!ug", name = "b", descriptor = "(B)V") - public static void method4276() { - Static45.aClass99_6.method3103(); - } - @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 95eb92f..81753f9 100644 --- a/client/src/main/java/Static252.java +++ b/client/src/main/java/Static252.java @@ -7,16 +7,11 @@ public final class Static252 { public static Js5 aClass153_103; @OriginalMember(owner = "client!uh", name = "Y", descriptor = "Lclient!na;") - public static final JagString HUFFMAN_GROUP = Static28.parse("huffman"); + public static final JagString HUFFMAN_GROUP = JagString.parse("huffman"); @OriginalMember(owner = "client!uh", name = "ab", descriptor = "Lclient!q;") public static final ReferenceNodeFactory aClass22_1 = Static44.method1147(); - @OriginalMember(owner = "client!uh", name = "e", descriptor = "(I)V") - public static void method4301() { - Static233.aClass99_31.method3103(); - } - @OriginalMember(owner = "client!uh", name = "f", descriptor = "(I)V") public static void method4302() { if (Static236.method4047() != 2) { @@ -42,7 +37,7 @@ public final class Static252 { Static50.anIntArray134[local33] = 0; } if (Static227.cameraType != 1) { - local33 = Static207.method3685(Static55.level, Static138.renderX, Static134.renderZ); + local33 = SceneGraph.getTileHeight(Static55.level, Static138.renderX, Static134.renderZ); if (local33 - Static5.anInt40 < 800 && (Static12.tileSettings[Static55.level][Static138.renderX >> 7][Static134.renderZ >> 7] & 0x4) != 0) { Static254.method4348(false, Static138.renderX >> 7, Static134.renderZ >> 7, Static130.aClass3_Sub5ArrayArrayArray1, 1); } diff --git a/client/src/main/java/Static253.java b/client/src/main/java/Static253.java index 063f4ac..e1bd9b1 100644 --- a/client/src/main/java/Static253.java +++ b/client/src/main/java/Static253.java @@ -13,9 +13,6 @@ public final class Static253 { @OriginalMember(owner = "client!ui", name = "T", descriptor = "F") public static float aFloat36; - @OriginalMember(owner = "client!ui", name = "cb", descriptor = "Lclient!ve;") - public static Js5 js5Archive20; - @OriginalMember(owner = "client!ui", name = "eb", descriptor = "[[[B") public static byte[][][] aByteArrayArrayArray16; @@ -54,7 +51,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, PlayerList.self.xFine, PlayerList.self.zFine) - 50, 600 - -(local59 * 3), local57, Static111.cameraZ, local59); + Static18.method555(Static81.cameraX, arg0, SceneGraph.getTileHeight(Static55.level, PlayerList.self.xFine, PlayerList.self.zFine) - 50, 600 - -(local59 * 3), local57, Static111.cameraZ, local59); } local57 = Static5.anInt40; local59 = Static138.renderX; @@ -116,7 +113,7 @@ public final class Static253 { @Pc(361) int local361 = Static148.screenUpperY; Static34.anInt1053 = (local361 - local344) * (Static60.anInt1892 - arg4) / arg0 + local344; } - Static107.loop(); + client.audioLoop(); @Pc(387) byte local387 = Static236.method4047() == 2 ? (byte) Static136.anInt3325 : 1; if (GlRenderer.enabled) { GlRenderer.method4173(); @@ -135,14 +132,14 @@ public final class Static253 { Static263.aBoolean299 = true; Static120.method2390(); Static143.method2731(0, 0, 0, 0, 0); - Static107.loop(); + client.audioLoop(); Static223.method3858(); Static142.method2726(arg4, arg3, arg2, Static223.anInt5029, arg0, Static223.anInt5029); Static233.method4000(arg3, arg2, arg0, Static223.anInt5029, Static223.anInt5029, arg4); } else { 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(); + client.audioLoop(); Static223.method3858(); Static142.method2726(arg4, arg3, arg2, 256, arg0, 256); Static233.method4000(arg3, arg2, arg0, 256, 256, arg4); @@ -170,30 +167,10 @@ public final class Static253 { } } - @OriginalMember(owner = "client!ui", name = "c", descriptor = "(II)I") - public static int method4328(@OriginalArg(0) int arg0) { - return arg0 >>> 8; - } - - @OriginalMember(owner = "client!ui", name = "a", descriptor = "(IZ)Lclient!ml;") - public static EnumType method4330(@OriginalArg(0) int arg0) { - @Pc(10) EnumType local10 = (EnumType) Static149.aClass54_10.get((long) arg0); - if (local10 != null) { - return local10; - } - @Pc(24) byte[] local24 = Static84.aClass153_35.getFile(Static97.method1959(arg0), Static103.method2236(arg0)); - local10 = new EnumType(); - if (local24 != null) { - local10.decode(new Buffer(local24)); - } - Static149.aClass54_10.put(local10, (long) arg0); - return local10; - } - - @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]; + if (arg0 >= 0 && MapList.aBooleanArray130.length > arg0) { + MapList.aBooleanArray130[arg0] = !MapList.aBooleanArray130[arg0]; } } } diff --git a/client/src/main/java/Static254.java b/client/src/main/java/Static254.java index 217f03d..4f67533 100644 --- a/client/src/main/java/Static254.java +++ b/client/src/main/java/Static254.java @@ -10,11 +10,8 @@ public final class Static254 { @OriginalMember(owner = "client!uj", name = "H", descriptor = "I") public static int anInt5559; - @OriginalMember(owner = "client!uj", name = "J", descriptor = "Lclient!ve;") - public static Js5 js5Archive24; - - @OriginalMember(owner = "client!uj", name = "s", descriptor = "Lclient!na;") - public static final JagString aClass100_1061 = Static28.parse("null"); + @OriginalMember(owner = "client!uj", name = "s", descriptor = "Lclient!na;") + public static final JagString aClass100_1061 = JagString.parse("null"); @OriginalMember(owner = "client!uj", name = "t", descriptor = "[I") public static final int[] intStack = new int[1000]; @@ -206,10 +203,10 @@ public final class Static254 { local7 = 32767; } @Pc(15) byte[] local15 = new byte[local7]; - arg0.offset += Static62.aClass44_1.method1552(0, local7, local15, arg0.data, arg0.offset); + arg0.offset += WordPack.codec.method1552(0, local7, local15, arg0.data, arg0.offset); return Static10.decodeString(local15, local7, 0); } catch (@Pc(47) Exception local47) { - return Static267.aClass100_1087; + return WordPack.CABBAGE; } } } diff --git a/client/src/main/java/Static256.java b/client/src/main/java/Static256.java index 7b72800..2a9dab6 100644 --- a/client/src/main/java/Static256.java +++ b/client/src/main/java/Static256.java @@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static256 { - @OriginalMember(owner = "client!um", name = "U", descriptor = "Lclient!dd;") - public static SoftwareFont aClass3_Sub2_Sub9_Sub1_1; - @OriginalMember(owner = "client!um", name = "a", descriptor = "(Z)V") public static void method4392() { Static11.anInt384 = 0; @@ -92,18 +89,4 @@ public final class Static256 { return false; } - @OriginalMember(owner = "client!um", name = "a", descriptor = "(BI)Lclient!wl;") - public static FloType method4395(@OriginalArg(1) int arg0) { - @Pc(6) FloType local6 = (FloType) Static233.aClass99_31.get((long) arg0); - if (local6 != null) { - return local6; - } - @Pc(30) byte[] local30 = Static35.aClass153_22.getFile(4, arg0); - local6 = new FloType(); - if (local30 != null) { - local6.method4669(new Buffer(local30), arg0); - } - Static233.aClass99_31.put(local6, (long) arg0); - return local6; - } } diff --git a/client/src/main/java/Static257.java b/client/src/main/java/Static257.java index f5b4715..40cf2f9 100644 --- a/client/src/main/java/Static257.java +++ b/client/src/main/java/Static257.java @@ -7,11 +7,8 @@ public final class Static257 { @OriginalMember(owner = "client!v", name = "b", descriptor = "Lclient!be;") public static Component aClass13_7; - @OriginalMember(owner = "client!v", name = "f", descriptor = "Lclient!al;") - public static Js5MasterIndex js5MasterIndex; - @OriginalMember(owner = "client!v", name = "a", descriptor = "Lclient!na;") - public static final JagString aClass100_98 = Static28.parse(")4a="); + public static final JagString aClass100_98 = JagString.parse(")4a="); @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) { @@ -34,14 +31,4 @@ public final class Static257 { } } - @OriginalMember(owner = "client!v", name = "a", descriptor = "(ZIILclient!ve;ZII)V") - public static void method526(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1, @OriginalArg(5) int arg2) { - Static172.aClass153_70 = arg1; - Static226.anInt5085 = 0; - Static277.anInt5853 = arg0; - Static72.aBoolean116 = false; - Static14.anInt441 = 1; - Static57.anInt1757 = 2; - Static253.anInt5527 = arg2; - } } diff --git a/client/src/main/java/Static258.java b/client/src/main/java/Static258.java index 391c20c..5cdc8f1 100644 --- a/client/src/main/java/Static258.java +++ b/client/src/main/java/Static258.java @@ -4,20 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static258 { - @OriginalMember(owner = "client!va", name = "G", descriptor = "[Z") - public static boolean[] aBooleanArray130; - - @OriginalMember(owner = "client!va", name = "O", descriptor = "I") - public static int threadPriority; - - @OriginalMember(owner = "client!va", name = "b", descriptor = "(II)V") - public static void method4415() { - Static179.aClass99_25.method3102(5); - Static169.aClass99_24.method3102(5); - Static93.aClass99_14.method3102(5); - Static262.aClass99_36.method3102(5); - } - @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) { @@ -59,13 +45,13 @@ public final class Static258 { Static18.anInt588 = local171; if (arg2.objTypes[local171] > 0) { @Pc(267) ServerActiveProperties local267 = Static36.method940(arg2); - @Pc(276) ObjType local276 = Static71.get(arg2.objTypes[local171] - 1); + @Pc(276) ObjType local276 = ObjTypeList.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, 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); + @Pc(596) ParamType local596 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039); if ((Static274.anInt4999 & 0x10) != 0 && (local596 == null || local276.getParam(local596.defaultInt, Static121.anInt3039) != local596.defaultInt)) { 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); } diff --git a/client/src/main/java/Static259.java b/client/src/main/java/Static259.java index 657d305..ebd9e5b 100644 --- a/client/src/main/java/Static259.java +++ b/client/src/main/java/Static259.java @@ -2,15 +2,9 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static259 { - @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 = "bb", descriptor = "[S") - public static short[] aShortArray87 = new short[256]; - @OriginalMember(owner = "client!vc", name = "eb", descriptor = "[I") public static final int[] anIntArray514 = new int[4096]; } diff --git a/client/src/main/java/Static26.java b/client/src/main/java/Static26.java index cfffa53..f768fdd 100644 --- a/client/src/main/java/Static26.java +++ b/client/src/main/java/Static26.java @@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static26 { - @OriginalMember(owner = "client!ca", name = "Z", descriptor = "Lclient!ve;") - public static Js5 js5Archive5; - @OriginalMember(owner = "client!ca", name = "X", descriptor = "Lclient!ih;") public static LinkedList aClass69_27 = new LinkedList(); @@ -16,9 +13,6 @@ public final class Static26 { @OriginalMember(owner = "client!ca", name = "eb", descriptor = "[I") public static final int[] anIntArray67 = new int[100]; - @OriginalMember(owner = "client!ca", name = "fb", descriptor = "[I") - public static final int[] anIntArray68 = new int[50]; - @OriginalMember(owner = "client!ca", name = "h", descriptor = "(I)V") public static void setupLoadingScreenRegion() { @Pc(10) int local10 = (Static138.renderX >> 10) + (Static225.originX >> 3); @@ -41,11 +35,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(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) })); + Static36.mapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); + Static172.locationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); + Static175.npcSpawnsFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static179.aClass100_807, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); + Static99.underWaterMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); + Static35.underWaterLocationsMapFileIds[local74] = client.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; @@ -65,12 +59,6 @@ public final class Static26 { Static127.method2463(0, local23, local10, 8, true, 8); } - @OriginalMember(owner = "client!ca", name = "a", descriptor = "(Z)V") - public static void method741() { - Static79.aClass99_11.method3103(); - Static7.sprites.method3103(); - } - @OriginalMember(owner = "client!ca", name = "a", descriptor = "(ZI)V") public static void method743(@OriginalArg(0) boolean arg0) { @Pc(13) int local13 = Static273.mapFilesBuffer.length; @@ -85,22 +73,10 @@ public final class Static26 { if (local32 != null) { @Pc(45) int local45 = (Static238.regionBitPacked[local25] >> 8) * 64 - Static225.originX; @Pc(56) int local56 = (Static238.regionBitPacked[local25] & 0xFF) * 64 - Static142.originZ; - Static107.loop(); - Static124.method2437(local45, arg0, local32, local56, Static148.collisionMaps); + client.audioLoop(); + Static124.method2437(local45, arg0, local32, local56, PathFinder.collisionMaps); } } } - @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 (Preferences.soundEffectVolume == 0 || arg0 == 0 || Static189.anInt4451 >= 50 || arg1 == -1) { - return; - } - Static200.anIntArray421[Static189.anInt4451] = arg1; - Static276.anIntArray563[Static189.anInt4451] = arg0; - Static164.anIntArray362[Static189.anInt4451] = arg2; - Static173.aClass138Array1[Static189.anInt4451] = null; - anIntArray68[Static189.anInt4451] = 0; - Static189.anInt4451++; - } } diff --git a/client/src/main/java/Static260.java b/client/src/main/java/Static260.java index 7956097..251c82b 100644 --- a/client/src/main/java/Static260.java +++ b/client/src/main/java/Static260.java @@ -4,14 +4,11 @@ import org.openrs2.deob.annotation.Pc; public final class Static260 { - @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") + @OriginalMember(owner = "client!vd", name = "C", descriptor = "I") public static int anInt5014 = 0; @OriginalMember(owner = "client!vd", name = "F", descriptor = "Lclient!na;") - public static final JagString aClass100_945 = Static28.parse("0"); + public static final JagString aClass100_945 = JagString.parse("0"); @OriginalMember(owner = "client!vd", name = "a", descriptor = "(IIIIBI)V") public static void method3849(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) { @@ -23,7 +20,7 @@ public final class Static260 { if (Static233.anInt5217 >= 100) { @Pc(30) int local30 = Static251.anInt5449 * 128 + 64; @Pc(36) int local36 = Static265.anInt5765 * 128 + 64; - @Pc(44) int local44 = Static207.method3685(Static55.level, local30, local36) - Static57.anInt1744; + @Pc(44) int local44 = SceneGraph.getTileHeight(Static55.level, local30, local36) - Static57.anInt1744; @Pc(49) int local49 = local44 - Static5.anInt40; @Pc(54) int local54 = local30 - Static138.renderX; @Pc(59) int local59 = local36 - Static134.renderZ; @@ -173,11 +170,11 @@ public final class Static260 { @Pc(14) AreaSound local14; for (local14 = (AreaSound) Static3.aClass69_135.method2289(); local14 != null; local14 = (AreaSound) Static3.aClass69_135.method2288()) { if (local14.primaryStream != null) { - Static204.soundStream.removeSubStream(local14.primaryStream); + client.soundStream.removeSubStream(local14.primaryStream); local14.primaryStream = null; } if (local14.secondaryStream != null) { - Static204.soundStream.removeSubStream(local14.secondaryStream); + client.soundStream.removeSubStream(local14.secondaryStream); local14.secondaryStream = null; } local14.unlink(); @@ -187,14 +184,14 @@ public final class Static260 { } for (local14 = (AreaSound) Static152.aClass69_87.method2289(); local14 != null; local14 = (AreaSound) Static152.aClass69_87.method2288()) { if (local14.primaryStream != null) { - Static204.soundStream.removeSubStream(local14.primaryStream); + client.soundStream.removeSubStream(local14.primaryStream); local14.primaryStream = null; } local14.unlink(); } for (local14 = (AreaSound) Static93.aClass133_7.head(); local14 != null; local14 = (AreaSound) Static93.aClass133_7.next()) { if (local14.primaryStream != null) { - Static204.soundStream.removeSubStream(local14.primaryStream); + client.soundStream.removeSubStream(local14.primaryStream); local14.primaryStream = null; } local14.unlink(); diff --git a/client/src/main/java/Static261.java b/client/src/main/java/Static261.java index d14c080..ed2d71b 100644 --- a/client/src/main/java/Static261.java +++ b/client/src/main/java/Static261.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static261 { - @OriginalMember(owner = "client!ve", name = "l", descriptor = "Lclient!ve;") - public static Js5 js5Archive13; - - @OriginalMember(owner = "client!ve", name = "t", descriptor = "I") + @OriginalMember(owner = "client!ve", name = "t", descriptor = "I") public static int anInt5731; @OriginalMember(owner = "client!ve", name = "w", descriptor = "Z") diff --git a/client/src/main/java/Static262.java b/client/src/main/java/Static262.java index 164b232..d087fcf 100644 --- a/client/src/main/java/Static262.java +++ b/client/src/main/java/Static262.java @@ -7,21 +7,9 @@ public final class Static262 { @OriginalMember(owner = "client!vf", name = "c", descriptor = "I") public static int anInt5752; - @OriginalMember(owner = "client!vf", name = "n", descriptor = "Lclient!ve;") - public static Js5 aClass153_108; - - @OriginalMember(owner = "client!vf", name = "a", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_34 = new SoftLruHashTable(64); - @OriginalMember(owner = "client!vf", name = "g", descriptor = "[I") public static final int[] anIntArray515 = new int[14]; - @OriginalMember(owner = "client!vf", name = "k", descriptor = "Lclient!n;") - public static final SoftLruHashTable headModels = new SoftLruHashTable(5); - - @OriginalMember(owner = "client!vf", name = "l", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_36 = new SoftLruHashTable(50); - @OriginalMember(owner = "client!vf", name = "m", descriptor = "I") public static int bgId = -1; diff --git a/client/src/main/java/Static263.java b/client/src/main/java/Static263.java index 4e41d58..422fded 100644 --- a/client/src/main/java/Static263.java +++ b/client/src/main/java/Static263.java @@ -20,10 +20,10 @@ public final class Static263 { public static int anInt5755 = 2; @OriginalMember(owner = "client!vg", name = "f", descriptor = "Lclient!na;") - public static final JagString aClass100_1081 = Static28.parse(""); + public static final JagString aClass100_1081 = JagString.parse(""); @OriginalMember(owner = "client!vg", name = "h", descriptor = "Lclient!na;") - public static final JagString aClass100_1082 = Static28.parse("; Expires="); + public static final JagString aClass100_1082 = JagString.parse("; Expires="); @OriginalMember(owner = "client!vg", name = "a", descriptor = "(I[S)[S") public static short[] method4511(@OriginalArg(1) short[] arg0) { @@ -58,54 +58,54 @@ public final class Static263 { return; } if (arg2 == 1) { - Static6.outboundBuffer.p1isaac(155); - Static6.outboundBuffer.p4(arg3); - Static6.outboundBuffer.p2(arg1); + Protocol.outboundBuffer.p1isaac(155); + Protocol.outboundBuffer.p4(arg3); + Protocol.outboundBuffer.p2(arg1); } if (arg2 == 2) { - Static6.outboundBuffer.p1isaac(196); - Static6.outboundBuffer.p4(arg3); - Static6.outboundBuffer.p2(arg1); + Protocol.outboundBuffer.p1isaac(196); + Protocol.outboundBuffer.p4(arg3); + Protocol.outboundBuffer.p2(arg1); } if (arg2 == 3) { - Static6.outboundBuffer.p1isaac(124); - Static6.outboundBuffer.p4(arg3); - Static6.outboundBuffer.p2(arg1); + Protocol.outboundBuffer.p1isaac(124); + Protocol.outboundBuffer.p4(arg3); + Protocol.outboundBuffer.p2(arg1); } if (arg2 == 4) { - Static6.outboundBuffer.p1isaac(199); - Static6.outboundBuffer.p4(arg3); - Static6.outboundBuffer.p2(arg1); + Protocol.outboundBuffer.p1isaac(199); + Protocol.outboundBuffer.p4(arg3); + Protocol.outboundBuffer.p2(arg1); } if (arg2 == 5) { - Static6.outboundBuffer.p1isaac(234); - Static6.outboundBuffer.p4(arg3); - Static6.outboundBuffer.p2(arg1); + Protocol.outboundBuffer.p1isaac(234); + Protocol.outboundBuffer.p4(arg3); + Protocol.outboundBuffer.p2(arg1); } if (arg2 == 6) { - Static6.outboundBuffer.p1isaac(168); - Static6.outboundBuffer.p4(arg3); - Static6.outboundBuffer.p2(arg1); + Protocol.outboundBuffer.p1isaac(168); + Protocol.outboundBuffer.p4(arg3); + Protocol.outboundBuffer.p2(arg1); } if (arg2 == 7) { - Static6.outboundBuffer.p1isaac(166); - Static6.outboundBuffer.p4(arg3); - Static6.outboundBuffer.p2(arg1); + Protocol.outboundBuffer.p1isaac(166); + Protocol.outboundBuffer.p4(arg3); + Protocol.outboundBuffer.p2(arg1); } if (arg2 == 8) { - Static6.outboundBuffer.p1isaac(64); - Static6.outboundBuffer.p4(arg3); - Static6.outboundBuffer.p2(arg1); + Protocol.outboundBuffer.p1isaac(64); + Protocol.outboundBuffer.p4(arg3); + Protocol.outboundBuffer.p2(arg1); } if (arg2 == 9) { - Static6.outboundBuffer.p1isaac(53); - Static6.outboundBuffer.p4(arg3); - Static6.outboundBuffer.p2(arg1); + Protocol.outboundBuffer.p1isaac(53); + Protocol.outboundBuffer.p4(arg3); + Protocol.outboundBuffer.p2(arg1); } if (arg2 == 10) { - Static6.outboundBuffer.p1isaac(9); - Static6.outboundBuffer.p4(arg3); - Static6.outboundBuffer.p2(arg1); + Protocol.outboundBuffer.p1isaac(9); + Protocol.outboundBuffer.p4(arg3); + Protocol.outboundBuffer.p2(arg1); } } diff --git a/client/src/main/java/Static264.java b/client/src/main/java/Static264.java index 08cd3e7..0ae0c26 100644 --- a/client/src/main/java/Static264.java +++ b/client/src/main/java/Static264.java @@ -11,7 +11,7 @@ public final class Static264 { public static final int[] anIntArray410 = new int[100]; @OriginalMember(owner = "client!vh", name = "c", descriptor = "Lclient!na;") - public static final JagString aClass100_875 = Static28.parse(":"); + public static final JagString aClass100_875 = JagString.parse(":"); @OriginalMember(owner = "client!vh", name = "p", descriptor = "[I") public static final int[] anIntArray412 = new int[] { 1, 0, 0, 0, 1, 0, 2, 1, 1, 1, 0, 2, 0, 0, 1, 0 }; @@ -23,7 +23,7 @@ public final class Static264 { public static QuickChatPhrase method3568(@OriginalArg(1) Buffer arg0) { @Pc(3) QuickChatPhrase local3 = new QuickChatPhrase(); local3.anInt439 = arg0.g2(); - local3.aClass3_Sub2_Sub6_1 = Static230.method3953(local3.anInt439); + local3.aClass3_Sub2_Sub6_1 = QuickChatPhraseTypeList.get(local3.anInt439); return local3; } diff --git a/client/src/main/java/Static265.java b/client/src/main/java/Static265.java index 78aca6b..71d2391 100644 --- a/client/src/main/java/Static265.java +++ b/client/src/main/java/Static265.java @@ -7,9 +7,6 @@ public final class Static265 { @OriginalMember(owner = "client!vj", name = "d", descriptor = "I") public static int anInt5765; - @OriginalMember(owner = "client!vj", name = "j", descriptor = "Lclient!dd;") - public static SoftwareFont p11FullSoftware; - @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]; diff --git a/client/src/main/java/Static266.java b/client/src/main/java/Static266.java index a5e415e..c7908b2 100644 --- a/client/src/main/java/Static266.java +++ b/client/src/main/java/Static266.java @@ -7,25 +7,13 @@ public final class Static266 { @OriginalMember(owner = "client!vk", name = "f", descriptor = "[[[B") public static byte[][][] aByteArrayArrayArray15; - @OriginalMember(owner = "client!vk", name = "o", descriptor = "I") - public static int blueDelta; - @OriginalMember(owner = "client!vk", name = "a", descriptor = "[I") public static final int[] anIntArray471 = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 73, 74, 76, 78, 83, 84, 85, 86, 91, 92, 93, 94, 95, 97, 103, 104, 105, 106, 107, 108, 113, 114, 115, 116, 118, 119, 120, 121, 122, 123, 124, 125, 133, 134, 136, 138, 143, 144, 145, 146, 151, 152, 153, 154, 155, 157, 163, 164, 165, 166, 168, 169, 174, 175, 176, 177, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 97, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 157, 215, 216, 117, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 66, 66, 66, 66, 66, 66, 65, 75, 79, 79, 79, 79, 87, 87, 87, 87, 77, 96, 98, 98, 98, 98, 98, 250, 251, 109, 109, 109, 109, 117, 252, 167, 126, 126, 126, 126, 126, 126, 125, 135, 139, 139, 139, 139, 147, 147, 147, 147, 137, 156, 158, 158, 158, 158, 158, 253, 254, 170, 170, 170, 170, 178, 255, 178 }; - @OriginalMember(owner = "client!vk", name = "b", descriptor = "I") - public static int reply = -2; + @OriginalMember(owner = "client!vk", name = "d", descriptor = "Lclient!na;") + public static final JagString aClass100_1010 = JagString.parse("null"); - @OriginalMember(owner = "client!vk", name = "d", descriptor = "Lclient!na;") - public static final JagString aClass100_1010 = Static28.parse("null"); - - @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; - } - - @OriginalMember(owner = "client!vk", name = "a", descriptor = "(IZIII[Lclient!be;)V") + @OriginalMember(owner = "client!vk", name = "a", descriptor = "(IZIII[Lclient!be;)V") public static void method4190(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) Component[] arg4) { for (@Pc(3) int local3 = 0; local3 < arg4.length; local3++) { @Pc(19) Component local19 = arg4[local3]; diff --git a/client/src/main/java/Static267.java b/client/src/main/java/Static267.java index bf4ab8f..3484310 100644 --- a/client/src/main/java/Static267.java +++ b/client/src/main/java/Static267.java @@ -4,18 +4,9 @@ import org.openrs2.deob.annotation.Pc; public final class Static267 { - @OriginalMember(owner = "client!vl", name = "g", descriptor = "Lclient!ve;") - public static Js5 js5Archive7; - - @OriginalMember(owner = "client!vl", name = "a", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_37 = new SoftLruHashTable(100); - @OriginalMember(owner = "client!vl", name = "e", descriptor = "[I") public static final int[] anIntArray517 = new int[] { 1, 2, 4, 8 }; - @OriginalMember(owner = "client!vl", name = "f", descriptor = "Lclient!na;") - public static final JagString aClass100_1087 = Static28.parse("Cabbage"); - @OriginalMember(owner = "client!vl", name = "h", descriptor = "I") public static int anInt5773 = 0; @@ -47,7 +38,7 @@ public final class Static267 { public static boolean isShowingVideoAd() { if (client.objectTag) { try { - return !((Boolean) Static119.aClass100_588.method3157(GameShell.signLink.applet)); + return !((Boolean) Static119.aClass100_588.browserControlCall(GameShell.signLink.applet)); } catch (@Pc(21) Throwable local21) { } } @@ -145,9 +136,4 @@ public final class Static267 { } } - @OriginalMember(owner = "client!vl", name = "b", descriptor = "(I)V") - public static void method4529() { - Static231.aClass99_29.method3103(); - Static219.sprites.method3103(); - } } diff --git a/client/src/main/java/Static269.java b/client/src/main/java/Static269.java index 14b268e..844b802 100644 --- a/client/src/main/java/Static269.java +++ b/client/src/main/java/Static269.java @@ -4,23 +4,12 @@ import org.openrs2.deob.annotation.Pc; public final class Static269 { - @OriginalMember(owner = "client!wa", name = "X", descriptor = "[Lclient!na;") - public static JagString[] aClass100Array87 = null; - @OriginalMember(owner = "client!wa", name = "pb", descriptor = "Lclient!na;") - public static final JagString aClass100_556 = Static28.parse("
"); + public static final JagString aClass100_556 = JagString.parse("
"); - @OriginalMember(owner = "client!wa", name = "Eb", descriptor = "[Lclient!bg;") - public static final Js5CachedResourceProvider[] js5Providers = new Js5CachedResourceProvider[28]; - - @OriginalMember(owner = "client!wa", name = "a", descriptor = "(Z)V") - public static void updateFlames() { - Static250.anInt5434++; - } - - @OriginalMember(owner = "client!wa", name = "e", descriptor = "(B)V") + @OriginalMember(owner = "client!wa", name = "e", descriptor = "(B)V") public static void clearObjectSpriteCache() { - Static118.objectSpriteCache.clear(); + ObjTypeList.objectSpriteCache.clear(); } @OriginalMember(owner = "client!wa", name = "a", descriptor = "([Lclient!mj;ZIIIII[B)V") @@ -180,7 +169,7 @@ public final class Static269 { for (local243 = 0; local243 < local515; local243++) { @Pc(529) Light local529 = new Light(local95); if (local529.anInt2243 == 31) { - @Pc(541) LightType local541 = Static140.method2709(local95.g2()); + @Pc(541) LightType local541 = LightTypeList.get(local95.g2()); local529.method1762(local541.anInt2865, local541.anInt2873, local541.anInt2867, local541.anInt2872); } local529.anInt2245 += arg3 << 7; @@ -233,11 +222,6 @@ public final class Static269 { } } - @OriginalMember(owner = "client!wa", name = "d", descriptor = "(BI)V") - public static void method2221() { - Static125.aClass99_19.method3102(5); - } - @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 (WorldMap.loadPercentage < 100) { @@ -278,15 +262,15 @@ public final class Static269 { 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); + if (WorldMap.aClass3_Sub2_Sub1_Sub1_2 == null || WorldMap.aClass3_Sub2_Sub1_Sub1_2.anInt1867 != arg3 || WorldMap.aClass3_Sub2_Sub1_Sub1_2.anInt1859 != arg2) { + WorldMap.aClass3_Sub2_Sub1_Sub1_2 = null; + WorldMap.aClass3_Sub2_Sub1_Sub1_2 = new SoftwareSprite(arg3, arg2); } - SoftwareRaster.method2491(Static153.aClass3_Sub2_Sub1_Sub1_2.anIntArray20, arg3, arg2); + SoftwareRaster.method2491(WorldMap.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); + Static46.method1178(WorldMap.aClass3_Sub2_Sub1_Sub1_2.anIntArray20, arg0, arg1, arg3, arg2); SoftwareRaster.pixels = null; } else { Static214.method4364(arg3 + arg0, arg1, local61, local50, arg0, local236, arg1 + arg2, local211); diff --git a/client/src/main/java/Static27.java b/client/src/main/java/Static27.java index 031367b..9824b00 100644 --- a/client/src/main/java/Static27.java +++ b/client/src/main/java/Static27.java @@ -10,17 +10,14 @@ public final class Static27 { @OriginalMember(owner = "client!cb", name = "I", descriptor = "[I") public static final int[] anIntArray70 = new int[32]; - @OriginalMember(owner = "client!cb", name = "Y", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_4 = new SoftLruHashTable(64); - - @OriginalMember(owner = "client!cb", name = "ab", descriptor = "Lclient!na;") - public static final JagString aClass100_164 = Static28.parse(" )2> "); + @OriginalMember(owner = "client!cb", name = "ab", descriptor = "Lclient!na;") + public static final JagString aClass100_164 = JagString.parse(" )2> "); @OriginalMember(owner = "client!cb", name = "cb", descriptor = "Lclient!na;") - public static final JagString aClass100_165 = Static28.parse("titlebg"); + public static final JagString aClass100_165 = JagString.parse("titlebg"); @OriginalMember(owner = "client!cb", name = "fb", descriptor = "Lclient!na;") - public static final JagString aClass100_168 = Static28.parse(": "); + public static final JagString aClass100_168 = JagString.parse(": "); @OriginalMember(owner = "client!cb", name = "b", descriptor = "(III)V") public static void setMaterial(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { diff --git a/client/src/main/java/Static270.java b/client/src/main/java/Static270.java index 85a471c..a614e64 100644 --- a/client/src/main/java/Static270.java +++ b/client/src/main/java/Static270.java @@ -8,7 +8,7 @@ public final class Static270 { public static int[] anIntArray562; @OriginalMember(owner = "client!wb", name = "a", descriptor = "Lclient!na;") - public static final JagString aClass100_1089 = Static28.parse(")2"); + public static final JagString aClass100_1089 = JagString.parse(")2"); @OriginalMember(owner = "client!wb", name = "c", descriptor = "I") public static int anInt5794 = -1; @@ -17,13 +17,7 @@ public final class Static270 { public static int anInt5795 = 0; @OriginalMember(owner = "client!wb", name = "e", descriptor = "Lclient!na;") - public static final JagString aClass100_1090 = Static28.parse("l"); - - @OriginalMember(owner = "client!wb", name = "f", descriptor = "Lclient!wa;") - public static final Buffer aClass3_Sub15_9 = new Buffer(new byte[5000]); - - @OriginalMember(owner = "client!wb", name = "j", descriptor = "Lclient!na;") - public static final JagString aClass100_1093 = Static28.parse("Memory after cleanup="); + public static final JagString aClass100_1090 = JagString.parse("l"); @OriginalMember(owner = "client!wb", name = "m", descriptor = "Lclient!na;") public static JagString aClass100_1094 = null; @@ -145,20 +139,20 @@ public final class Static270 { } return local11 - local14; } else if (arg1 == 2) { - return arg0.getWorldInfo().aClass100_378.method3126(arg2.getWorldInfo().aClass100_378); + return arg0.getWorldInfo().name.method3126(arg2.getWorldInfo().name); } else if (arg1 == 3) { - if (arg0.aClass100_69.strEquals(Static111.aClass100_570)) { - if (arg2.aClass100_69.strEquals(Static111.aClass100_570)) { + if (arg0.activity.strEquals(Static111.aClass100_570)) { + if (arg2.activity.strEquals(Static111.aClass100_570)) { return 0; } else if (arg3) { return -1; } else { return 1; } - } else if (arg2.aClass100_69.strEquals(Static111.aClass100_570)) { + } else if (arg2.activity.strEquals(Static111.aClass100_570)) { return arg3 ? 1 : -1; } else { - return arg0.aClass100_69.method3126(arg2.aClass100_69); + return arg0.activity.method3126(arg2.activity); } } else if (arg1 == 4) { return arg0.isLootShare() ? (arg2.isLootShare() ? 0 : 1) : arg2.isLootShare() ? -1 : 0; @@ -169,7 +163,7 @@ public final class Static270 { } else if (arg1 == 7) { return arg0.isMembers() ? (arg2.isMembers() ? 0 : 1) : (arg2.isMembers() ? -1 : 0); } else { - return arg0.anInt382 - arg2.anInt382; + return arg0.id - arg2.id; } } } diff --git a/client/src/main/java/Static271.java b/client/src/main/java/Static271.java index 86e962c..490a8e1 100644 --- a/client/src/main/java/Static271.java +++ b/client/src/main/java/Static271.java @@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static271 { - @OriginalMember(owner = "client!wc", name = "c", descriptor = "I") - public static int defaultPort; - @OriginalMember(owner = "client!wc", name = "g", descriptor = "I") public static int anInt5804 = 0; @@ -20,7 +17,7 @@ public final class Static271 { return; } if (local10.primaryStream != null) { - Static204.soundStream.removeSubStream(local10.primaryStream); + client.soundStream.removeSubStream(local10.primaryStream); local10.primaryStream = null; } local10.unlink(); @@ -44,27 +41,4 @@ public final class Static271 { local8.pushClient(); } - @OriginalMember(owner = "client!wc", name = "a", descriptor = "(II)Lclient!pb;") - public static LocType get(@OriginalArg(1) int arg0) { - @Pc(15) LocType local15 = (LocType) Static179.aClass99_25.get((long) arg0); - if (local15 != null) { - return local15; - } - @Pc(30) byte[] local30 = Static146.aClass153_54.getFile(Static253.method4328(arg0), Static33.method872(arg0)); - local15 = new LocType(); - local15.anInt4426 = arg0; - if (local30 != null) { - local15.decode(new Buffer(local30)); - } - local15.postDecode(); - if (!Static30.aBoolean61 && local15.members) { - local15.ops = null; - } - if (local15.aBoolean210) { - local15.anInt4435 = 0; - local15.aBoolean207 = false; - } - Static179.aClass99_25.put(local15, (long) arg0); - return local15; - } } diff --git a/client/src/main/java/Static272.java b/client/src/main/java/Static272.java index 3a0e12f..295c509 100644 --- a/client/src/main/java/Static272.java +++ b/client/src/main/java/Static272.java @@ -4,24 +4,15 @@ import org.openrs2.deob.annotation.Pc; public final class Static272 { - @OriginalMember(owner = "client!wd", name = "a", descriptor = "Lclient!gn;") - public static final LruHashTable aClass54_14 = new LruHashTable(64); - - @OriginalMember(owner = "client!wd", name = "d", descriptor = "[I") - public static final int[] anIntArray451 = new int[] { 8, 11, 4, 6, 9, 7, 10, 0 }; - @OriginalMember(owner = "client!wd", name = "e", descriptor = "Lclient!na;") - public static final JagString aClass100_989 = Static28.parse("cookieprefix"); - - @OriginalMember(owner = "client!wd", name = "f", descriptor = "Lclient!na;") - public static final JagString aClass100_990 = Static28.parse("::errortest"); + public static final JagString aClass100_989 = JagString.parse("cookieprefix"); @OriginalMember(owner = "client!wd", name = "g", descriptor = "I") public static int anInt5214 = 0; @OriginalMember(owner = "client!wd", name = "a", descriptor = "(BII)V") public static void method3995(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - @Pc(14) VarbitType local14 = Static125.method2449(arg1); + @Pc(14) VarbitType local14 = VarbitTypeList.get(arg1); @Pc(17) int local17 = local14.baseVar; @Pc(20) int local20 = local14.endBit; @Pc(23) int local23 = local14.startBit; diff --git a/client/src/main/java/Static273.java b/client/src/main/java/Static273.java index 0460aa6..392b4e1 100644 --- a/client/src/main/java/Static273.java +++ b/client/src/main/java/Static273.java @@ -60,9 +60,9 @@ public final class Static273 { if (local46 == 4) { local124 = local33[local39++] << 16; @Pc(131) int local131 = local124 + local33[local39++]; - local135 = Static5.getComponent(local131); + local135 = InterfaceList.getComponent(local131); local140 = local33[local39++]; - if (local140 != -1 && (!Static71.get(local140).members || Static2.aBoolean1)) { + if (local140 != -1 && (!ObjTypeList.get(local140).members || LoginManager.mapMembers)) { for (local152 = 0; local152 < local135.objTypes.length; local152++) { if (local140 + 1 == local135.objTypes[local152]) { local41 += local135.objCounts[local152]; @@ -92,9 +92,9 @@ public final class Static273 { if (local46 == 10) { local124 = local33[local39++] << 16; local124 += local33[local39++]; - local135 = Static5.getComponent(local124); + local135 = InterfaceList.getComponent(local124); local140 = local33[local39++]; - if (local140 != -1 && (!Static71.get(local140).members || Static2.aBoolean1)) { + if (local140 != -1 && (!ObjTypeList.get(local140).members || LoginManager.mapMembers)) { for (local152 = 0; local152 < local135.objTypes.length; local152++) { if (local135.objTypes[local152] == local140 + 1) { local41 = 999999999; diff --git a/client/src/main/java/Static274.java b/client/src/main/java/Static274.java index a31548d..984dd8f 100644 --- a/client/src/main/java/Static274.java +++ b/client/src/main/java/Static274.java @@ -9,18 +9,12 @@ public final class Static274 { @OriginalMember(owner = "client!wf", name = "f", descriptor = "I") public static int anInt4999; - @OriginalMember(owner = "client!wf", name = "g", descriptor = "Lclient!ve;") - public static Js5 js5Archive2; - @OriginalMember(owner = "client!wf", name = "j", descriptor = "Lclient!be;") public static Component staticActiveComponent1; @OriginalMember(owner = "client!wf", name = "o", descriptor = "[Lclient!gb;") public static final RawModel[] tempModels = new RawModel[4]; - @OriginalMember(owner = "client!wf", name = "s", descriptor = "Lclient!na;") - public static final JagString aClass100_943 = Static28.parse("Forced tweening disabled)3"); - @OriginalMember(owner = "client!wf", name = "a", descriptor = "(II)I") public static int method3845(@OriginalArg(0) int arg0) { return arg0 & 0x3FF; diff --git a/client/src/main/java/Static275.java b/client/src/main/java/Static275.java deleted file mode 100644 index 5152a3e..0000000 --- a/client/src/main/java/Static275.java +++ /dev/null @@ -1,30 +0,0 @@ -import com.jogamp.opengl.*; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static275 { - - @OriginalMember(owner = "client!wg", name = "b", descriptor = "Z") - public static boolean aBoolean308 = false; - - @OriginalMember(owner = "client!wg", name = "e", descriptor = "()I") - public static int method4607() { - return aBoolean308 ? 33986 : 33985; - } - - @OriginalMember(owner = "client!wg", name = "f", descriptor = "()V") - public static void method4608() { - @Pc(1) GL2 local1 = GlRenderer.gl; - local1.glClientActiveTexture(method4607()); - local1.glDisableClientState(GL2.GL_TEXTURE_COORD_ARRAY); - local1.glClientActiveTexture(GL2.GL_TEXTURE0); - } - - @OriginalMember(owner = "client!wg", name = "g", descriptor = "()V") - public static void method4609() { - @Pc(1) GL2 local1 = GlRenderer.gl; - local1.glClientActiveTexture(method4607()); - local1.glEnableClientState(GL2.GL_TEXTURE_COORD_ARRAY); - local1.glClientActiveTexture(GL2.GL_TEXTURE0); - } -} diff --git a/client/src/main/java/Static276.java b/client/src/main/java/Static276.java index c414bba..80dd163 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 = "g", descriptor = "[I") - public static final int[] anIntArray563 = new int[50]; - @OriginalMember(owner = "client!wh", name = "j", descriptor = "[Lclient!cl;") public static final AnimFrameset[] aClass3_Sub2_Sub7Array8 = new AnimFrameset[14]; @@ -17,16 +14,13 @@ public final class Static276 { public static final int[] anIntArray564 = new int[5]; @OriginalMember(owner = "client!wh", name = "n", descriptor = "Lclient!na;") - public static final JagString aClass100_1095 = Static28.parse("; version=1; path=)4; domain="); + public static final JagString aClass100_1095 = JagString.parse("; version=1; path=)4; domain="); @OriginalMember(owner = "client!wh", name = "o", descriptor = "Lclient!na;") - public static final JagString aClass100_1096 = Static28.parse("rect_debug="); + public static final JagString aClass100_1096 = JagString.parse("rect_debug="); - @OriginalMember(owner = "client!wh", name = "s", descriptor = "I") - public static int anInt5816 = 0; - - @OriginalMember(owner = "client!wh", name = "u", descriptor = "Lclient!na;") - public static final JagString aClass100_1097 = Static28.parse("(U2"); + @OriginalMember(owner = "client!wh", name = "u", descriptor = "Lclient!na;") + public static final JagString aClass100_1097 = JagString.parse("(U2"); @OriginalMember(owner = "client!wh", name = "a", descriptor = "(IIII)Z") public static boolean method4611(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { @@ -39,11 +33,6 @@ public final class Static276 { } } - @OriginalMember(owner = "client!wh", name = "a", descriptor = "(I)V") - public static void method4612() { - Static233.aClass99_31.clear(); - } - @OriginalMember(owner = "client!wh", name = "a", descriptor = "(IILclient!na;)V") public static void method4613(@OriginalArg(0) int arg0, @OriginalArg(2) JagString arg1) { @Pc(7) JagString local7 = arg1.method3159().method3125(); @@ -54,20 +43,20 @@ public final class Static276 { local13 = true; 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]); + Protocol.outboundBuffer.p1isaac(68); + Protocol.outboundBuffer.p2leadd(Static105.anIntArray256[local15]); } else if (arg0 == 4) { - Static6.outboundBuffer.p1isaac(180); - Static6.outboundBuffer.p2leadd(Static105.anIntArray256[local15]); + Protocol.outboundBuffer.p1isaac(180); + Protocol.outboundBuffer.p2leadd(Static105.anIntArray256[local15]); } else if (arg0 == 5) { - Static6.outboundBuffer.p1isaac(4); - Static6.outboundBuffer.p2le(Static105.anIntArray256[local15]); + Protocol.outboundBuffer.p1isaac(4); + Protocol.outboundBuffer.p2le(Static105.anIntArray256[local15]); } else if (arg0 == 6) { - Static6.outboundBuffer.p1isaac(133); - Static6.outboundBuffer.p2le(Static105.anIntArray256[local15]); + Protocol.outboundBuffer.p1isaac(133); + Protocol.outboundBuffer.p2le(Static105.anIntArray256[local15]); } else if (arg0 == 7) { - Static6.outboundBuffer.p1isaac(114); - Static6.outboundBuffer.p2leadd(Static105.anIntArray256[local15]); + Protocol.outboundBuffer.p1isaac(114); + Protocol.outboundBuffer.p2leadd(Static105.anIntArray256[local15]); } break; } @@ -89,9 +78,4 @@ public final class Static276 { return local27; } - @OriginalMember(owner = "client!wh", name = "a", descriptor = "(II)V") - public static void method4615() { - Static231.aClass99_29.method3102(5); - Static219.sprites.method3102(5); - } } diff --git a/client/src/main/java/Static278.java b/client/src/main/java/Static278.java index 177dbfe..c7c1845 100644 --- a/client/src/main/java/Static278.java +++ b/client/src/main/java/Static278.java @@ -5,13 +5,13 @@ import org.openrs2.deob.annotation.Pc; public final class Static278 { @OriginalMember(owner = "client!wj", name = "b", descriptor = "Lclient!na;") - public static final JagString aClass100_1101 = Static28.parse(" "); + public static final JagString aClass100_1101 = JagString.parse(" "); @OriginalMember(owner = "client!wj", name = "e", descriptor = "Lclient!na;") public static JagString mainLoadPrimaryText = null; @OriginalMember(owner = "client!wj", name = "f", descriptor = "Lclient!na;") - public static final JagString aClass100_1103 = Static28.parse("ul"); + public static final JagString aClass100_1103 = JagString.parse("ul"); @OriginalMember(owner = "client!wj", name = "l", descriptor = "I") public static int anInt5867 = 0; @@ -19,8 +19,8 @@ public final class Static278 { @OriginalMember(owner = "client!wj", name = "a", descriptor = "(I)V") public static void method4645() { while (true) { - if (Static57.aClass3_Sub15_Sub1_3.method2241(Static223.anInt5028) >= 27) { - @Pc(14) int local14 = Static57.aClass3_Sub15_Sub1_3.method2238(15); + if (Protocol.inboundBuffer.method2241(Protocol.length) >= 27) { + @Pc(14) int local14 = Protocol.inboundBuffer.method2238(15); if (local14 != 32767) { @Pc(19) boolean local19 = false; if (Static175.npcs[local14] == null) { @@ -33,21 +33,21 @@ public final class Static278 { if (local37.type != null && local37.type.hasAreaSound()) { Static91.method1877(local37); } - @Pc(66) int local66 = Static57.aClass3_Sub15_Sub1_3.method2238(1); - @Pc(73) int local73 = Static56.anIntArray141[Static57.aClass3_Sub15_Sub1_3.method2238(3)]; + @Pc(66) int local66 = Protocol.inboundBuffer.method2238(1); + @Pc(73) int local73 = Static56.anIntArray141[Protocol.inboundBuffer.method2238(3)]; if (local19) { local37.anInt3400 = local37.anInt3381 = local73; } - @Pc(86) int local86 = Static57.aClass3_Sub15_Sub1_3.method2238(1); + @Pc(86) int local86 = Protocol.inboundBuffer.method2238(1); if (local86 == 1) { Static44.anIntArray106[Static116.anInt2951++] = local14; } - @Pc(105) int local105 = Static57.aClass3_Sub15_Sub1_3.method2238(5); - local37.method2698(Static214.get(Static57.aClass3_Sub15_Sub1_3.method2238(14))); + @Pc(105) int local105 = Protocol.inboundBuffer.method2238(5); + local37.method2698(NpcTypeList.get(Protocol.inboundBuffer.method2238(14))); if (local105 > 15) { local105 -= 32; } - @Pc(124) int local124 = Static57.aClass3_Sub15_Sub1_3.method2238(5); + @Pc(124) int local124 = Protocol.inboundBuffer.method2238(5); if (local124 > 15) { local124 -= 32; } @@ -64,7 +64,7 @@ public final class Static278 { continue; } } - Static57.aClass3_Sub15_Sub1_3.method2244(); + Protocol.inboundBuffer.method2244(); return; } } @@ -102,13 +102,13 @@ public final class Static278 { @OriginalMember(owner = "client!wj", name = "b", descriptor = "(I)V") public static void method4649() { - Static125.aClass99_18.clear(); + NpcTypeList.aClass99_18.clear(); } @OriginalMember(owner = "client!wj", name = "a", descriptor = "(IIB)V") public static void method4650(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { if (Preferences.musicVolume != 0 && arg1 != -1) { - Static122.method2410(Static214.js5Archive11, arg1, Preferences.musicVolume); + Static122.method2410(client.js5Archive11, arg1, Preferences.musicVolume); MidiPlayer.jingle = true; } } @@ -199,21 +199,21 @@ public final class Static278 { Protocol.socket.close(); Protocol.socket = null; } - Static217.method3768(); + client.method3768(); Static65.method1500(); @Pc(19) int local19; for (local19 = 0; local19 < 4; local19++) { - Static148.collisionMaps[local19].resetFlags(); + PathFinder.collisionMaps[local19].resetFlags(); } - Static116.clear(false); + WorldMap.clear(false); System.gc(); - Static29.method801(); + MidiPlayer.method801(); MidiPlayer.jingle = false; - Static221.anInt4363 = -1; + MusicPlayer.groupId = -1; Static260.clearAmbientSounds(true); Static230.dynamicMapRegion = false; Static142.originZ = 0; - Static80.anInt4701 = 0; + Static80.centralZoneX = 0; Static52.anInt1695 = 0; Static225.originX = 0; for (local19 = 0; local19 < Static143.aClass102Array1.length; local19++) { @@ -236,7 +236,7 @@ public final class Static278 { } } Static35.resetCameraEffects(); - Static189.anInt4443 = 0; + Protocol.verifyId = 0; Static8.method121(); Static73.method1596(true); } diff --git a/client/src/main/java/Static279.java b/client/src/main/java/Static279.java index 4af7eaa..4ed8fb0 100644 --- a/client/src/main/java/Static279.java +++ b/client/src/main/java/Static279.java @@ -7,20 +7,11 @@ public final class Static279 { @OriginalMember(owner = "client!wk", name = "v", descriptor = "[I") public static int[] anIntArray568; - @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;") - public static final JagString aClass100_1106 = Static28.parse("::clientjs5drop"); + @OriginalMember(owner = "client!wk", name = "u", descriptor = "Lclient!na;") + public static final JagString aClass100_1106 = JagString.parse("::clientjs5drop"); @OriginalMember(owner = "client!wk", name = "x", descriptor = "Lclient!na;") - public static final JagString aClass100_1107 = Static28.parse(")4l="); - - @OriginalMember(owner = "client!wk", name = "b", descriptor = "(II)V") - public static void method4662() { - Static250.aClass99_33.method3102(5); - Static139.aClass99_21.method3102(5); - } + public static final JagString aClass100_1107 = JagString.parse(")4l="); @OriginalMember(owner = "client!wk", name = "a", descriptor = "(I[Lclient!na;)[Lclient!na;") public static JagString[] method4664(@OriginalArg(1) JagString[] arg0) { diff --git a/client/src/main/java/Static28.java b/client/src/main/java/Static28.java index 6cecb0c..07a9a73 100644 --- a/client/src/main/java/Static28.java +++ b/client/src/main/java/Static28.java @@ -1,38 +1,11 @@ import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; public final class Static28 { @OriginalMember(owner = "client!cd", name = "s", descriptor = "I") public static int anInt917; - @OriginalMember(owner = "client!cd", name = "B", descriptor = "Lclient!ve;") - public static Js5 js5Archive25; - - @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(); - @Pc(9) int local9 = local6.length; - @Pc(13) JagString local13 = new JagString(); - @Pc(15) int local15 = 0; - local13.chars = new byte[local9]; - while (local9 > local15) { - @Pc(29) int local29 = local6[local15++] & 0xFF; - if (local29 <= 45 && local29 >= 40) { - if (local15 >= local9) { - break; - } - @Pc(51) int local51 = local6[local15++] & 0xFF; - local13.chars[local13.length++] = (byte) (local51 + (local29 + -40) * 43 - 48); - } else if (local29 != 0) { - local13.chars[local13.length++] = (byte) local29; - } - } - local13.method3156(); - return local13.method3151(); - } - @OriginalMember(owner = "client!cd", name = "a", descriptor = "(IIIIZ)V") public static void method792(@OriginalArg(3) int tileVisibility, @OriginalArg(4) boolean hasUnderWaterMap) { Static152.mapSizeX = 104; diff --git a/client/src/main/java/Static280.java b/client/src/main/java/Static280.java index 01ab022..e3c6275 100644 --- a/client/src/main/java/Static280.java +++ b/client/src/main/java/Static280.java @@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static280 { - @OriginalMember(owner = "client!wl", name = "s", descriptor = "Lclient!ve;") - public static Js5 js5Archive16; - @OriginalMember(owner = "client!wl", name = "h", descriptor = "Lclient!be;") public static Component aClass13_26 = null; @@ -15,7 +12,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.seqId == -1 || arg0.anInt3420 != 0 || arg0.anInt3360 + 1 > Static36.get(arg0.seqId).anIntArray474[arg0.anInt3425]) { + if (Static83.loop == arg0.anInt3386 || arg0.seqId == -1 || arg0.anInt3420 != 0 || arg0.anInt3360 + 1 > SeqTypeList.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; @@ -536,13 +533,13 @@ public final class Static280 { @OriginalMember(owner = "client!wl", name = "a", descriptor = "(Lclient!be;I)Lclient!be;") public static Component method4668(@OriginalArg(0) Component arg0) { if (arg0.layer != -1) { - return Static5.getComponent(arg0.layer); + return InterfaceList.getComponent(arg0.layer); } @Pc(28) int local28 = arg0.id >>> 16; @Pc(33) HashTableIterator local33 = new HashTableIterator(Static119.aClass133_9); for (@Pc(38) Class3_Sub31 local38 = (Class3_Sub31) local33.method2701(); local38 != null; local38 = (Class3_Sub31) local33.method2700()) { if (local28 == local38.anInt5878) { - return Static5.getComponent((int) local38.key); + return InterfaceList.getComponent((int) local38.key); } } return null; diff --git a/client/src/main/java/Static282.java b/client/src/main/java/Static282.java deleted file mode 100644 index a6314f2..0000000 --- a/client/src/main/java/Static282.java +++ /dev/null @@ -1,20 +0,0 @@ -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static282 { - - @OriginalMember(owner = "client!ak", name = "a", descriptor = "([[III)I") - public static int method4556(@OriginalArg(0) int[][] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { - @Pc(3) int local3 = arg1 >> 7; - @Pc(7) int local7 = arg2 >> 7; - if (local3 < 0 || local7 < 0 || local3 >= arg0.length || local7 >= arg0[0].length) { - return 0; - } - @Pc(27) int local27 = arg1 & 0x7F; - @Pc(31) int local31 = arg2 & 0x7F; - @Pc(53) int local53 = arg0[local3][local7] * (128 - local27) + arg0[local3 + 1][local7] * local27 >> 7; - @Pc(79) int local79 = arg0[local3][local7 + 1] * (128 - local27) + arg0[local3 + 1][local7 + 1] * local27 >> 7; - return local53 * (128 - local31) + local79 * local31 >> 7; - } -} diff --git a/client/src/main/java/Static29.java b/client/src/main/java/Static29.java index 4ed922d..0c95f4b 100644 --- a/client/src/main/java/Static29.java +++ b/client/src/main/java/Static29.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static29 { - @OriginalMember(owner = "client!ce", name = "d", descriptor = "Lclient!ve;") - public static Js5 aClass153_19; - - @OriginalMember(owner = "client!ce", name = "a", descriptor = "(I[B)Lclient!rk;") + @OriginalMember(owner = "client!ce", name = "a", descriptor = "(I[B)Lclient!rk;") public static Font method799(@OriginalArg(1) byte[] arg0) { if (arg0 == null) { return null; @@ -47,20 +44,9 @@ public final class Static29 { local9.anInt922 = arg2; } - @OriginalMember(owner = "client!ce", name = "a", descriptor = "(II)V") - public static void method801() { - Static253.anInt5527 = 0; - Static226.anInt5085 = -1; - Static14.anInt441 = 1; - Static57.anInt1757 = 2; - Static72.aBoolean116 = false; - Static172.aClass153_70 = null; - Static277.anInt5853 = -1; - } - - @OriginalMember(owner = "client!ce", name = "a", descriptor = "(IBI)Lclient!bn;") + @OriginalMember(owner = "client!ce", name = "a", descriptor = "(IBI)Lclient!bn;") public static Map method803(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { - for (@Pc(10) Map local10 = (Map) Static228.aClass69_120.method2289(); local10 != null; local10 = (Map) Static228.aClass69_120.method2288()) { + for (@Pc(10) Map local10 = (Map) MapList.aClass69_120.method2289(); local10 != null; local10 = (Map) MapList.aClass69_120.method2288()) { if (local10.aBoolean50 && local10.method664(arg1, arg0)) { return local10; } diff --git a/client/src/main/java/Static3.java b/client/src/main/java/Static3.java index d046f3b..50b8301 100644 --- a/client/src/main/java/Static3.java +++ b/client/src/main/java/Static3.java @@ -24,12 +24,7 @@ public final class Static3 { } } - @OriginalMember(owner = "client!ab", name = "b", descriptor = "(B)V") - public static void method4657() { - Static232.aClass99_30.method3103(); - } - - @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); @@ -63,13 +58,4 @@ public final class Static3 { return Static105.aClass114Array1; } - @OriginalMember(owner = "client!ab", name = "a", descriptor = "(ZLclient!ve;Lclient!ve;Lclient!ve;Lclient!ve;)V") - public static void init(@OriginalArg(1) Js5 arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) Js5 arg2, @OriginalArg(4) Js5 arg3) { - Static23.aClass153_12 = arg1; - Static167.aClass153_64 = arg0; - Static202.aClass153_84 = arg2; - Static203.aClass153_85 = arg3; - Static241.components = new Component[Static202.aClass153_84.method4483()][]; - Static223.aBooleanArray115 = new boolean[Static202.aClass153_84.method4483()]; - } } diff --git a/client/src/main/java/Static30.java b/client/src/main/java/Static30.java index 70fee68..6d7c5c6 100644 --- a/client/src/main/java/Static30.java +++ b/client/src/main/java/Static30.java @@ -2,13 +2,10 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static30 { - @OriginalMember(owner = "client!cg", name = "c", descriptor = "Z") - public static boolean aBoolean61; - @OriginalMember(owner = "client!cg", name = "e", descriptor = "Lclient!na;") - public static final JagString aClass100_184 = Static28.parse("1"); + public static final JagString aClass100_184 = JagString.parse("1"); @OriginalMember(owner = "client!cg", name = "h", descriptor = "Lclient!na;") - public static final JagString aClass100_185 = Static28.parse(")3"); + public static final JagString aClass100_185 = JagString.parse(")3"); } diff --git a/client/src/main/java/Static31.java b/client/src/main/java/Static31.java index c4ad915..c65795c 100644 --- a/client/src/main/java/Static31.java +++ b/client/src/main/java/Static31.java @@ -1,8 +1,4 @@ -import java.io.IOException; -import java.net.Socket; - import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; public final class Static31 { @@ -13,7 +9,7 @@ public final class Static31 { public static final byte[] aByteArray12 = new byte[] { 95, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57 }; @OriginalMember(owner = "client!ch", name = "x", descriptor = "Lclient!na;") - public static final JagString aClass100_193 = Static28.parse(":"); + public static final JagString aClass100_193 = JagString.parse(":"); @OriginalMember(owner = "client!ch", name = "z", descriptor = "[I") public static final int[] anIntArray76 = new int[5]; @@ -24,112 +20,11 @@ public final class Static31 { @OriginalMember(owner = "client!ch", name = "c", descriptor = "(I)V") public static void method846() { if (!SceneGraph.allLevelsAreVisible() && Static41.anInt1316 != Static55.level) { - Static127.method2463(Static55.level, Static52.anInt1695, Static80.anInt4701, PlayerList.self.movementQueueZ[0], false, PlayerList.self.movementQueueX[0]); + Static127.method2463(Static55.level, Static52.anInt1695, Static80.centralZoneX, 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(); } } - @OriginalMember(owner = "client!ch", name = "b", descriptor = "(B)V") - public static void loopAuto() { - if (Static219.anInt4937 == 0) { - return; - } - try { - if (++Static20.anInt673 > 1500) { - if (Protocol.socket != null) { - Protocol.socket.close(); - Protocol.socket = null; - } - if (Static196.anInt4587 >= 1) { - Static266.reply = -5; - Static219.anInt4937 = 0; - return; - } - Static20.anInt673 = 0; - Static196.anInt4587++; - Static219.anInt4937 = 1; - if (Static208.worldListPort == Static249.worldListDefaultPort) { - Static208.worldListPort = Static97.worldListAlternatePort; - } else { - Static208.worldListPort = Static249.worldListDefaultPort; - } - } - if (Static219.anInt4937 == 1) { - Static72.aClass212_3 = GameShell.signLink.openSocket(Static143.worldListHostname, Static208.worldListPort); - Static219.anInt4937 = 2; - } - @Pc(126) int local126; - if (Static219.anInt4937 == 2) { - if (Static72.aClass212_3.status == 2) { - throw new IOException(); - } - if (Static72.aClass212_3.status != 1) { - return; - } - Protocol.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, GameShell.signLink); - Static72.aClass212_3 = null; - Protocol.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); - if (client.musicChannel != null) { - client.musicChannel.method3571(); - } - if (client.soundChannel != null) { - client.soundChannel.method3571(); - } - local126 = Protocol.socket.read(); - if (client.musicChannel != null) { - client.musicChannel.method3571(); - } - if (client.soundChannel != null) { - client.soundChannel.method3571(); - } - if (local126 != 101) { - Static266.reply = local126; - Static219.anInt4937 = 0; - Protocol.socket.close(); - Protocol.socket = null; - return; - } - Static219.anInt4937 = 3; - } - if (Static219.anInt4937 == 3) { - if (Protocol.socket.available() < 2) { - return; - } - local126 = Protocol.socket.read() << 8 | Protocol.socket.read(); - Static176.hopWorld(local126); - if (Static125.worldId == -1) { - Static219.anInt4937 = 0; - Static266.reply = 6; - Protocol.socket.close(); - Protocol.socket = null; - return; - } - Static219.anInt4937 = 0; - Protocol.socket.close(); - Protocol.socket = null; - Static49.method1208(); - return; - } - } catch (@Pc(210) IOException local210) { - if (Protocol.socket != null) { - Protocol.socket.close(); - Protocol.socket = null; - } - if (Static196.anInt4587 < 1) { - if (Static208.worldListPort == Static249.worldListDefaultPort) { - Static208.worldListPort = Static97.worldListAlternatePort; - } else { - Static208.worldListPort = Static249.worldListDefaultPort; - } - Static219.anInt4937 = 1; - Static20.anInt673 = 0; - Static196.anInt4587++; - } else { - Static266.reply = -4; - Static219.anInt4937 = 0; - } - } - } } diff --git a/client/src/main/java/Static32.java b/client/src/main/java/Static32.java index ac4be45..fda5f41 100644 --- a/client/src/main/java/Static32.java +++ b/client/src/main/java/Static32.java @@ -7,10 +7,7 @@ public final class Static32 { @OriginalMember(owner = "client!ci", name = "q", descriptor = "Lclient!ek;") public static SoftwareIndexedSprite aClass36_Sub1_1 = null; - @OriginalMember(owner = "client!ci", name = "u", descriptor = "[[S") - public static final short[][] aShortArrayArray1 = new short[][] { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 44, 64, 84, 104, 304, 678, 698, 550, 934, 954, 6448, 6946, 6966, 2352, 2726, 2746, 10544, 10918, 10938, 10304, 10550, 10570, 14640, 15014, 15034, 19760, 20134, 20154, -29392, -29018, -28998, 31024, 31270, 31290, -24272, -23898, -23878, -19152, -18778, -18758, -14032, -13658, -13638, -6864, -6490, -6470, 516, 536, 6788, 6808, 11012, 11032, 14980, 15000, 21124, 21144, -28924, -28904, -22012, -21992, -12924, -12904 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10339, 10574, 10425, 10398, 10345, 7512, 8507, 7378, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 44, 64, 84, 104, 304, 678, 698, 550, 934, 954, 6448, 6946, 6966, 2352, 2726, 2746, 10544, 10918, 10938, 10304, 10550, 10570, 14640, 15014, 15034, 19760, 20134, 20154, -29392, -29018, -28998, 31024, 31270, 31290, -24272, -23898, -23878, -19152, -18778, -18758, -14032, -13658, -13638, -6864, -6490, -6470, 516, 536, 6788, 6808, 11012, 11032, 14980, 15000, 21124, 21144, -28924, -28904, -22012, -21992, -12924, -12904 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13753, 13737, 13719, 13883, 13863, 13974, 19643, 18601, 16532, 23993, 25121, 24980, 26944, 26921, 24854, 27191, 27171, 26130, 26941, 28696, 30100, 12477, 10407, 10388, 10685, 10665, 10646, 6711, 6693, 6674, 6965, 7073, 7056, 2361, 4387, 3346, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 44, 64, 84, 104, 304, 678, 698, 550, 934, 954, 6448, 6946, 6966, 2352, 2726, 2746, 10544, 10918, 10938, 10304, 10550, 10570, 14640, 15014, 15034, 19760, 20134, 20154, -29392, -29018, -28998, 31024, 31270, 31290, -24272, -23898, -23878, -19152, -18778, -18758, -14032, -13658, -13638, -6864, -6490, -6470, 516, 536, 6788, 6808, 11012, 11032, 14980, 15000, 21124, 21144, -28924, -28904, -22012, -21992, -12924, -12904 } }; - - @OriginalMember(owner = "client!ci", name = "a", descriptor = "([I[ILclient!e;B[I)V") + @OriginalMember(owner = "client!ci", name = "a", descriptor = "([I[ILclient!e;B[I)V") public static void method865(@OriginalArg(0) int[] arg0, @OriginalArg(1) int[] arg1, @OriginalArg(2) Player arg2, @OriginalArg(4) int[] arg3) { for (@Pc(7) int local7 = 0; local7 < arg1.length; local7++) { @Pc(20) int local20 = arg1[local7]; @@ -22,7 +19,7 @@ public final class Static32 { if (local20 == -1) { arg2.aClass147Array3[local30] = null; } else { - @Pc(68) SeqType local68 = Static36.get(local20); + @Pc(68) SeqType local68 = SeqTypeList.get(local20); @Pc(71) int local71 = local68.anInt5347; @Pc(76) Class147 local76 = arg2.aClass147Array3[local30]; if (local76 != null) { @@ -39,7 +36,7 @@ public final class Static32 { } else if (local71 == 2) { local76.anInt5400 = 0; } - } else if (local68.anInt5355 >= Static36.get(local76.anInt5396).anInt5355) { + } else if (local68.anInt5355 >= SeqTypeList.get(local76.anInt5396).anInt5355) { local76 = arg2.aClass147Array3[local30] = null; } } diff --git a/client/src/main/java/Static33.java b/client/src/main/java/Static33.java index b6d9db5..49e3e46 100644 --- a/client/src/main/java/Static33.java +++ b/client/src/main/java/Static33.java @@ -5,9 +5,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static33 { - @OriginalMember(owner = "client!cj", name = "e", descriptor = "[[S") - public static short[][] aShortArrayArray2; - @OriginalMember(owner = "client!cj", name = "n", descriptor = "Lsignlink!im;") public static PrivilegedRequest openUrlRequest; @@ -67,12 +64,7 @@ public final class Static33 { return arg0; } - @OriginalMember(owner = "client!cj", name = "a", descriptor = "(IB)I") - public static int method872(@OriginalArg(0) int arg0) { - return arg0 & 0xFF; - } - - @OriginalMember(owner = "client!cj", name = "a", descriptor = "(JB)Lclient!na;") + @OriginalMember(owner = "client!cj", name = "a", descriptor = "(JB)Lclient!na;") public static JagString method873(@OriginalArg(0) long arg0) { Static35.aCalendar1.setTime(new Date(arg0)); @Pc(13) int local13 = Static35.aCalendar1.get(7); diff --git a/client/src/main/java/Static34.java b/client/src/main/java/Static34.java index 7b1afb0..fb68325 100644 --- a/client/src/main/java/Static34.java +++ b/client/src/main/java/Static34.java @@ -8,46 +8,46 @@ public final class Static34 { public static int anInt1060; @OriginalMember(owner = "client!ck", name = "b", descriptor = "Lclient!na;") - private static final JagString aClass100_195 = Static28.parse("Discard"); + private static final JagString aClass100_195 = JagString.parse("Discard"); @OriginalMember(owner = "client!ck", name = "d", descriptor = "[I") public static final int[] anIntArray80 = new int[] { 1, 0, -1, 0 }; @OriginalMember(owner = "client!ck", name = "T", descriptor = "Lclient!na;") - private static final JagString aClass100_207 = Static28.parse("Jan"); + private static final JagString aClass100_207 = JagString.parse("Jan"); @OriginalMember(owner = "client!ck", name = "hb", descriptor = "Lclient!na;") - private static final JagString aClass100_212 = Static28.parse("Feb"); + private static final JagString aClass100_212 = JagString.parse("Feb"); @OriginalMember(owner = "client!ck", name = "gb", descriptor = "Lclient!na;") - private static final JagString aClass100_211 = Static28.parse("Mar"); + private static final JagString aClass100_211 = JagString.parse("Mar"); @OriginalMember(owner = "client!ck", name = "db", descriptor = "Lclient!na;") - private static final JagString aClass100_210 = Static28.parse("Apr"); + private static final JagString aClass100_210 = JagString.parse("Apr"); @OriginalMember(owner = "client!ck", name = "n", descriptor = "Lclient!na;") - private static final JagString aClass100_199 = Static28.parse("May"); + private static final JagString aClass100_199 = JagString.parse("May"); @OriginalMember(owner = "client!ck", name = "L", descriptor = "Lclient!na;") - private static final JagString aClass100_204 = Static28.parse("Jun"); + private static final JagString aClass100_204 = JagString.parse("Jun"); @OriginalMember(owner = "client!ck", name = "B", descriptor = "Lclient!na;") - private static final JagString aClass100_202 = Static28.parse("Jul"); + private static final JagString aClass100_202 = JagString.parse("Jul"); @OriginalMember(owner = "client!ck", name = "l", descriptor = "Lclient!na;") - private static final JagString aClass100_198 = Static28.parse("Aug"); + private static final JagString aClass100_198 = JagString.parse("Aug"); @OriginalMember(owner = "client!ck", name = "V", descriptor = "Lclient!na;") - private static final JagString aClass100_208 = Static28.parse("Sep"); + private static final JagString aClass100_208 = JagString.parse("Sep"); @OriginalMember(owner = "client!ck", name = "S", descriptor = "Lclient!na;") - private static final JagString aClass100_206 = Static28.parse("Oct"); + private static final JagString aClass100_206 = JagString.parse("Oct"); @OriginalMember(owner = "client!ck", name = "Y", descriptor = "Lclient!na;") - private static final JagString aClass100_209 = Static28.parse("Nov"); + private static final JagString aClass100_209 = JagString.parse("Nov"); @OriginalMember(owner = "client!ck", name = "O", descriptor = "Lclient!na;") - private static final JagString aClass100_205 = Static28.parse("Dec"); + private static final JagString aClass100_205 = JagString.parse("Dec"); @OriginalMember(owner = "client!ck", name = "f", descriptor = "[Lclient!na;") public static final JagString[] aClass100Array40 = new JagString[] { aClass100_207, aClass100_212, aClass100_211, aClass100_210, aClass100_199, aClass100_204, aClass100_202, aClass100_198, aClass100_208, aClass100_206, aClass100_209, aClass100_205 }; @@ -56,12 +56,9 @@ public final class Static34 { public static volatile int anInt1034 = 0; @OriginalMember(owner = "client!ck", name = "o", descriptor = "Lclient!na;") - private static final JagString aClass100_200 = Static28.parse("Loaded world list data"); + private static final JagString aClass100_200 = JagString.parse("Loaded world list data"); - @OriginalMember(owner = "client!ck", name = "C", descriptor = "I") - public static int anInt1047 = 0; - - @OriginalMember(owner = "client!ck", name = "D", descriptor = "Lclient!na;") + @OriginalMember(owner = "client!ck", name = "D", descriptor = "Lclient!na;") public static JagString aClass100_203 = null; @OriginalMember(owner = "client!ck", name = "K", descriptor = "I") @@ -70,37 +67,12 @@ public final class Static34 { @OriginalMember(owner = "client!ck", name = "eb", descriptor = "Z") public static boolean verifyIdChanged = false; - @OriginalMember(owner = "client!ck", name = "a", descriptor = "(ILclient!va;Lclient!ve;Lclient!ve;Lclient!ve;)Z") - public static boolean init(@OriginalArg(1) MidiPcmStream arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) Js5 arg2, @OriginalArg(4) Js5 arg3) { - Static210.aClass153_87 = arg1; - Static78.aClass153_32 = arg3; - Static252.aClass153_103 = arg2; - Static172.aClass3_Sub3_Sub4_2 = arg0; - return true; - } - - @OriginalMember(owner = "client!ck", name = "a", descriptor = "(BI)Lclient!eg;") - public static SpotAnimType method877(@OriginalArg(1) int arg0) { - @Pc(10) SpotAnimType local10 = (SpotAnimType) Static279.aClass99_38.get((long) arg0); - if (local10 != null) { - return local10; - } - @Pc(26) byte[] local26 = Static132.aClass153_48.getFile(Static206.method3681(arg0), Static133.method4010(arg0)); - local10 = new SpotAnimType(); - local10.id = arg0; - if (local26 != null) { - local10.method1316(new Buffer(local26)); - } - Static279.aClass99_38.put(local10, (long) arg0); - return local10; - } - @OriginalMember(owner = "client!ck", name = "a", descriptor = "(Lclient!fe;I)V") public static void method879(@OriginalArg(0) PathingEntity arg0) { arg0.aBoolean171 = false; @Pc(18) SeqType local18; if (arg0.anInt3366 != -1) { - local18 = Static36.get(arg0.anInt3366); + local18 = SeqTypeList.get(arg0.anInt3366); if (local18 == null || local18.frames == null) { arg0.anInt3366 = -1; } else { @@ -124,11 +96,11 @@ public final class Static34 { } @Pc(156) int local156; if (arg0.anInt3432 != -1 && Static83.loop >= arg0.anInt3359) { - local156 = method877(arg0.anInt3432).seqId; + local156 = SpotAnimTypeList.get(arg0.anInt3432).seqId; if (local156 == -1) { arg0.anInt3432 = -1; } else { - @Pc(165) SeqType local165 = Static36.get(local156); + @Pc(165) SeqType local165 = SeqTypeList.get(local156); if (local165 == null || local165.frames == null) { arg0.anInt3432 = -1; } else { @@ -153,14 +125,14 @@ public final class Static34 { } } if (arg0.seqId != -1 && arg0.anInt3420 <= 1) { - local18 = Static36.get(arg0.seqId); + local18 = SeqTypeList.get(arg0.seqId); if (local18.anInt5363 == 1 && arg0.anInt3405 > 0 && Static83.loop >= arg0.anInt3395 && Static83.loop > arg0.anInt3386) { arg0.anInt3420 = 1; return; } } if (arg0.seqId != -1 && arg0.anInt3420 == 0) { - local18 = Static36.get(arg0.seqId); + local18 = SeqTypeList.get(arg0.seqId); if (local18 == null || local18.frames == null) { arg0.seqId = -1; } else { @@ -202,7 +174,7 @@ public final class Static34 { if (local545.anInt5408 > 0) { local545.anInt5408--; } else { - @Pc(570) SeqType local570 = Static36.get(local545.anInt5396); + @Pc(570) SeqType local570 = SeqTypeList.get(local545.anInt5396); if (local570 == null || local570.frames == null) { arg0.aClass147Array3[local156] = null; } else { diff --git a/client/src/main/java/Static35.java b/client/src/main/java/Static35.java index 1d11126..fbba11a 100644 --- a/client/src/main/java/Static35.java +++ b/client/src/main/java/Static35.java @@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static35 { - @OriginalMember(owner = "client!cl", name = "J", descriptor = "Lclient!ve;") - public static Js5 aClass153_22; - - @OriginalMember(owner = "client!cl", name = "V", descriptor = "[I") + @OriginalMember(owner = "client!cl", name = "V", descriptor = "[I") public static int[] underWaterLocationsMapFileIds; @OriginalMember(owner = "client!cl", name = "X", descriptor = "I") diff --git a/client/src/main/java/Static36.java b/client/src/main/java/Static36.java index dcec4b8..5ba4b7f 100644 --- a/client/src/main/java/Static36.java +++ b/client/src/main/java/Static36.java @@ -17,7 +17,7 @@ public final class Static36 { return null; } for (@Pc(10) int local10 = 0; local10 < local4; local10++) { - arg0 = Static5.getComponent(arg0.layer); + arg0 = InterfaceList.getComponent(arg0.layer); if (arg0 == null) { return null; } @@ -31,23 +31,6 @@ public final class Static36 { return local13 == null ? arg0.aClass3_Sub4_1 : local13; } - @OriginalMember(owner = "client!client", name = "a", descriptor = "(IB)Lclient!tk;") - public static SeqType get(@OriginalArg(0) int arg0) { - @Pc(17) SeqType local17 = (SeqType) Static142.aClass99_23.get((long) arg0); - if (local17 != null) { - return local17; - } - @Pc(32) byte[] local32 = Static243.aClass153_98.getFile(Static221.method3389(arg0), Static118.method2356(arg0)); - local17 = new SeqType(); - local17.anInt5361 = arg0; - if (local32 != null) { - local17.decode(new Buffer(local32)); - } - local17.postDecode(); - Static142.aClass99_23.put(local17, (long) arg0); - return local17; - } - @OriginalMember(owner = "client!client", name = "a", descriptor = "([Lclient!be;IIIIIII)V") public static void method946(@OriginalArg(0) Component[] 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) { for (@Pc(1) int local1 = 0; local1 < arg0.length; local1++) { @@ -181,9 +164,9 @@ public final class Static36 { continue; } if (local9.anInt453 == 1400) { - Static24.component = local9; + WorldMap.component = local9; if (local221) { - if (Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Static191.staffModLevel > 0) { + if (Keyboard.pressedKeys[Keyboard.KEY_CTRL] && LoginManager.staffModLevel > 0) { 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; @@ -449,13 +432,13 @@ public final class Static36 { local399.arguments = local9.anObjectArray30; InterfaceList.lowPriorityRequests.addTail(local399); } - local9.anInt482 = Static119.transmitTimer; + local9.anInt482 = InterfaceList.transmitTimer; if (local9.anObjectArray14 != null) { - for (local243 = 0; local243 < Static182.keyQueueSize; local243++) { + for (local243 = 0; local243 < InterfaceList.keyQueueSize; local243++) { @Pc(1430) HookRequest local1430 = new HookRequest(); local1430.source = local9; - local1430.keyCode = Static227.keyCodes[local243]; - local1430.keyChar = Static205.keyChars[local243]; + local1430.keyCode = InterfaceList.keyCodes[local243]; + local1430.keyChar = InterfaceList.keyChars[local243]; local1430.arguments = local9.anObjectArray14; InterfaceList.lowPriorityRequests.addTail(local1430); } diff --git a/client/src/main/java/Static37.java b/client/src/main/java/Static37.java index b644845..696531a 100644 --- a/client/src/main/java/Static37.java +++ b/client/src/main/java/Static37.java @@ -10,10 +10,7 @@ public final class Static37 { @OriginalMember(owner = "client!cm", name = "c", descriptor = "I") public static int anInt1176; - @OriginalMember(owner = "client!cm", name = "f", descriptor = "Lsignlink!im;") - public static PrivilegedRequest js5SocketRequest; - - @OriginalMember(owner = "client!cm", name = "a", descriptor = "(ILclient!fe;)V") + @OriginalMember(owner = "client!cm", name = "a", descriptor = "(ILclient!fe;)V") public static void method949(@OriginalArg(1) PathingEntity arg0) { if (arg0.anInt3376 == 0) { return; @@ -35,7 +32,7 @@ public final class Static37 { @Pc(70) int local70; if (arg0.anInt3370 >= 32768) { local70 = arg0.anInt3370 - 32768; - if (local70 == Static16.anInt549) { + if (local70 == PlayerList.selfId) { local70 = 2047; } @Pc(83) Player local83 = Static159.players[local70]; diff --git a/client/src/main/java/Static38.java b/client/src/main/java/Static38.java index e646b70..4d3bb10 100644 --- a/client/src/main/java/Static38.java +++ b/client/src/main/java/Static38.java @@ -280,11 +280,11 @@ public final class Static38 { } } if (local39.attachment == null || Static83.loop < local39.anInt3390 || local39.anInt3375 <= Static83.loop) { - local39.anInt3424 = Static207.method3685(Static55.level, local39.xFine, local39.zFine); + local39.anInt3424 = SceneGraph.getTileHeight(Static55.level, local39.xFine, local39.zFine); Static43.method1141(Static55.level, local39.xFine, local39.zFine, local39.anInt3424, (local82 - 1) * 64 + 60, local39, local39.anInt3381, local272, local39.aBoolean171); } else { local39.aBoolean98 = false; - local39.anInt3424 = Static207.method3685(Static55.level, local39.xFine, local39.zFine); + local39.anInt3424 = SceneGraph.getTileHeight(Static55.level, local39.xFine, local39.zFine); Static184.method3387(Static55.level, local39.xFine, local39.zFine, local39.anInt3424, local39, local39.anInt3381, local272, local39.anInt3384, local39.anInt3374, local39.anInt3411, local39.anInt3410); } } diff --git a/client/src/main/java/Static39.java b/client/src/main/java/Static39.java index 89134af..fa2c0a0 100644 --- a/client/src/main/java/Static39.java +++ b/client/src/main/java/Static39.java @@ -5,10 +5,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static39 { - @OriginalMember(owner = "client!d", name = "hb", descriptor = "Lclient!ve;") - public static Js5 aClass153_23; - - @OriginalMember(owner = "client!d", name = "ib", descriptor = "Lclient!qf;") + @OriginalMember(owner = "client!d", name = "ib", descriptor = "Lclient!qf;") public static Sprite aClass3_Sub2_Sub1_1; @OriginalMember(owner = "client!d", name = "R", descriptor = "Lclient!be;") diff --git a/client/src/main/java/Static4.java b/client/src/main/java/Static4.java index 44afb10..8899449 100644 --- a/client/src/main/java/Static4.java +++ b/client/src/main/java/Static4.java @@ -8,9 +8,6 @@ public final class Static4 { @OriginalMember(owner = "client!ac", name = "e", descriptor = "[[[B") public static byte[][][] aByteArrayArrayArray1; - @OriginalMember(owner = "client!ac", name = "c", descriptor = "I") - public static int js5ConnectState = 0; - @OriginalMember(owner = "client!ac", name = "i", descriptor = "Lclient!ih;") public static final LinkedList highPriorityRequests = new LinkedList(); @@ -71,75 +68,75 @@ public final class Static4 { if (local14 == 0) { return false; } - if (Static164.anInt3985 == -1) { + if (Protocol.opcode == -1) { local14--; - 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]; + Protocol.socket.read(0, 1, Protocol.inboundBuffer.data); + Protocol.inboundBuffer.offset = 0; + Protocol.opcode = Protocol.inboundBuffer.g1isaac(); + Protocol.length = Static234.anIntArray456[Protocol.opcode]; } - if (Static223.anInt5028 == -1) { + if (Protocol.length == -1) { if (local14 <= 0) { return false; } - Protocol.socket.read(0, 1, Static57.aClass3_Sub15_Sub1_3.data); + Protocol.socket.read(0, 1, Protocol.inboundBuffer.data); local14--; - Static223.anInt5028 = Static57.aClass3_Sub15_Sub1_3.data[0] & 0xFF; + Protocol.length = Protocol.inboundBuffer.data[0] & 0xFF; } - if (Static223.anInt5028 == -2) { + if (Protocol.length == -2) { if (local14 <= 1) { return false; } local14 -= 2; - 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(); + Protocol.socket.read(0, 2, Protocol.inboundBuffer.data); + Protocol.inboundBuffer.offset = 0; + Protocol.length = Protocol.inboundBuffer.g2(); } - if (Static223.anInt5028 > local14) { + if (Protocol.length > local14) { return false; } - Static57.aClass3_Sub15_Sub1_3.offset = 0; - Protocol.socket.read(0, Static223.anInt5028, Static57.aClass3_Sub15_Sub1_3.data); + Protocol.inboundBuffer.offset = 0; + Protocol.socket.read(0, Protocol.length, Protocol.inboundBuffer.data); Static49.anInt1462 = Static5.anInt45; Static5.anInt45 = Static230.anInt5152; - Static230.anInt5152 = Static164.anInt3985; + Static230.anInt5152 = Protocol.opcode; Static201.anInt1862 = 0; @Pc(133) int local133; - if (Static164.anInt3985 == 60) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2sub(); - @Pc(137) byte local137 = Static57.aClass3_Sub15_Sub1_3.g1neg(); + if (Protocol.opcode == 60) { + local133 = Protocol.inboundBuffer.g2sub(); + @Pc(137) byte local137 = Protocol.inboundBuffer.g1neg(); Static170.method2575(local137, local133); - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; } @Pc(171) int local171; @Pc(156) JagString local156; - if (Static164.anInt3985 == 115) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2(); - local156 = Static57.aClass3_Sub15_Sub1_3.gjstr(); + if (Protocol.opcode == 115) { + local133 = Protocol.inboundBuffer.g2(); + local156 = Protocol.inboundBuffer.gjstr(); @Pc(163) Object[] local163 = new Object[local156.length() + 1]; for (local171 = local156.length() - 1; local171 >= 0; local171--) { if (local156.charAt(local171) == 115) { - local163[local171 + 1] = Static57.aClass3_Sub15_Sub1_3.gjstr(); + local163[local171 + 1] = Protocol.inboundBuffer.gjstr(); } else { - local163[local171 + 1] = Integer.valueOf(Static57.aClass3_Sub15_Sub1_3.g4()); + local163[local171 + 1] = Integer.valueOf(Protocol.inboundBuffer.g4()); } } - local163[0] = Integer.valueOf(Static57.aClass3_Sub15_Sub1_3.g4()); + local163[0] = Integer.valueOf(Protocol.inboundBuffer.g4()); if (Static248.method3288(local133)) { @Pc(226) HookRequest local226 = new HookRequest(); local226.arguments = local163; Static82.method1767(local226); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; } @Pc(275) long local275; @Pc(262) boolean local262; @Pc(277) int local277; @Pc(506) JagString local506; - if (Static164.anInt3985 == 70) { - @Pc(245) JagString local245 = Static57.aClass3_Sub15_Sub1_3.gjstr(); + if (Protocol.opcode == 70) { + @Pc(245) JagString local245 = Protocol.inboundBuffer.gjstr(); if (local245.method3130(Static196.aClass100_863)) { local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); local275 = local156.encode37(); @@ -249,43 +246,43 @@ public final class Static4 { } else { Static103.method2231(JagString.EMPTY, 0, local245); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; } @Pc(786) int local786; @Pc(790) JagString local790; - if (Static164.anInt3985 == 123) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2le(); - local786 = Static57.aClass3_Sub15_Sub1_3.g2sub(); - local790 = Static57.aClass3_Sub15_Sub1_3.gjstr(); + if (Protocol.opcode == 123) { + local133 = Protocol.inboundBuffer.g2le(); + local786 = Protocol.inboundBuffer.g2sub(); + local790 = Protocol.inboundBuffer.gjstr(); if (Static248.method3288(local786)) { Static193.method3498(local790, local133); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 230) { - Static180.anInt4264 = Static57.aClass3_Sub15_Sub1_3.g1add(); - Static115.anInt2940 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); - while (Static223.anInt5028 > Static57.aClass3_Sub15_Sub1_3.offset) { - Static164.anInt3985 = Static57.aClass3_Sub15_Sub1_3.g1(); + } else if (Protocol.opcode == 230) { + Static180.anInt4264 = Protocol.inboundBuffer.g1add(); + Static115.anInt2940 = Protocol.inboundBuffer.g1ssub(); + while (Protocol.length > Protocol.inboundBuffer.offset) { + Protocol.opcode = Protocol.inboundBuffer.g1(); Static75.method1634(); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 153) { - Static164.anInt3985 = -1; + } else if (Protocol.opcode == 153) { + Protocol.opcode = -1; Static115.anInt2939 = 0; return true; } else { @Pc(864) int local864; - if (Static164.anInt3985 == 220) { - local133 = Static57.aClass3_Sub15_Sub1_3.p4rme(); - local786 = Static57.aClass3_Sub15_Sub1_3.g2le(); - local864 = Static57.aClass3_Sub15_Sub1_3.g2(); + if (Protocol.opcode == 220) { + local133 = Protocol.inboundBuffer.p4rme(); + local786 = Protocol.inboundBuffer.g2le(); + local864 = Protocol.inboundBuffer.g2(); if (Static248.method3288(local864)) { Static229.method3938(local786, local133); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; } @Pc(884) long local884; @@ -293,15 +290,15 @@ public final class Static4 { @Pc(916) int local916; @Pc(899) long local899; @Pc(904) long local904; - if (Static164.anInt3985 == 81) { - local884 = Static57.aClass3_Sub15_Sub1_3.g8(); - Static57.aClass3_Sub15_Sub1_3.g1s(); - local275 = Static57.aClass3_Sub15_Sub1_3.g8(); - local899 = Static57.aClass3_Sub15_Sub1_3.g2(); - local904 = Static57.aClass3_Sub15_Sub1_3.g3(); - local908 = Static57.aClass3_Sub15_Sub1_3.g1(); + if (Protocol.opcode == 81) { + local884 = Protocol.inboundBuffer.g8(); + Protocol.inboundBuffer.g1s(); + local275 = Protocol.inboundBuffer.g8(); + local899 = Protocol.inboundBuffer.g2(); + local904 = Protocol.inboundBuffer.g3(); + local908 = Protocol.inboundBuffer.g1(); @Pc(910) boolean local910 = false; - local916 = Static57.aClass3_Sub15_Sub1_3.g2(); + local916 = Protocol.inboundBuffer.g2(); @Pc(922) long local922 = (local899 << 32) + local904; @Pc(924) int local924 = 0; label1320: while (true) { @@ -326,50 +323,50 @@ public final class Static4 { if (!local910 && Static11.anInt384 == 0) { Static233.aLongArray9[Static251.anInt5447] = local922; Static251.anInt5447 = (Static251.anInt5447 + 1) % 100; - @Pc(999) JagString local999 = Static230.method3953(local916).method770(Static57.aClass3_Sub15_Sub1_3); + @Pc(999) JagString local999 = QuickChatPhraseTypeList.get(local916).method770(Protocol.inboundBuffer); if (local908 == 2 || local908 == 3) { - Static154.method2928(local916, 20, local999, Static79.decode37(local275).method3125(), JagString.concatenate(new JagString[] { Static44.aClass100_336, Static79.decode37(local884).method3125() })); + Static154.method2928(local916, 20, local999, Base37.decodeLowerCase(local275).method3125(), JagString.concatenate(new JagString[] { Static44.aClass100_336, Base37.decodeLowerCase(local884).method3125() })); } else if (local908 == 1) { - Static154.method2928(local916, 20, local999, Static79.decode37(local275).method3125(), JagString.concatenate(new JagString[] { Static65.aClass100_435, Static79.decode37(local884).method3125() })); + Static154.method2928(local916, 20, local999, Base37.decodeLowerCase(local275).method3125(), JagString.concatenate(new JagString[] { Static65.aClass100_435, Base37.decodeLowerCase(local884).method3125() })); } else { - Static154.method2928(local916, 20, local999, Static79.decode37(local275).method3125(), Static79.decode37(local884).method3125()); + Static154.method2928(local916, 20, local999, Base37.decodeLowerCase(local275).method3125(), Base37.decodeLowerCase(local884).method3125()); } } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; } @Pc(1146) int local1146; @Pc(1160) int local1160; @Pc(1245) boolean local1245; - if (Static164.anInt3985 == 55) { - Static278.anInt5867 = Static119.transmitTimer; - local884 = Static57.aClass3_Sub15_Sub1_3.g8(); + if (Protocol.opcode == 55) { + Static278.anInt5867 = InterfaceList.transmitTimer; + local884 = Protocol.inboundBuffer.g8(); if (local884 == 0L) { Static270.aClass100_1094 = null; - Static164.anInt3985 = -1; + Protocol.opcode = -1; Static15.aClass100_87 = null; Static199.aClass3_Sub22Array1 = null; Static214.anInt5577 = 0; return true; } - local275 = Static57.aClass3_Sub15_Sub1_3.g8(); - Static15.aClass100_87 = Static79.decode37(local275); - Static270.aClass100_1094 = Static79.decode37(local884); - Static50.aByte6 = Static57.aClass3_Sub15_Sub1_3.g1s(); - local1146 = Static57.aClass3_Sub15_Sub1_3.g1(); + local275 = Protocol.inboundBuffer.g8(); + Static15.aClass100_87 = Base37.decodeLowerCase(local275); + Static270.aClass100_1094 = Base37.decodeLowerCase(local884); + Static50.aByte6 = Protocol.inboundBuffer.g1s(); + local1146 = Protocol.inboundBuffer.g1(); if (local1146 == 255) { - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; } Static214.anInt5577 = local1146; @Pc(1158) Class3_Sub22[] local1158 = new Class3_Sub22[100]; for (local1160 = 0; local1160 < Static214.anInt5577; local1160++) { local1158[local1160] = new Class3_Sub22(); - local1158[local1160].key = Static57.aClass3_Sub15_Sub1_3.g8(); - local1158[local1160].aClass100_636 = Static79.decode37(local1158[local1160].key); - local1158[local1160].anInt3340 = Static57.aClass3_Sub15_Sub1_3.g2(); - local1158[local1160].aByte9 = Static57.aClass3_Sub15_Sub1_3.g1s(); - local1158[local1160].aClass100_635 = Static57.aClass3_Sub15_Sub1_3.gjstr(); + local1158[local1160].key = Protocol.inboundBuffer.g8(); + local1158[local1160].aClass100_636 = Base37.decodeLowerCase(local1158[local1160].key); + local1158[local1160].anInt3340 = Protocol.inboundBuffer.g2(); + local1158[local1160].aByte9 = Protocol.inboundBuffer.g1s(); + local1158[local1160].aClass100_635 = Protocol.inboundBuffer.gjstr(); if (Static101.aLong98 == local1158[local1160].key) { Static160.aByte14 = local1158[local1160].aByte9; } @@ -391,42 +388,42 @@ public final class Static4 { } } Static199.aClass3_Sub22Array1 = local1158; - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 164) { - local133 = Static57.aClass3_Sub15_Sub1_3.g4rme(); + } else if (Protocol.opcode == 164) { + local133 = Protocol.inboundBuffer.g4rme(); Static232.aClass212_5 = GameShell.signLink.getReverseDns(local133); - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 225) { + } else if (Protocol.opcode == 225) { Static64.method1495(); - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 48) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2(); - local156 = Static57.aClass3_Sub15_Sub1_3.gjstr(); - local864 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); + } else if (Protocol.opcode == 48) { + local133 = Protocol.inboundBuffer.g2(); + local156 = Protocol.inboundBuffer.gjstr(); + local864 = Protocol.inboundBuffer.g2leadd(); if (Static248.method3288(local133)) { Static193.method3498(local156, local864); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 232) { - Static59.anInt1812 = Static57.aClass3_Sub15_Sub1_3.g1(); - Static49.anInt1459 = Static57.aClass3_Sub15_Sub1_3.g1(); - Static84.anInt2256 = Static57.aClass3_Sub15_Sub1_3.g1(); - Static164.anInt3985 = -1; + } else if (Protocol.opcode == 232) { + Static59.anInt1812 = Protocol.inboundBuffer.g1(); + Static49.anInt1459 = Protocol.inboundBuffer.g1(); + Static84.anInt2256 = Protocol.inboundBuffer.g1(); + Protocol.opcode = -1; return true; } else { @Pc(1409) JagString local1409; - if (Static164.anInt3985 == 44) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); + if (Protocol.opcode == 44) { + local133 = Protocol.inboundBuffer.g2leadd(); if (local133 == 65535) { local133 = -1; } - local786 = Static57.aClass3_Sub15_Sub1_3.g1(); - local864 = Static57.aClass3_Sub15_Sub1_3.g1(); - local1409 = Static57.aClass3_Sub15_Sub1_3.gjstr(); + local786 = Protocol.inboundBuffer.g1(); + local864 = Protocol.inboundBuffer.g1(); + local1409 = Protocol.inboundBuffer.gjstr(); if (local864 >= 1 && local864 <= 8) { if (local1409.equalsIgnoreCase(Static92.aClass100_510)) { local1409 = null; @@ -435,27 +432,27 @@ public final class Static4 { Static191.anIntArray388[local864 - 1] = local133; Static1.aBooleanArray1[local864 - 1] = local786 == 0; } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 226) { - local133 = Static57.aClass3_Sub15_Sub1_3.g4(); - local786 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + } else if (Protocol.opcode == 226) { + local133 = Protocol.inboundBuffer.g4(); + local786 = Protocol.inboundBuffer.g2sub(); Static170.method2575(local133, local786); - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 21) { - local133 = Static57.aClass3_Sub15_Sub1_3.p1neg(); - local786 = Static57.aClass3_Sub15_Sub1_3.g2(); - local864 = Static57.aClass3_Sub15_Sub1_3.g4me(); + } else if (Protocol.opcode == 21) { + local133 = Protocol.inboundBuffer.p1neg(); + local786 = Protocol.inboundBuffer.g2(); + local864 = Protocol.inboundBuffer.g4me(); if (Static248.method3288(local786)) { Static153.method2905(local864, local133); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 145) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); - local786 = Static57.aClass3_Sub15_Sub1_3.g1add(); - local864 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); + } else if (Protocol.opcode == 145) { + local133 = Protocol.inboundBuffer.g2leadd(); + local786 = Protocol.inboundBuffer.g1add(); + local864 = Protocol.inboundBuffer.g2leadd(); if (Static248.method3288(local864)) { if (local786 == 2) { Static5.method34(); @@ -468,67 +465,67 @@ public final class Static4 { Static186.aBooleanArray100[local171] = true; } } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 69) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); - local786 = Static57.aClass3_Sub15_Sub1_3.g4(); - local864 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + } else if (Protocol.opcode == 69) { + local133 = Protocol.inboundBuffer.g2leadd(); + local786 = Protocol.inboundBuffer.g4(); + local864 = Protocol.inboundBuffer.g2sub(); if (Static248.method3288(local133)) { Static132.method2606(local864, local786); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 141) { - local884 = Static57.aClass3_Sub15_Sub1_3.g8(); - local864 = Static57.aClass3_Sub15_Sub1_3.g2(); - local1409 = Static230.method3953(local864).method770(Static57.aClass3_Sub15_Sub1_3); - Static154.method2928(local864, 19, local1409, null, Static79.decode37(local884).method3125()); - Static164.anInt3985 = -1; + } else if (Protocol.opcode == 141) { + local884 = Protocol.inboundBuffer.g8(); + local864 = Protocol.inboundBuffer.g2(); + local1409 = QuickChatPhraseTypeList.get(local864).method770(Protocol.inboundBuffer); + Static154.method2928(local864, 19, local1409, null, Base37.decodeLowerCase(local884).method3125()); + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 169) { - Static271.method4598(Static57.aClass3_Sub15_Sub1_3); - Static164.anInt3985 = -1; + } else if (Protocol.opcode == 169) { + Static271.method4598(Protocol.inboundBuffer); + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 89) { + } else if (Protocol.opcode == 89) { Static8.method121(); - Static103.method2245(); + InterfaceList.method2245(); Static70.updatedVarpsWriterIndex += 32; - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 125) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2(); - local786 = Static57.aClass3_Sub15_Sub1_3.g1(); - local864 = Static57.aClass3_Sub15_Sub1_3.g1(); - local171 = Static57.aClass3_Sub15_Sub1_3.g2(); - local1146 = Static57.aClass3_Sub15_Sub1_3.g1(); - local277 = Static57.aClass3_Sub15_Sub1_3.g1(); + } else if (Protocol.opcode == 125) { + local133 = Protocol.inboundBuffer.g2(); + local786 = Protocol.inboundBuffer.g1(); + local864 = Protocol.inboundBuffer.g1(); + local171 = Protocol.inboundBuffer.g2(); + local1146 = Protocol.inboundBuffer.g1(); + local277 = Protocol.inboundBuffer.g1(); if (Static248.method3288(local133)) { Static260.method3849(local171, local864, local1146, local786, local277); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 36) { - local133 = Static57.aClass3_Sub15_Sub1_3.p4rme(); - local786 = Static57.aClass3_Sub15_Sub1_3.g2les(); - local864 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + } else if (Protocol.opcode == 36) { + local133 = Protocol.inboundBuffer.p4rme(); + local786 = Protocol.inboundBuffer.g2les(); + local864 = Protocol.inboundBuffer.g2sub(); if (Static248.method3288(local864)) { Static225.method3893(local133, local786); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; } else { @Pc(1814) ServerActiveProperties local1814; @Pc(1804) ServerActiveProperties local1804; - if (Static164.anInt3985 == 9) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); - local786 = Static57.aClass3_Sub15_Sub1_3.g4me(); - local864 = Static57.aClass3_Sub15_Sub1_3.g2sub(); - local171 = Static57.aClass3_Sub15_Sub1_3.g2le(); + if (Protocol.opcode == 9) { + local133 = Protocol.inboundBuffer.g2leadd(); + local786 = Protocol.inboundBuffer.g4me(); + local864 = Protocol.inboundBuffer.g2sub(); + local171 = Protocol.inboundBuffer.g2le(); if (local171 == 65535) { local171 = -1; } - local1146 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + local1146 = Protocol.inboundBuffer.g2sub(); if (local1146 == 65535) { local1146 = -1; } @@ -540,22 +537,22 @@ public final class Static4 { local1814 = new ServerActiveProperties(local1804.anInt546, local133); local1804.unlink(); } else if (local277 == -1) { - local1814 = new ServerActiveProperties(Static5.getComponent(local786).aClass3_Sub4_1.anInt546, local133); + local1814 = new ServerActiveProperties(InterfaceList.getComponent(local786).aClass3_Sub4_1.anInt546, local133); } else { local1814 = new ServerActiveProperties(0, local133); } Static210.aClass133_21.put(local1814, local904); } } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; } @Pc(1986) int local1986; - if (Static164.anInt3985 == 56) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2(); - local786 = Static57.aClass3_Sub15_Sub1_3.g2le(); - local864 = Static57.aClass3_Sub15_Sub1_3.g4rme(); - local171 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); + if (Protocol.opcode == 56) { + local133 = Protocol.inboundBuffer.g2(); + local786 = Protocol.inboundBuffer.g2le(); + local864 = Protocol.inboundBuffer.g4rme(); + local171 = Protocol.inboundBuffer.g2leadd(); if (local864 >> 30 == 0) { @Pc(1994) SeqType local1994; if (local864 >> 29 != 0) { @@ -566,7 +563,7 @@ public final class Static4 { local171 = -1; } local1245 = true; - if (local171 != -1 && local1894.anInt3432 != -1 && Static36.get(Static34.method877(local171).seqId).anInt5355 < Static36.get(Static34.method877(local1894.anInt3432).seqId).anInt5355) { + if (local171 != -1 && local1894.anInt3432 != -1 && SeqTypeList.get(SpotAnimTypeList.get(local171).seqId).anInt5355 < SeqTypeList.get(SpotAnimTypeList.get(local1894.anInt3432).seqId).anInt5355) { local1245 = false; } if (local1245) { @@ -580,9 +577,9 @@ public final class Static4 { local1894.anInt3394 = local786; local1894.anInt3418 = 1; if (local1894.anInt3432 != -1 && Static83.loop == local1894.anInt3359) { - local1986 = Static34.method877(local1894.anInt3432).seqId; + local1986 = SpotAnimTypeList.get(local1894.anInt3432).seqId; if (local1986 != -1) { - local1994 = Static36.get(local1986); + local1994 = SeqTypeList.get(local1986); if (local1994 != null && local1994.frames != null) { SoundPlayer.playSeqSound(local1894.zFine, local1994, local1894.xFine, false, 0); } @@ -593,7 +590,7 @@ public final class Static4 { } else if (local864 >> 28 != 0) { local1146 = local864 & 0xFFFF; @Pc(2033) Player local2033; - if (Static16.anInt549 == local1146) { + if (PlayerList.selfId == local1146) { local2033 = PlayerList.self; } else { local2033 = Static159.players[local1146]; @@ -603,7 +600,7 @@ public final class Static4 { local171 = -1; } local1245 = true; - if (local171 != -1 && local2033.anInt3432 != -1 && Static36.get(Static34.method877(local171).seqId).anInt5355 < Static36.get(Static34.method877(local2033.anInt3432).seqId).anInt5355) { + if (local171 != -1 && local2033.anInt3432 != -1 && SeqTypeList.get(SpotAnimTypeList.get(local171).seqId).anInt5355 < SeqTypeList.get(SpotAnimTypeList.get(local2033.anInt3432).seqId).anInt5355) { local1245 = false; } if (local1245) { @@ -620,9 +617,9 @@ public final class Static4 { local2033.anInt3399 = -1; } if (local2033.anInt3432 != -1 && local2033.anInt3359 == Static83.loop) { - local1986 = Static34.method877(local2033.anInt3432).seqId; + local1986 = SpotAnimTypeList.get(local2033.anInt3432).seqId; if (local1986 != -1) { - local1994 = Static36.get(local1986); + local1994 = SeqTypeList.get(local1986); if (local1994 != null && local1994.frames != null) { SoundPlayer.playSeqSound(local2033.zFine, local1994, local2033.xFine, local2033 == PlayerList.self, 0); } @@ -638,27 +635,27 @@ public final class Static4 { if (local277 >= 0 && local1160 >= 0 && local277 < 104 && local1160 < 104) { 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); + @Pc(2241) SpotAnim local2241 = new SpotAnim(local171, local1146, local277, local1160, SceneGraph.getTileHeight(local1146, local277, local1160) - local786, local133, Static83.loop); Static99.aClass69_64.addTail(new SpotAnimNode(local2241)); } } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 207) { - local133 = Static57.aClass3_Sub15_Sub1_3.p4rme(); - local786 = Static57.aClass3_Sub15_Sub1_3.g2sub(); - local864 = Static57.aClass3_Sub15_Sub1_3.g2(); - local171 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + } else if (Protocol.opcode == 207) { + local133 = Protocol.inboundBuffer.p4rme(); + local786 = Protocol.inboundBuffer.g2sub(); + local864 = Protocol.inboundBuffer.g2(); + local171 = Protocol.inboundBuffer.g2sub(); if (Static248.method3288(local786)) { Static190.method3444(local171 + (local864 << 16), local133); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 38) { - Static103.method2245(); - local133 = Static57.aClass3_Sub15_Sub1_3.g1add(); - local786 = Static57.aClass3_Sub15_Sub1_3.g4rme(); - local864 = Static57.aClass3_Sub15_Sub1_3.g1(); + } else if (Protocol.opcode == 38) { + InterfaceList.method2245(); + local133 = Protocol.inboundBuffer.g1add(); + local786 = Protocol.inboundBuffer.g4rme(); + local864 = Protocol.inboundBuffer.g1(); Static227.anIntArray446[local864] = local786; Static99.anIntArray240[local864] = local133; Static141.anIntArray326[local864] = 1; @@ -668,15 +665,15 @@ public final class Static4 { } } Static249.anIntArray478[Static89.anInt2385++ & 0x1F] = local864; - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 104 || Static164.anInt3985 == 121 || Static164.anInt3985 == 97 || Static164.anInt3985 == 14 || Static164.anInt3985 == 202 || Static164.anInt3985 == 135 || Static164.anInt3985 == 17 || Static164.anInt3985 == 16 || Static164.anInt3985 == 240 || Static164.anInt3985 == 33 || Static164.anInt3985 == 20 || Static164.anInt3985 == 195 || Static164.anInt3985 == 179) { + } else if (Protocol.opcode == 104 || Protocol.opcode == 121 || Protocol.opcode == 97 || Protocol.opcode == 14 || Protocol.opcode == 202 || Protocol.opcode == 135 || Protocol.opcode == 17 || Protocol.opcode == 16 || Protocol.opcode == 240 || Protocol.opcode == 33 || Protocol.opcode == 20 || Protocol.opcode == 195 || Protocol.opcode == 179) { Static75.method1634(); - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 149) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2(); - local786 = Static57.aClass3_Sub15_Sub1_3.g4(); + } else if (Protocol.opcode == 149) { + local133 = Protocol.inboundBuffer.g2(); + local786 = Protocol.inboundBuffer.g4(); if (Static248.method3288(local133)) { @Pc(2441) Class3_Sub31 local2441 = (Class3_Sub31) Static119.aClass133_9.get((long) local786); if (local2441 != null) { @@ -687,12 +684,12 @@ public final class Static4 { Static39.aClass13_10 = null; } } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 187) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2le(); - local786 = Static57.aClass3_Sub15_Sub1_3.g2(); - local864 = Static57.aClass3_Sub15_Sub1_3.g2(); + } else if (Protocol.opcode == 187) { + local133 = Protocol.inboundBuffer.g2le(); + local786 = Protocol.inboundBuffer.g2(); + local864 = Protocol.inboundBuffer.g2(); if (Static248.method3288(local786)) { Camera.yawTarget = local133; Camera.pitchTarget = local864; @@ -702,22 +699,22 @@ public final class Static4 { } Camera.clampCameraAngle(); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 132) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2(); - local786 = Static57.aClass3_Sub15_Sub1_3.g2sub(); - local864 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); - local171 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); - local1146 = Static57.aClass3_Sub15_Sub1_3.g4(); + } else if (Protocol.opcode == 132) { + local133 = Protocol.inboundBuffer.g2(); + local786 = Protocol.inboundBuffer.g2sub(); + local864 = Protocol.inboundBuffer.g2leadd(); + local171 = Protocol.inboundBuffer.g2leadd(); + local1146 = Protocol.inboundBuffer.g4(); if (Static248.method3288(local786)) { Static261.method4505(local864, local1146, local171, local133); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 112) { - Static115.anInt2940 = Static57.aClass3_Sub15_Sub1_3.g1(); - Static180.anInt4264 = Static57.aClass3_Sub15_Sub1_3.p1neg(); + } else if (Protocol.opcode == 112) { + Static115.anInt2940 = Protocol.inboundBuffer.g1(); + Static180.anInt4264 = Protocol.inboundBuffer.p1neg(); for (local133 = Static115.anInt2940; local133 < Static115.anInt2940 + 8; local133++) { for (local786 = Static180.anInt4264; local786 < Static180.anInt4264 + 8; local786++) { if (Static159.aClass69ArrayArrayArray1[Static55.level][local133][local786] != null) { @@ -731,50 +728,50 @@ public final class Static4 { local2604.anInt924 = 0; } } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 144) { - local133 = Static57.aClass3_Sub15_Sub1_3.p4rme(); - @Pc(2666) Component local2666 = Static5.getComponent(local133); + } else if (Protocol.opcode == 144) { + local133 = Protocol.inboundBuffer.p4rme(); + @Pc(2666) Component local2666 = InterfaceList.getComponent(local133); for (local864 = 0; local864 < local2666.objTypes.length; local864++) { local2666.objTypes[local864] = -1; local2666.objTypes[local864] = 0; } Static43.redraw(local2666); - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 130) { - local133 = Static57.aClass3_Sub15_Sub1_3.g4me(); - local786 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); - local864 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + } else if (Protocol.opcode == 130) { + local133 = Protocol.inboundBuffer.g4me(); + local786 = Protocol.inboundBuffer.g2leadd(); + local864 = Protocol.inboundBuffer.g2sub(); if (local864 == 65535) { local864 = -1; } if (Static248.method3288(local786)) { Static132.method2607(-1, 1, local133, local864); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 192) { - Static270.anInt5795 = Static57.aClass3_Sub15_Sub1_3.g1(); - Static164.anInt3985 = -1; + } else if (Protocol.opcode == 192) { + Static270.anInt5795 = Protocol.inboundBuffer.g1(); + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 13) { - local133 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); - local786 = Static57.aClass3_Sub15_Sub1_3.g1add(); - local864 = Static57.aClass3_Sub15_Sub1_3.g1(); + } else if (Protocol.opcode == 13) { + local133 = Protocol.inboundBuffer.g1ssub(); + local786 = Protocol.inboundBuffer.g1add(); + local864 = Protocol.inboundBuffer.g1(); Static55.level = local786 >> 1; PlayerList.self.method1265(local133, (local786 & 0x1) == 1, local864); - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; } else { @Pc(3002) int local3002; @Pc(3038) JagString local3038; @Pc(3020) JagString local3020; - if (Static164.anInt3985 == 62) { - local884 = Static57.aClass3_Sub15_Sub1_3.g8(); - local864 = Static57.aClass3_Sub15_Sub1_3.g2(); - local171 = Static57.aClass3_Sub15_Sub1_3.g1(); + if (Protocol.opcode == 62) { + local884 = Protocol.inboundBuffer.g8(); + local864 = Protocol.inboundBuffer.g2(); + local171 = Protocol.inboundBuffer.g1(); local262 = true; if (local884 < 0L) { local884 &= Long.MAX_VALUE; @@ -782,9 +779,9 @@ public final class Static4 { } local506 = JagString.EMPTY; if (local864 > 0) { - local506 = Static57.aClass3_Sub15_Sub1_3.gjstr(); + local506 = Protocol.inboundBuffer.gjstr(); } - @Pc(2834) JagString local2834 = Static79.decode37(local884).method3125(); + @Pc(2834) JagString local2834 = Base37.decodeLowerCase(local884).method3125(); for (local1986 = 0; local1986 < Static9.anInt178; local1986++) { if (local884 == Static92.aLongArray3[local1986]) { if (local864 != Static104.anIntArray255[local1986]) { @@ -812,7 +809,7 @@ public final class Static4 { Static3.aBooleanArray135[Static9.anInt178] = local262; Static9.anInt178++; } - Static185.anInt4369 = Static119.transmitTimer; + Static185.anInt4369 = InterfaceList.transmitTimer; local908 = Static9.anInt178; while (local908 > 0) { local908--; @@ -844,17 +841,17 @@ public final class Static4 { break; } } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 160) { - if (Static223.anInt5028 == 0) { + } else if (Protocol.opcode == 160) { + if (Protocol.length == 0) { Static195.aClass100_859 = LocalizedText.WALKHERE; } else { - Static195.aClass100_859 = Static57.aClass3_Sub15_Sub1_3.gjstr(); + Static195.aClass100_859 = Protocol.inboundBuffer.gjstr(); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 128) { + } else if (Protocol.opcode == 128) { for (local133 = 0; local133 < Static7.varps.length; local133++) { if (Static106.anIntArray257[local133] != Static7.varps[local133]) { Static7.varps[local133] = Static106.anIntArray257[local133]; @@ -862,26 +859,26 @@ public final class Static4 { Static83.updatedVarps[Static70.updatedVarpsWriterIndex++ & 0x1F] = local133; } } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 154) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2(); - local786 = Static57.aClass3_Sub15_Sub1_3.g1(); - local864 = Static57.aClass3_Sub15_Sub1_3.g1(); - local171 = Static57.aClass3_Sub15_Sub1_3.g2(); - local1146 = Static57.aClass3_Sub15_Sub1_3.g1(); - local277 = Static57.aClass3_Sub15_Sub1_3.g1(); + } else if (Protocol.opcode == 154) { + local133 = Protocol.inboundBuffer.g2(); + local786 = Protocol.inboundBuffer.g1(); + local864 = Protocol.inboundBuffer.g1(); + local171 = Protocol.inboundBuffer.g2(); + local1146 = Protocol.inboundBuffer.g1(); + local277 = Protocol.inboundBuffer.g1(); if (Static248.method3288(local133)) { Static141.method2722(true, local1146, local171, local277, local864, local786); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 247) { - local884 = Static57.aClass3_Sub15_Sub1_3.g8(); - local275 = Static57.aClass3_Sub15_Sub1_3.g2(); - local899 = Static57.aClass3_Sub15_Sub1_3.g3(); - local1160 = Static57.aClass3_Sub15_Sub1_3.g1(); - local1986 = Static57.aClass3_Sub15_Sub1_3.g2(); + } else if (Protocol.opcode == 247) { + local884 = Protocol.inboundBuffer.g8(); + local275 = Protocol.inboundBuffer.g2(); + local899 = Protocol.inboundBuffer.g3(); + local1160 = Protocol.inboundBuffer.g1(); + local1986 = Protocol.inboundBuffer.g2(); @Pc(3263) boolean local3263 = false; @Pc(3270) long local3270 = (local275 << 32) + local899; @Pc(3272) int local3272 = 0; @@ -907,23 +904,23 @@ public final class Static4 { if (!local3263 && Static11.anInt384 == 0) { Static233.aLongArray9[Static251.anInt5447] = local3270; Static251.anInt5447 = (Static251.anInt5447 + 1) % 100; - local3020 = Static230.method3953(local1986).method770(Static57.aClass3_Sub15_Sub1_3); + local3020 = QuickChatPhraseTypeList.get(local1986).method770(Protocol.inboundBuffer); if (local1160 == 2) { - Static154.method2928(local1986, 18, local3020, null, JagString.concatenate(new JagString[] { Static44.aClass100_336, Static79.decode37(local884).method3125() })); + Static154.method2928(local1986, 18, local3020, null, JagString.concatenate(new JagString[] { Static44.aClass100_336, Base37.decodeLowerCase(local884).method3125() })); } else if (local1160 == 1) { - Static154.method2928(local1986, 18, local3020, null, JagString.concatenate(new JagString[] { Static65.aClass100_435, Static79.decode37(local884).method3125() })); + Static154.method2928(local1986, 18, local3020, null, JagString.concatenate(new JagString[] { Static65.aClass100_435, Base37.decodeLowerCase(local884).method3125() })); } else { - Static154.method2928(local1986, 18, local3020, null, Static79.decode37(local884).method3125()); + Static154.method2928(local1986, 18, local3020, null, Base37.decodeLowerCase(local884).method3125()); } } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; } else { @Pc(3456) Class3_Sub31 local3456; - if (Static164.anInt3985 == 176) { - local133 = Static57.aClass3_Sub15_Sub1_3.g4rme(); - local786 = Static57.aClass3_Sub15_Sub1_3.g2sub(); - local864 = Static57.aClass3_Sub15_Sub1_3.g4rme(); + if (Protocol.opcode == 176) { + local133 = Protocol.inboundBuffer.g4rme(); + local786 = Protocol.inboundBuffer.g2sub(); + local864 = Protocol.inboundBuffer.g4rme(); if (Static248.method3288(local786)) { @Pc(3449) Class3_Sub31 local3449 = (Class3_Sub31) Static119.aClass133_9.get((long) local133); local3456 = (Class3_Sub31) Static119.aClass133_9.get((long) local864); @@ -934,11 +931,11 @@ public final class Static4 { local3449.unlink(); Static119.aClass133_9.put(local3449, (long) local864); } - @Pc(3490) Component local3490 = Static5.getComponent(local133); + @Pc(3490) Component local3490 = InterfaceList.getComponent(local133); if (local3490 != null) { Static43.redraw(local3490); } - local3490 = Static5.getComponent(local864); + local3490 = InterfaceList.getComponent(local864); if (local3490 != null) { Static43.redraw(local3490); Static17.method531(local3490, true); @@ -947,15 +944,15 @@ public final class Static4 { Static54.method1304(1, InterfaceList.topLevelInterface); } } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 27) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2(); - local786 = Static57.aClass3_Sub15_Sub1_3.g1(); - local864 = Static57.aClass3_Sub15_Sub1_3.g1(); - local171 = Static57.aClass3_Sub15_Sub1_3.g1(); - local1146 = Static57.aClass3_Sub15_Sub1_3.g1(); - local277 = Static57.aClass3_Sub15_Sub1_3.g2(); + } else if (Protocol.opcode == 27) { + local133 = Protocol.inboundBuffer.g2(); + local786 = Protocol.inboundBuffer.g1(); + local864 = Protocol.inboundBuffer.g1(); + local171 = Protocol.inboundBuffer.g1(); + local1146 = Protocol.inboundBuffer.g1(); + local277 = Protocol.inboundBuffer.g2(); if (Static248.method3288(local133)) { Static176.aBooleanArray95[local786] = true; Static222.anIntArray437[local786] = local864; @@ -963,82 +960,82 @@ public final class Static4 { Static202.anIntArray424[local786] = local1146; Static31.anIntArray76[local786] = local277; } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 2) { - local133 = Static57.aClass3_Sub15_Sub1_3.g4rme(); - local786 = Static57.aClass3_Sub15_Sub1_3.g2sub(); - local864 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); + } else if (Protocol.opcode == 2) { + local133 = Protocol.inboundBuffer.g4rme(); + local786 = Protocol.inboundBuffer.g2sub(); + local864 = Protocol.inboundBuffer.g2leadd(); if (Static248.method3288(local786)) { Static136.method2649(local864, local133); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 85) { - Static60.rebootTimer = Static57.aClass3_Sub15_Sub1_3.g2() * 30; - Static164.anInt3985 = -1; - Static209.miscTransmitAt = Static119.transmitTimer; + } else if (Protocol.opcode == 85) { + Static60.rebootTimer = Protocol.inboundBuffer.g2() * 30; + Protocol.opcode = -1; + Static209.miscTransmitAt = InterfaceList.transmitTimer; return true; - } else if (Static164.anInt3985 == 114) { - Static202.method3654(GameShell.signLink, Static57.aClass3_Sub15_Sub1_3, Static223.anInt5028); - Static164.anInt3985 = -1; + } else if (Protocol.opcode == 114) { + Static202.method3654(GameShell.signLink, Protocol.inboundBuffer, Protocol.length); + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 65) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2le(); - local786 = Static57.aClass3_Sub15_Sub1_3.p1neg(); - local864 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); + } else if (Protocol.opcode == 65) { + local133 = Protocol.inboundBuffer.g2le(); + local786 = Protocol.inboundBuffer.p1neg(); + local864 = Protocol.inboundBuffer.g2leadd(); if (Static248.method3288(local133)) { Static132.method2606(local864, local786); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 234) { - Static103.method2245(); - Static12.anInt400 = Static57.aClass3_Sub15_Sub1_3.g1(); - Static209.miscTransmitAt = Static119.transmitTimer; - Static164.anInt3985 = -1; + } else if (Protocol.opcode == 234) { + InterfaceList.method2245(); + Static12.anInt400 = Protocol.inboundBuffer.g1(); + Static209.miscTransmitAt = InterfaceList.transmitTimer; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 209) { + } else if (Protocol.opcode == 209) { if (InterfaceList.topLevelInterface != -1) { Static54.method1304(0, InterfaceList.topLevelInterface); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 191) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2le(); + } else if (Protocol.opcode == 191) { + local133 = Protocol.inboundBuffer.g2le(); Static13.method472(local133); Static27.anIntArray70[Static111.anInt2901++ & 0x1F] = local133 & 0x7FFF; - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 102) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2le(); - local786 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); - local864 = Static57.aClass3_Sub15_Sub1_3.g2(); + } else if (Protocol.opcode == 102) { + local133 = Protocol.inboundBuffer.g2le(); + local786 = Protocol.inboundBuffer.g1ssub(); + local864 = Protocol.inboundBuffer.g2(); @Pc(3766) Npc local3766 = Static175.npcs[local133]; if (local3766 != null) { Static223.method3855(local786, local864, local3766); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 159) { - Static103.method2245(); - Static251.anInt5456 = Static57.aClass3_Sub15_Sub1_3.g2s(); - Static209.miscTransmitAt = Static119.transmitTimer; - Static164.anInt3985 = -1; + } else if (Protocol.opcode == 159) { + InterfaceList.method2245(); + Static251.anInt5456 = Protocol.inboundBuffer.g2s(); + Static209.miscTransmitAt = InterfaceList.transmitTimer; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 71) { - local884 = Static57.aClass3_Sub15_Sub1_3.g8(); - local790 = Static218.method2862(Static65.method1497(Static57.aClass3_Sub15_Sub1_3).method3116()); - Static103.method2231(Static79.decode37(local884).method3125(), 6, local790); - Static164.anInt3985 = -1; + } else if (Protocol.opcode == 71) { + local884 = Protocol.inboundBuffer.g8(); + local790 = Static218.method2862(Static65.method1497(Protocol.inboundBuffer).method3116()); + Static103.method2231(Base37.decodeLowerCase(local884).method3125(), 6, local790); + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 42) { + } else if (Protocol.opcode == 42) { if (GameShell.fullScreenFrame != null) { 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); + @Pc(3848) byte[] local3848 = new byte[Protocol.length]; + Protocol.inboundBuffer.method2237(local3848, Protocol.length); + local156 = Static10.decodeString(local3848, Protocol.length, 0); if (GameShell.frame == null && (SignLink.anInt5928 == 3 || !SignLink.osName.startsWith("win") || client.haveIe6)) { Static169.openUrl(local156, true); } else { @@ -1046,30 +1043,30 @@ public final class Static4 { Static164.newTab = true; Static33.openUrlRequest = GameShell.signLink.openUrl(new String(local156.method3148(), "ISO-8859-1")); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 111) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2sub(); - local786 = Static57.aClass3_Sub15_Sub1_3.p4rme(); - local864 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); - local171 = Static57.aClass3_Sub15_Sub1_3.g2le(); - local1146 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); + } else if (Protocol.opcode == 111) { + local133 = Protocol.inboundBuffer.g2sub(); + local786 = Protocol.inboundBuffer.p4rme(); + local864 = Protocol.inboundBuffer.g2leadd(); + local171 = Protocol.inboundBuffer.g2le(); + local1146 = Protocol.inboundBuffer.g2leadd(); if (Static248.method3288(local133)) { Static132.method2607(local864, 7, local786, local171 << 16 | local1146); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 37) { - local133 = Static57.aClass3_Sub15_Sub1_3.g1add(); - local786 = Static57.aClass3_Sub15_Sub1_3.g2le(); + } else if (Protocol.opcode == 37) { + local133 = Protocol.inboundBuffer.g1add(); + local786 = Protocol.inboundBuffer.g2le(); Static272.method3995(local133, local786); - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 155) { - local133 = Static57.aClass3_Sub15_Sub1_3.g1(); - local786 = Static57.aClass3_Sub15_Sub1_3.p4rme(); - local864 = Static57.aClass3_Sub15_Sub1_3.g2sub(); - local171 = Static57.aClass3_Sub15_Sub1_3.g2(); + } else if (Protocol.opcode == 155) { + local133 = Protocol.inboundBuffer.g1(); + local786 = Protocol.inboundBuffer.p4rme(); + local864 = Protocol.inboundBuffer.g2sub(); + local171 = Protocol.inboundBuffer.g2(); if (Static248.method3288(local864)) { local3456 = (Class3_Sub31) Static119.aClass133_9.get((long) local786); if (local3456 != null) { @@ -1077,9 +1074,9 @@ public final class Static4 { } Static44.method1148(local171, local786, local133); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 131) { + } else if (Protocol.opcode == 131) { for (local133 = 0; local133 < Static159.players.length; local133++) { if (Static159.players[local133] != null) { Static159.players[local133].seqId = -1; @@ -1090,18 +1087,18 @@ public final class Static4 { Static175.npcs[local133].seqId = -1; } } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 217) { - local133 = Static57.aClass3_Sub15_Sub1_3.g1(); + } else if (Protocol.opcode == 217) { + local133 = Protocol.inboundBuffer.g1(); @Pc(4084) Class102 local4084 = new Class102(); local786 = local133 >> 6; local4084.anInt4058 = local133 & 0x3F; - local4084.anInt4048 = Static57.aClass3_Sub15_Sub1_3.g1(); + local4084.anInt4048 = Protocol.inboundBuffer.g1(); 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; + local4084.anInt4057 = Protocol.inboundBuffer.g2(); + Protocol.inboundBuffer.offset += 3; } else if (local4084.anInt4058 >= 2 && local4084.anInt4058 <= 6) { if (local4084.anInt4058 == 2) { local4084.anInt4045 = 64; @@ -1124,48 +1121,48 @@ public final class Static4 { local4084.anInt4047 = 128; } local4084.anInt4058 = 2; - local4084.anInt4053 = Static57.aClass3_Sub15_Sub1_3.g2(); - local4084.anInt4046 = Static57.aClass3_Sub15_Sub1_3.g2(); - local4084.anInt4050 = Static57.aClass3_Sub15_Sub1_3.g1(); + local4084.anInt4053 = Protocol.inboundBuffer.g2(); + local4084.anInt4046 = Protocol.inboundBuffer.g2(); + local4084.anInt4050 = Protocol.inboundBuffer.g1(); } - local4084.anInt4052 = Static57.aClass3_Sub15_Sub1_3.g2(); + local4084.anInt4052 = Protocol.inboundBuffer.g2(); if (local4084.anInt4052 == 65535) { local4084.anInt4052 = -1; } Static143.aClass102Array1[local786] = local4084; } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 126) { - Static35.anInt1093 = Static223.anInt5028 / 8; + } else if (Protocol.opcode == 126) { + Static35.anInt1093 = Protocol.length / 8; for (local133 = 0; local133 < Static35.anInt1093; local133++) { - Static190.aLongArray6[local133] = Static57.aClass3_Sub15_Sub1_3.g8(); - Static193.aClass100Array134[local133] = Static79.decode37(Static190.aLongArray6[local133]); + Static190.aLongArray6[local133] = Protocol.inboundBuffer.g8(); + Static193.aClass100Array134[local133] = Base37.decodeLowerCase(Static190.aLongArray6[local133]); } - Static185.anInt4369 = Static119.transmitTimer; - Static164.anInt3985 = -1; + Static185.anInt4369 = InterfaceList.transmitTimer; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 32) { + } else if (Protocol.opcode == 32) { Static86.method1800(); - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 119) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2sub(); - local786 = Static57.aClass3_Sub15_Sub1_3.g4me(); - local864 = Static57.aClass3_Sub15_Sub1_3.g2s(); - local171 = Static57.aClass3_Sub15_Sub1_3.g2sadd(); + } else if (Protocol.opcode == 119) { + local133 = Protocol.inboundBuffer.g2sub(); + local786 = Protocol.inboundBuffer.g4me(); + local864 = Protocol.inboundBuffer.g2s(); + local171 = Protocol.inboundBuffer.g2sadd(); if (Static248.method3288(local133)) { Static280.method4666(local864, local786, local171); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 235) { - local133 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); + } else if (Protocol.opcode == 235) { + local133 = Protocol.inboundBuffer.g1ssub(); local786 = local133 >> 2; local864 = local133 & 0x3; local171 = Static133.anIntArray453[local786]; - local1146 = Static57.aClass3_Sub15_Sub1_3.g2(); - local277 = Static57.aClass3_Sub15_Sub1_3.g4(); + local1146 = Protocol.inboundBuffer.g2(); + local277 = Protocol.inboundBuffer.g4(); if (local1146 == 65535) { local1146 = -1; } @@ -1175,20 +1172,20 @@ public final class Static4 { local908 -= Static142.originZ; local1160 = local277 >> 28 & 0x3; Static92.method1881(local1160, local864, local786, local908, local171, local1986, local1146); - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 0) { - local884 = Static57.aClass3_Sub15_Sub1_3.g8(); - local275 = Static57.aClass3_Sub15_Sub1_3.g2(); - local899 = Static57.aClass3_Sub15_Sub1_3.g3(); - local1160 = Static57.aClass3_Sub15_Sub1_3.g1(); + } else if (Protocol.opcode == 0) { + local884 = Protocol.inboundBuffer.g8(); + local275 = Protocol.inboundBuffer.g2(); + local899 = Protocol.inboundBuffer.g3(); + local1160 = Protocol.inboundBuffer.g1(); @Pc(4425) boolean local4425 = false; @Pc(4431) long local4431 = local899 + (local275 << 32); local3002 = 0; label1450: while (true) { if (local3002 >= 100) { if (local1160 <= 1) { - if (Static124.aBoolean157 && !Static207.aBoolean236 || Static86.aBoolean129) { + if (LoginManager.playerUnderage && !LoginManager.parentalChatConsent || LoginManager.mapQuickChat) { local4425 = true; } else { for (local3002 = 0; local3002 < Static35.anInt1093; local3002++) { @@ -1210,31 +1207,31 @@ public final class Static4 { if (!local4425 && Static11.anInt384 == 0) { Static233.aLongArray9[Static251.anInt5447] = local4431; Static251.anInt5447 = (Static251.anInt5447 + 1) % 100; - @Pc(4518) JagString local4518 = Static218.method2862(Static65.method1497(Static57.aClass3_Sub15_Sub1_3).method3116()); + @Pc(4518) JagString local4518 = Static218.method2862(Static65.method1497(Protocol.inboundBuffer).method3116()); if (local1160 == 2 || local1160 == 3) { - Static103.method2231(JagString.concatenate(new JagString[] { Static44.aClass100_336, Static79.decode37(local884).method3125() }), 7, local4518); + Static103.method2231(JagString.concatenate(new JagString[] { Static44.aClass100_336, Base37.decodeLowerCase(local884).method3125() }), 7, local4518); } else if (local1160 == 1) { - Static103.method2231(JagString.concatenate(new JagString[] { Static65.aClass100_435, Static79.decode37(local884).method3125() }), 7, local4518); + Static103.method2231(JagString.concatenate(new JagString[] { Static65.aClass100_435, Base37.decodeLowerCase(local884).method3125() }), 7, local4518); } else { - Static103.method2231(Static79.decode37(local884).method3125(), 3, local4518); + Static103.method2231(Base37.decodeLowerCase(local884).method3125(), 3, local4518); } } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 54) { - local884 = Static57.aClass3_Sub15_Sub1_3.g8(); - Static57.aClass3_Sub15_Sub1_3.g1s(); - local275 = Static57.aClass3_Sub15_Sub1_3.g8(); - local899 = Static57.aClass3_Sub15_Sub1_3.g2(); - local904 = Static57.aClass3_Sub15_Sub1_3.g3(); + } else if (Protocol.opcode == 54) { + local884 = Protocol.inboundBuffer.g8(); + Protocol.inboundBuffer.g1s(); + local275 = Protocol.inboundBuffer.g8(); + local899 = Protocol.inboundBuffer.g2(); + local904 = Protocol.inboundBuffer.g3(); @Pc(4626) long local4626 = (local899 << 32) + local904; - local908 = Static57.aClass3_Sub15_Sub1_3.g1(); + local908 = Protocol.inboundBuffer.g1(); @Pc(4632) boolean local4632 = false; @Pc(4634) int local4634 = 0; label1575: while (true) { if (local4634 >= 100) { if (local908 <= 1) { - if (Static124.aBoolean157 && !Static207.aBoolean236 || Static86.aBoolean129) { + if (LoginManager.playerUnderage && !LoginManager.parentalChatConsent || LoginManager.mapQuickChat) { local4632 = true; } else { for (local4634 = 0; local4634 < Static35.anInt1093; local4634++) { @@ -1256,34 +1253,34 @@ public final class Static4 { if (!local4632 && Static11.anInt384 == 0) { Static233.aLongArray9[Static251.anInt5447] = local4626; Static251.anInt5447 = (Static251.anInt5447 + 1) % 100; - local3038 = Static218.method2862(Static65.method1497(Static57.aClass3_Sub15_Sub1_3).method3116()); + local3038 = Static218.method2862(Static65.method1497(Protocol.inboundBuffer).method3116()); if (local908 == 2 || local908 == 3) { - Static73.method1598(local3038, JagString.concatenate(new JagString[] { Static44.aClass100_336, Static79.decode37(local884).method3125() }), Static79.decode37(local275).method3125()); + Static73.method1598(local3038, JagString.concatenate(new JagString[] { Static44.aClass100_336, Base37.decodeLowerCase(local884).method3125() }), Base37.decodeLowerCase(local275).method3125()); } else if (local908 == 1) { - Static73.method1598(local3038, JagString.concatenate(new JagString[] { Static65.aClass100_435, Static79.decode37(local884).method3125() }), Static79.decode37(local275).method3125()); + Static73.method1598(local3038, JagString.concatenate(new JagString[] { Static65.aClass100_435, Base37.decodeLowerCase(local884).method3125() }), Base37.decodeLowerCase(local275).method3125()); } else { - Static73.method1598(local3038, Static79.decode37(local884).method3125(), Static79.decode37(local275).method3125()); + Static73.method1598(local3038, Base37.decodeLowerCase(local884).method3125(), Base37.decodeLowerCase(local275).method3125()); } } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 214) { - Static75.method1629(true); - Static164.anInt3985 = -1; + } else if (Protocol.opcode == 214) { + Protocol.readRebuildPacket(true); + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 172) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2(); - local786 = Static57.aClass3_Sub15_Sub1_3.g1(); + } else if (Protocol.opcode == 172) { + local133 = Protocol.inboundBuffer.g2(); + local786 = Protocol.inboundBuffer.g1(); if (local133 == 65535) { local133 = -1; } - local864 = Static57.aClass3_Sub15_Sub1_3.g2(); - Static26.method744(local786, local133, local864); - Static164.anInt3985 = -1; + local864 = Protocol.inboundBuffer.g2(); + SoundPlayer.play(local786, local133, local864); + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 66) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); - local786 = Static57.aClass3_Sub15_Sub1_3.g4rme(); + } else if (Protocol.opcode == 66) { + local133 = Protocol.inboundBuffer.g2leadd(); + local786 = Protocol.inboundBuffer.g4rme(); if (Static248.method3288(local133)) { local864 = 0; if (PlayerList.self.appearance != null) { @@ -1291,44 +1288,44 @@ public final class Static4 { } Static132.method2607(-1, 3, local786, local864); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 171) { - local133 = Static57.aClass3_Sub15_Sub1_3.p4rme(); - local156 = Static57.aClass3_Sub15_Sub1_3.gjstr(); - local864 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + } else if (Protocol.opcode == 171) { + local133 = Protocol.inboundBuffer.p4rme(); + local156 = Protocol.inboundBuffer.gjstr(); + local864 = Protocol.inboundBuffer.g2sub(); if (Static248.method3288(local864)) { Static80.method3617(local156, local133); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 84) { - local133 = Static57.aClass3_Sub15_Sub1_3.g4me(); - local786 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); + } else if (Protocol.opcode == 84) { + local133 = Protocol.inboundBuffer.g4me(); + local786 = Protocol.inboundBuffer.g2leadd(); Static272.method3995(local133, local786); - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; } else { @Pc(4956) Component local4956; - if (Static164.anInt3985 == 22) { - local133 = Static57.aClass3_Sub15_Sub1_3.g4(); - local786 = Static57.aClass3_Sub15_Sub1_3.g2(); + if (Protocol.opcode == 22) { + local133 = Protocol.inboundBuffer.g4(); + local786 = Protocol.inboundBuffer.g2(); if (local133 < -70000) { local786 += 32768; } if (local133 < 0) { local4956 = null; } else { - local4956 = Static5.getComponent(local133); + local4956 = InterfaceList.getComponent(local133); } - while (Static57.aClass3_Sub15_Sub1_3.offset < Static223.anInt5028) { - local171 = Static57.aClass3_Sub15_Sub1_3.gSmart1or2(); - local1146 = Static57.aClass3_Sub15_Sub1_3.g2(); + while (Protocol.inboundBuffer.offset < Protocol.length) { + local171 = Protocol.inboundBuffer.gSmart1or2(); + local1146 = Protocol.inboundBuffer.g2(); local277 = 0; if (local1146 != 0) { - local277 = Static57.aClass3_Sub15_Sub1_3.g1(); + local277 = Protocol.inboundBuffer.g1(); if (local277 == 255) { - local277 = Static57.aClass3_Sub15_Sub1_3.g4(); + local277 = Protocol.inboundBuffer.g4(); } } if (local4956 != null && local171 >= 0 && local4956.objTypes.length > local171) { @@ -1340,57 +1337,57 @@ public final class Static4 { if (local4956 != null) { Static43.redraw(local4956); } - Static103.method2245(); + InterfaceList.method2245(); Static27.anIntArray70[Static111.anInt2901++ & 0x1F] = local786 & 0x7FFF; - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 24) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2(); + } else if (Protocol.opcode == 24) { + local133 = Protocol.inboundBuffer.g2(); if (Static248.method3288(local133)) { Static35.resetCameraEffects(); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 86) { + } else if (Protocol.opcode == 86) { Static278.processLogout(); - Static164.anInt3985 = -1; + Protocol.opcode = -1; return false; - } else if (Static164.anInt3985 == 116) { - local133 = Static57.aClass3_Sub15_Sub1_3.g1(); - if (Static57.aClass3_Sub15_Sub1_3.g1() == 0) { + } else if (Protocol.opcode == 116) { + local133 = Protocol.inboundBuffer.g1(); + if (Protocol.inboundBuffer.g1() == 0) { Static229.aClass136Array1[local133] = new StockMarketOffer(); } else { - Static57.aClass3_Sub15_Sub1_3.offset--; - Static229.aClass136Array1[local133] = new StockMarketOffer(Static57.aClass3_Sub15_Sub1_3); + Protocol.inboundBuffer.offset--; + Static229.aClass136Array1[local133] = new StockMarketOffer(Protocol.inboundBuffer); } - Static164.anInt3985 = -1; - Static207.anInt4778 = Static119.transmitTimer; + Protocol.opcode = -1; + Static207.anInt4778 = InterfaceList.transmitTimer; return true; - } else if (Static164.anInt3985 == 73) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2sub(); - local786 = Static57.aClass3_Sub15_Sub1_3.g4me(); + } else if (Protocol.opcode == 73) { + local133 = Protocol.inboundBuffer.g2sub(); + local786 = Protocol.inboundBuffer.g4me(); if (local133 == 65535) { local133 = -1; } - local864 = Static57.aClass3_Sub15_Sub1_3.g2le(); + local864 = Protocol.inboundBuffer.g2le(); if (Static248.method3288(local864)) { Static132.method2607(-1, 2, local786, local133); } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 162) { - Static75.method1629(false); - Static164.anInt3985 = -1; + } else if (Protocol.opcode == 162) { + Protocol.readRebuildPacket(false); + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 165) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2le(); - local786 = Static57.aClass3_Sub15_Sub1_3.g2le(); + } else if (Protocol.opcode == 165) { + local133 = Protocol.inboundBuffer.g2le(); + local786 = Protocol.inboundBuffer.g2le(); if (local786 == 65535) { local786 = -1; } - local864 = Static57.aClass3_Sub15_Sub1_3.g4(); - local171 = Static57.aClass3_Sub15_Sub1_3.g2sub(); - local1146 = Static57.aClass3_Sub15_Sub1_3.g4rme(); + local864 = Protocol.inboundBuffer.g4(); + local171 = Protocol.inboundBuffer.g2sub(); + local1146 = Protocol.inboundBuffer.g4rme(); if (local171 == 65535) { local171 = -1; } @@ -1402,31 +1399,31 @@ public final class Static4 { local1814 = new ServerActiveProperties(local1146, local1804.anInt540); local1804.unlink(); } else if (local277 == -1) { - local1814 = new ServerActiveProperties(local1146, Static5.getComponent(local864).aClass3_Sub4_1.anInt540); + local1814 = new ServerActiveProperties(local1146, InterfaceList.getComponent(local864).aClass3_Sub4_1.anInt540); } else { local1814 = new ServerActiveProperties(local1146, -1); } Static210.aClass133_21.put(local1814, local904); } } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 197) { - Static166.anInt4054 = Static57.aClass3_Sub15_Sub1_3.g1(); - Static185.anInt4369 = Static119.transmitTimer; - Static164.anInt3985 = -1; + } else if (Protocol.opcode == 197) { + Static166.anInt4054 = Protocol.inboundBuffer.g1(); + Static185.anInt4369 = InterfaceList.transmitTimer; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 196) { - local884 = Static57.aClass3_Sub15_Sub1_3.g8(); - local864 = Static57.aClass3_Sub15_Sub1_3.g2(); - @Pc(5325) byte local5325 = Static57.aClass3_Sub15_Sub1_3.g1s(); + } else if (Protocol.opcode == 196) { + local884 = Protocol.inboundBuffer.g8(); + local864 = Protocol.inboundBuffer.g2(); + @Pc(5325) byte local5325 = Protocol.inboundBuffer.g1s(); local262 = false; if ((Long.MIN_VALUE & local884) != 0L) { local262 = true; } if (local262) { if (Static214.anInt5577 == 0) { - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; } local884 &= Long.MAX_VALUE; @@ -1441,10 +1438,10 @@ public final class Static4 { Static199.aClass3_Sub22Array1[Static214.anInt5577] = null; } } else { - local506 = Static57.aClass3_Sub15_Sub1_3.gjstr(); + local506 = Protocol.inboundBuffer.gjstr(); @Pc(5347) Class3_Sub22 local5347 = new Class3_Sub22(); local5347.key = local884; - local5347.aClass100_636 = Static79.decode37(local5347.key); + local5347.aClass100_636 = Base37.decodeLowerCase(local5347.key); local5347.aByte9 = local5325; local5347.aClass100_635 = local506; local5347.anInt3340 = local864; @@ -1457,8 +1454,8 @@ public final class Static4 { if (local884 == Static101.aLong98) { Static160.aByte14 = local5325; } - Static278.anInt5867 = Static119.transmitTimer; - Static164.anInt3985 = -1; + Static278.anInt5867 = InterfaceList.transmitTimer; + Protocol.opcode = -1; return true; } if (local908 < 0) { @@ -1466,7 +1463,7 @@ public final class Static4 { } } if (Static199.aClass3_Sub22Array1.length <= Static214.anInt5577) { - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; } for (local908 = Static214.anInt5577 - 1; local908 > local1986; local908--) { @@ -1481,31 +1478,31 @@ public final class Static4 { } Static214.anInt5577++; } - Static164.anInt3985 = -1; - Static278.anInt5867 = Static119.transmitTimer; + Protocol.opcode = -1; + Static278.anInt5867 = InterfaceList.transmitTimer; return true; - } else if (Static164.anInt3985 == 50) { - local133 = Static57.aClass3_Sub15_Sub1_3.g4(); - local786 = Static57.aClass3_Sub15_Sub1_3.p4rme(); - local864 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); + } else if (Protocol.opcode == 50) { + local133 = Protocol.inboundBuffer.g4(); + local786 = Protocol.inboundBuffer.p4rme(); + local864 = Protocol.inboundBuffer.g2leadd(); if (local864 == 65535) { local864 = -1; } - local171 = Static57.aClass3_Sub15_Sub1_3.g2le(); + local171 = Protocol.inboundBuffer.g2le(); if (Static248.method3288(local171)) { - @Pc(5603) Component local5603 = Static5.getComponent(local786); + @Pc(5603) Component local5603 = InterfaceList.getComponent(local786); @Pc(5615) ObjType local5615; if (local5603.aBoolean32) { Static209.method3707(local786, local133, local864); - local5615 = Static71.get(local864); + local5615 = ObjTypeList.get(local864); Static261.method4505(local5615.zoom2d, local786, local5615.yAngle2d, local5615.xAngle2d); Static145.method2745(local786, local5615.zAngle2d, local5615.yOffset2d, local5615.xOffset2d); } else if (local864 == -1) { local5603.modelType = 0; - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; } else { - local5615 = Static71.get(local864); + local5615 = ObjTypeList.get(local864); local5603.modelXAngle = local5615.xAngle2d; local5603.modelZoom = local5615.zoom2d * 100 / local133; local5603.modelType = 4; @@ -1514,16 +1511,16 @@ public final class Static4 { Static43.redraw(local5603); } } - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 105) { - local133 = Static57.aClass3_Sub15_Sub1_3.g4(); - local786 = Static57.aClass3_Sub15_Sub1_3.g2(); + } else if (Protocol.opcode == 105) { + local133 = Protocol.inboundBuffer.g4(); + local786 = Protocol.inboundBuffer.g2(); if (local133 < -70000) { local786 += 32768; } if (local133 >= 0) { - local4956 = Static5.getComponent(local133); + local4956 = InterfaceList.getComponent(local133); } else { local4956 = null; } @@ -1534,13 +1531,13 @@ public final class Static4 { } } Static14.method475(local786); - local171 = Static57.aClass3_Sub15_Sub1_3.g2(); + local171 = Protocol.inboundBuffer.g2(); for (local1146 = 0; local1146 < local171; local1146++) { - local277 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); + local277 = Protocol.inboundBuffer.g1ssub(); if (local277 == 255) { - local277 = Static57.aClass3_Sub15_Sub1_3.g4(); + local277 = Protocol.inboundBuffer.g4(); } - local1160 = Static57.aClass3_Sub15_Sub1_3.g2(); + local1160 = Protocol.inboundBuffer.g2(); if (local4956 != null && local1146 < local4956.objTypes.length) { local4956.objTypes[local1146] = local1160; local4956.objCounts[local1146] = local277; @@ -1550,38 +1547,38 @@ public final class Static4 { if (local4956 != null) { Static43.redraw(local4956); } - Static103.method2245(); + InterfaceList.method2245(); Static27.anIntArray70[Static111.anInt2901++ & 0x1F] = local786 & 0x7FFF; - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 142) { - Static230.method3954(Static57.aClass3_Sub15_Sub1_3.gjstr()); - Static164.anInt3985 = -1; + } else if (Protocol.opcode == 142) { + Static230.method3954(Protocol.inboundBuffer.gjstr()); + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 26) { - Static115.anInt2940 = Static57.aClass3_Sub15_Sub1_3.p1neg(); - Static180.anInt4264 = Static57.aClass3_Sub15_Sub1_3.g1(); - Static164.anInt3985 = -1; + } else if (Protocol.opcode == 26) { + Static115.anInt2940 = Protocol.inboundBuffer.p1neg(); + Static180.anInt4264 = Protocol.inboundBuffer.g1(); + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 4) { - local133 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); + } else if (Protocol.opcode == 4) { + local133 = Protocol.inboundBuffer.g2leadd(); if (local133 == 65535) { local133 = -1; } Static148.method2765(local133); - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; - } else if (Static164.anInt3985 == 208) { - local133 = Static57.aClass3_Sub15_Sub1_3.g3le(); - local786 = Static57.aClass3_Sub15_Sub1_3.g2le(); + } else if (Protocol.opcode == 208) { + local133 = Protocol.inboundBuffer.g3le(); + local786 = Protocol.inboundBuffer.g2le(); if (local786 == 65535) { local786 = -1; } Static278.method4650(local133, local786); - Static164.anInt3985 = -1; + Protocol.opcode = -1; return true; } else { - TracingException.report("T1 - " + Static164.anInt3985 + "," + Static5.anInt45 + "," + Static49.anInt1462 + " - " + Static223.anInt5028, null); + TracingException.report("T1 - " + Protocol.opcode + "," + Static5.anInt45 + "," + Static49.anInt1462 + " - " + Protocol.length, null); Static278.processLogout(); return true; } @@ -1643,11 +1640,11 @@ public final class Static4 { Static82.method1767(local176); } if (Static56.aClass13_12 != null && Static36.method938(Static105.aClass13_14) != null) { - Static6.outboundBuffer.p1isaac(79); - Static6.outboundBuffer.p4me(Static105.aClass13_14.id); - Static6.outboundBuffer.p2le(Static56.aClass13_12.createdComponentId); - Static6.outboundBuffer.p4(Static56.aClass13_12.id); - Static6.outboundBuffer.p2le(Static105.aClass13_14.createdComponentId); + Protocol.outboundBuffer.p1isaac(79); + Protocol.outboundBuffer.p4me(Static105.aClass13_14.id); + Protocol.outboundBuffer.p2le(Static56.aClass13_12.createdComponentId); + Protocol.outboundBuffer.p4(Static56.aClass13_12.id); + Protocol.outboundBuffer.p2le(Static105.aClass13_14.createdComponentId); } } else if ((Static116.anInt2952 == 1 || Static277.method4640(Static231.anInt5204 - 1)) && Static231.anInt5204 > 2) { Static226.method3901(); diff --git a/client/src/main/java/Static40.java b/client/src/main/java/Static40.java index 4d879d8..7c41313 100644 --- a/client/src/main/java/Static40.java +++ b/client/src/main/java/Static40.java @@ -8,7 +8,7 @@ public final class Static40 { public static int anInt1275; @OriginalMember(owner = "client!da", name = "O", descriptor = "Lclient!na;") - public static final JagString aClass100_253 = Static28.parse("(U0a )2 via: "); + public static final JagString aClass100_253 = JagString.parse("(U0a )2 via: "); @OriginalMember(owner = "client!da", name = "d", descriptor = "(I)V") public static void updateLoginScreenCamera() { @@ -107,7 +107,7 @@ public final class Static40 { local8.p2((int) (Math.random() * 99999.0D)); local8.p2(530); if (GlobalConfig.LOGIN_USE_STRINGS) { - local8.pjstr(Static79.decode37(name)); + local8.pjstr(Base37.decodeLowerCase(name)); } else { local8.p8(name); } @@ -122,20 +122,20 @@ public final class Static40 { local8.p2(arg1); local8.p4((int) (Math.random() * 9.9999999E7D)); local8.encryptRsa(GlobalConfig.RSA_EXPONENT, GlobalConfig.RSA_MODULUS); - Static6.outboundBuffer.offset = 0; - Static6.outboundBuffer.p1(36); - Static6.outboundBuffer.p1(local8.offset); - Static6.outboundBuffer.pBytes(local8.data, local8.offset); - Static223.anInt5034 = -3; - Static179.accountCreationStep = 1; - Static226.anInt5079 = 0; - Static57.anInt1758 = 0; + Protocol.outboundBuffer.offset = 0; + Protocol.outboundBuffer.p1(36); + Protocol.outboundBuffer.p1(local8.offset); + Protocol.outboundBuffer.pBytes(local8.data, local8.offset); + CreateManager.reply = -3; + CreateManager.step = 1; + CreateManager.loops = 0; + CreateManager.errors = 0; } @OriginalMember(owner = "client!da", name = "h", descriptor = "(B)V") public static void method1019() { - Static190.aClass99_26.method3103(); - Static124.aClass99_17.method3103(); - Static87.aClass99_12.method3103(); + Component.sprites.method3103(); + Component.models.method3103(); + Component.fonts.method3103(); } } diff --git a/client/src/main/java/Static41.java b/client/src/main/java/Static41.java index f081e90..a4931e0 100644 --- a/client/src/main/java/Static41.java +++ b/client/src/main/java/Static41.java @@ -1,23 +1,19 @@ -import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; public final class Static41 { - @OriginalMember(owner = "client!dc", name = "z", descriptor = "Lclient!ve;") - public static Js5 js5Archive3; - - @OriginalMember(owner = "client!dc", name = "v", descriptor = "Lclient!na;") - public static final JagString aClass100_266 = Static28.parse(""); + @OriginalMember(owner = "client!dc", name = "v", descriptor = "Lclient!na;") + public static final JagString aClass100_266 = JagString.parse(""); @OriginalMember(owner = "client!dc", name = "E", descriptor = "Lclient!na;") - private static final JagString aClass100_267 = Static28.parse("wave:"); + private static final JagString aClass100_267 = JagString.parse("wave:"); @OriginalMember(owner = "client!dc", name = "M", descriptor = "Lclient!na;") - public static final JagString aClass100_268 = Static28.parse(")4"); + public static final JagString aClass100_268 = JagString.parse(")4"); @OriginalMember(owner = "client!dc", name = "R", descriptor = "Lclient!na;") - private static final JagString aClass100_269 = Static28.parse("Drop"); + private static final JagString aClass100_269 = JagString.parse("Drop"); @OriginalMember(owner = "client!dc", name = "W", descriptor = "I") public static volatile int anInt1313 = 0; @@ -28,137 +24,9 @@ public final class Static41 { @OriginalMember(owner = "client!dc", name = "db", descriptor = "[[B") public static final byte[][] aByteArrayArray6 = new byte[50][]; - @OriginalMember(owner = "client!dc", name = "a", descriptor = "(IZLclient!tk;IIIIILclient!ak;IIIIB)Lclient!ak;") - public static Model method1043(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) SeqType arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) Model arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10, @OriginalArg(11) int arg11, @OriginalArg(12) int arg12) { - @Pc(23) long local23 = ((long) arg4 << 48) + (long) (arg7 + (arg0 << 16) + (arg12 << 24)) + ((long) arg6 << 32); - @Pc(33) Model local33 = (Model) Static45.aClass99_6.get(local23); - @Pc(109) int local109; - @Pc(115) int local115; - @Pc(126) int local126; - @Pc(130) int local130; - @Pc(162) int local162; - if (local33 == null) { - @Pc(41) byte local41; - if (arg7 == 1) { - local41 = 9; - } else if (arg7 == 2) { - local41 = 12; - } else if (arg7 == 3) { - local41 = 15; - } else if (arg7 == 4) { - local41 = 18; - } else { - local41 = 21; - } - @Pc(83) int[] local83 = new int[] { 64, 96, 128 }; - @Pc(103) RawModel local103 = new RawModel(local41 * 3 + 1, -local41 + local41 * 3 * 2, 0); - local109 = local103.method1685(0, 0); - @Pc(113) int[][] local113 = new int[3][local41]; - for (local115 = 0; local115 < 3; local115++) { - local126 = local83[local115]; - local130 = local83[local115]; - for (@Pc(132) int local132 = 0; local132 < local41; local132++) { - @Pc(141) int local141 = (local132 << 11) / local41; - @Pc(152) int local152 = arg5 + MathUtils.cos[local141] * local130 >> 16; - local162 = arg3 + MathUtils.sin[local141] * local126 >> 16; - local113[local115][local132] = local103.method1685(local162, local152); - } - } - for (local115 = 0; local115 < 3; local115++) { - local126 = (local115 * 256 + 128) / 3; - local130 = 256 - local126; - @Pc(207) byte local207 = (byte) (arg12 * local126 + arg0 * local130 >> 8); - @Pc(252) short local252 = (short) (((arg6 & 0x7F) * local130 + (arg4 & 0x7F) * local126 & 0x7F00) + (local130 * (arg6 & 0x380) + local126 * (arg4 & 0x380) & 0x38000) + (local126 * (arg4 & 0xFC00) + (arg6 & 0xFC00) * local130 & 0xFC0000) >> 8); - for (local162 = 0; local162 < local41; local162++) { - if (local115 == 0) { - local103.method1676(local109, local113[0][(local162 + 1) % local41], local113[0][local162], local252, local207); - } else { - local103.method1676(local113[local115 - 1][local162], local113[local115 - 1][(local162 + 1) % local41], local113[local115][(local162 + 1) % local41], local252, local207); - local103.method1676(local113[local115 - 1][local162], local113[local115][(local162 + 1) % local41], local113[local115][local162], local252, local207); - } - } - } - local33 = local103.createModel(64, 768, -50, -10, -50); - Static45.aClass99_6.put(local33, local23); - } - @Pc(367) int local367 = arg7 * 64 - 1; - @Pc(376) int local376 = -local367; - @Pc(379) int local379 = -local367; - @Pc(381) int local381 = local367; - @Pc(384) int local384 = arg8.method4562(); - @Pc(386) AnimFrameset local386 = null; - local115 = arg8.method4561(); - local126 = arg8.method4576(); - local130 = arg8.method4550(); - if (arg2 != null) { - @Pc(403) int local403 = arg2.frames[arg10]; - local386 = Static72.getAnimFrameset(local403 >> 16); - arg10 = local403 & 0xFFFF; - } - local109 = local367; - if (arg1) { - if (arg9 > 1664 || arg9 < 384) { - local379 -= 128; - } - if (arg9 > 1152 && arg9 < 1920) { - local381 = local367 + 128; - } - if (arg9 > 640 && arg9 < 1408) { - local109 = local367 + 128; - } - if (arg9 > 128 && arg9 < 896) { - local376 -= 128; - } - } - if (local109 < local130) { - local130 = local109; - } - if (local376 > local384) { - local384 = local376; - } - if (local126 < local379) { - local126 = local379; - } - if (local381 < local115) { - local115 = local381; - } - if (local386 == null) { - local33 = local33.method4560(true, true, true); - local33.resize((local115 - local384) / 2, 128, (local130 - local126) / 2); - local33.method4575((local384 + local115) / 2, 0, (local126 + local130) / 2); - } else { - local33 = local33.method4560(!local386.isAlphaTransformed(arg10), !local386.isColorTransformed(arg10), true); - local33.resize((local115 - local384) / 2, 128, (local130 - local126) / 2); - local33.method4575((local384 + local115) / 2, 0, (local126 + local130) / 2); - local33.method4555(local386, arg10); - } - if (arg9 != 0) { - local33.method4554(arg9); - } - if (GlRenderer.enabled) { - @Pc(650) GlModel local650 = (GlModel) local33; - if (Static207.method3685(Static55.level, arg3 + local384, local126 + arg5) != arg11 || Static207.method3685(Static55.level, local115 + arg3, arg5 - -local130) != arg11) { - for (local162 = 0; local162 < local650.anInt5295; local162++) { - local650.anIntArray465[local162] += Static207.method3685(Static55.level, local650.anIntArray461[local162] + arg3, arg5 + local650.anIntArray466[local162]) - arg11; - } - local650.aClass5_1.aBoolean3 = false; - local650.aClass127_4.aBoolean235 = false; - } - } else { - @Pc(574) SoftwareModel local574 = (SoftwareModel) local33; - if (Static207.method3685(Static55.level, arg3 + local384, arg5 - -local126) != arg11 || arg11 != Static207.method3685(Static55.level, arg3 + local115, arg5 - -local130)) { - for (local162 = 0; local162 < local574.anInt5788; local162++) { - local574.anIntArray527[local162] += Static207.method3685(Static55.level, arg3 + local574.anIntArray528[local162], arg5 + local574.anIntArray531[local162]) - arg11; - } - local574.aBoolean305 = false; - } - } - return local33; - } - @OriginalMember(owner = "client!dc", name = "b", descriptor = "(Z)V") public static void method1050() { - @Pc(6) int local6 = Static57.aClass3_Sub15_Sub1_3.method2238(8); + @Pc(6) int local6 = Protocol.inboundBuffer.method2238(8); @Pc(20) int local20; if (Static267.anInt5774 > local6) { for (local20 = local6; local20 < Static267.anInt5774; local20++) { @@ -172,12 +40,12 @@ public final class Static41 { for (local20 = 0; local20 < local6; local20++) { @Pc(75) int local75 = Static105.anIntArray256[local20]; @Pc(79) Player local79 = Static159.players[local75]; - @Pc(84) int local84 = Static57.aClass3_Sub15_Sub1_3.method2238(1); + @Pc(84) int local84 = Protocol.inboundBuffer.method2238(1); if (local84 == 0) { Static105.anIntArray256[Static267.anInt5774++] = local75; local79.anInt3430 = Static83.loop; } else { - @Pc(107) int local107 = Static57.aClass3_Sub15_Sub1_3.method2238(2); + @Pc(107) int local107 = Protocol.inboundBuffer.method2238(2); if (local107 == 0) { Static105.anIntArray256[Static267.anInt5774++] = local75; local79.anInt3430 = Static83.loop; @@ -188,25 +56,25 @@ public final class Static41 { if (local107 == 1) { Static105.anIntArray256[Static267.anInt5774++] = local75; local79.anInt3430 = Static83.loop; - local153 = Static57.aClass3_Sub15_Sub1_3.method2238(3); + local153 = Protocol.inboundBuffer.method2238(3); local79.method2684(1, local153); - local163 = Static57.aClass3_Sub15_Sub1_3.method2238(1); + local163 = Protocol.inboundBuffer.method2238(1); if (local163 == 1) { Static44.anIntArray106[Static116.anInt2951++] = local75; } } else if (local107 == 2) { Static105.anIntArray256[Static267.anInt5774++] = local75; local79.anInt3430 = Static83.loop; - if (Static57.aClass3_Sub15_Sub1_3.method2238(1) == 1) { - local153 = Static57.aClass3_Sub15_Sub1_3.method2238(3); + if (Protocol.inboundBuffer.method2238(1) == 1) { + local153 = Protocol.inboundBuffer.method2238(3); local79.method2684(2, local153); - local163 = Static57.aClass3_Sub15_Sub1_3.method2238(3); + local163 = Protocol.inboundBuffer.method2238(3); local79.method2684(2, local163); } else { - local153 = Static57.aClass3_Sub15_Sub1_3.method2238(3); + local153 = Protocol.inboundBuffer.method2238(3); local79.method2684(0, local153); } - local153 = Static57.aClass3_Sub15_Sub1_3.method2238(1); + local153 = Protocol.inboundBuffer.method2238(1); if (local153 == 1) { Static44.anIntArray106[Static116.anInt2951++] = local75; } diff --git a/client/src/main/java/Static43.java b/client/src/main/java/Static43.java index 3780798..701e120 100644 --- a/client/src/main/java/Static43.java +++ b/client/src/main/java/Static43.java @@ -58,7 +58,7 @@ public final class Static43 { } @Pc(57) int local57 = (int) local9 >> 14 & 0x1F; @Pc(70) int local70 = (int) (local9 >>> 32) & Integer.MAX_VALUE; - @Pc(74) LocType local74 = Static271.get(local70); + @Pc(74) LocType local74 = LocTypeList.get(local70); if (local74.hasAreaSound()) { Static209.method3701(arg1, local74, arg0, arg2); } diff --git a/client/src/main/java/Static44.java b/client/src/main/java/Static44.java index fccdd9e..295f27a 100644 --- a/client/src/main/java/Static44.java +++ b/client/src/main/java/Static44.java @@ -14,26 +14,26 @@ public final class Static44 { public static final int[] anIntArray106 = new int[2048]; @OriginalMember(owner = "client!dh", name = "e", descriptor = "Lclient!na;") - public static final JagString aClass100_335 = Static28.parse("Number of player models in cache:"); + public static final JagString aClass100_335 = JagString.parse("Number of player models in cache:"); @OriginalMember(owner = "client!dh", name = "i", descriptor = "Lclient!na;") - public static final JagString aClass100_336 = Static28.parse(""); + public static final JagString aClass100_336 = JagString.parse(""); @OriginalMember(owner = "client!dh", name = "a", descriptor = "(Z)V") public static void method1146() { - Static6.outboundBuffer.offset = 0; + Protocol.outboundBuffer.offset = 0; Static5.anInt45 = -1; Static60.aBoolean108 = false; - Static223.anInt5028 = 0; + Protocol.length = 0; Static115.anInt2939 = 0; Static231.anInt5204 = 0; Static230.anInt5152 = -1; Static270.anInt5795 = 0; Static60.rebootTimer = 0; Static49.anInt1462 = -1; - Static57.aClass3_Sub15_Sub1_3.offset = 0; + Protocol.inboundBuffer.offset = 0; Static201.anInt1862 = 0; - Static164.anInt3985 = -1; + Protocol.opcode = -1; @Pc(35) int local35; for (local35 = 0; local35 < Static159.players.length; local35++) { if (Static159.players[local35] != null) { @@ -47,7 +47,7 @@ public final class Static44 { } Static102.method2073(); Static227.cameraType = 1; - Static196.setGameState(30); + client.setGameState(30); for (local35 = 0; local35 < 100; local35++) { Static186.aBooleanArray100[local35] = true; } @@ -70,7 +70,7 @@ public final class Static44 { local9.anInt5878 = arg0; Static119.aClass133_9.put(local9, (long) arg1); Static81.method1753(arg0); - @Pc(28) Component local28 = Static5.getComponent(arg1); + @Pc(28) Component local28 = InterfaceList.getComponent(arg1); if (local28 != null) { Static43.redraw(local28); } @@ -118,12 +118,4 @@ public final class Static44 { } } - @OriginalMember(owner = "client!dh", name = "a", descriptor = "(B)Lclient!uc;") - public static MouseWheel create() { - try { - return (MouseWheel) Class.forName("JavaMouseWheel").getDeclaredConstructor().newInstance(); - } catch (@Pc(15) Throwable local15) { - return null; - } - } } diff --git a/client/src/main/java/Static45.java b/client/src/main/java/Static45.java index 4310b69..397ac65 100644 --- a/client/src/main/java/Static45.java +++ b/client/src/main/java/Static45.java @@ -13,9 +13,6 @@ public final class Static45 { @OriginalMember(owner = "client!di", name = "H", descriptor = "Z") public static boolean aBoolean84 = false; - @OriginalMember(owner = "client!di", name = "I", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_6 = new SoftLruHashTable(32); - @OriginalMember(owner = "client!di", name = "a", descriptor = "([Lclient!mj;ZI)V") public static void method1169(@OriginalArg(0) CollisionMap[] collisionMaps, @OriginalArg(1) boolean underwater) { @Pc(10) int level; @@ -136,7 +133,7 @@ public final class Static45 { if (local178 < 104) { local194 = Static253.aByteArrayArrayArray16[local152][local178][local173] & 0xFF; if (local194 > 0) { - @Pc(693) FluType local693 = Static199.method3593(local194 - 1); + @Pc(693) FluType local693 = FluTypeList.get(local194 - 1); Static221.anIntArray376[local173] += local693.weightedHue; Static139.anIntArray325[local173] += local693.saturation; Static279.anIntArray568[local173] += local693.lightness; @@ -148,7 +145,7 @@ public final class Static45 { if (local194 >= 0) { local200 = Static253.aByteArrayArrayArray16[local152][local194][local173] & 0xFF; if (local200 > 0) { - @Pc(758) FluType local758 = Static199.method3593(local200 - 1); + @Pc(758) FluType local758 = FluTypeList.get(local200 - 1); Static221.anIntArray376[local173] -= local758.weightedHue; Static139.anIntArray325[local173] -= local758.saturation; Static279.anIntArray568[local173] -= local758.lightness; @@ -204,7 +201,7 @@ public final class Static45 { if (local178 == 0 && Static163.aByteArrayArrayArray11[local152][local168][local173] != 0) { local1067 = false; } - if (local194 > 0 && !Static256.method4395(local194 - 1).aBoolean312) { + if (local194 > 0 && !FloTypeList.method4395(local194 - 1).aBoolean312) { local1067 = false; } if (local1067 && local200 == local202 && local200 == local209 && local349 == local200) { @@ -231,7 +228,7 @@ public final class Static45 { local326 = local146[local168 + 1][local173 + 1]; if (local194 == 0) { Static176.method3305(local152, local168, local173, 0, 0, -1, local200, local202, local209, local349, Static87.method1814(local267, local234), Static87.method1814(local273, local234), Static87.method1814(local326, local234), Static87.method1814(local332, local234), 0, 0, 0, 0, local254, 0); - if (GlRenderer.enabled && local152 > 0 && local234 != -1 && Static199.method3593(local178 - 1).aBoolean198) { + if (GlRenderer.enabled && local152 > 0 && local234 != -1 && FluTypeList.get(local178 - 1).aBoolean198) { Static242.method4197(0, 0, true, false, local168, local173, local200 - Static83.activeTileHeightMap[0][local168][local173], -Static83.activeTileHeightMap[0][local168 + 1][local173] + local202, local209 - Static83.activeTileHeightMap[0][local168 + 1][local173 + 1], local349 - Static83.activeTileHeightMap[0][local168][local173 + 1]); } if (GlRenderer.enabled && !underwater && Static62.anIntArrayArray11 != null && local152 == 0) { @@ -240,7 +237,7 @@ public final class Static45 { if ((local322 != local168 || local173 != local1794) && local322 >= 0 && local322 < 104 && local1794 >= 0 && local1794 < 104) { @Pc(1834) int local1834 = Static240.aByteArrayArrayArray14[local152][local322][local1794] & 0xFF; if (local1834 != 0) { - @Pc(1842) FloType local1842 = Static256.method4395(local1834 - 1); + @Pc(1842) FloType local1842 = FloTypeList.method4395(local1834 - 1); if (local1842.texture != -1 && Rasteriser.textureProvider.method3237(local1842.texture) == 4) { Static62.anIntArrayArray11[local168][local173] = local1842.anInt5889 + (local1842.anInt5898 << 24); continue label771; @@ -253,7 +250,7 @@ public final class Static45 { } else { local322 = Static163.aByteArrayArrayArray11[local152][local168][local173] + 1; @Pc(1242) byte local1242 = Static4.aByteArrayArrayArray1[local152][local168][local173]; - @Pc(1248) FloType local1248 = Static256.method4395(local194 - 1); + @Pc(1248) FloType local1248 = FloTypeList.method4395(local194 - 1); @Pc(1301) int local1301; @Pc(1353) int local1353; @Pc(1288) int local1288; @@ -266,7 +263,7 @@ public final class Static45 { if ((local168 != local1288 || local1301 != local173) && local1288 >= 0 && local1288 < 104 && local1301 >= 0 && local1301 < 104) { local1353 = Static240.aByteArrayArrayArray14[local152][local1288][local1301] & 0xFF; if (local1353 != 0) { - @Pc(1366) FloType local1366 = Static256.method4395(local1353 - 1); + @Pc(1366) FloType local1366 = FloTypeList.method4395(local1353 - 1); if (local1366.texture != -1 && Rasteriser.textureProvider.method3237(local1366.texture) == 4) { Static62.anIntArrayArray11[local168][local173] = local1366.anInt5889 + (local1366.anInt5898 << 24); break label737; @@ -313,7 +310,7 @@ public final class Static45 { } Static176.method3305(local152, local168, local173, local322, local1242, local1288, local200, local202, local209, local349, Static87.method1814(local267, local234), Static87.method1814(local273, local234), Static87.method1814(local326, local234), Static87.method1814(local332, local234), Static230.method3949(local1301, local267), Static230.method3949(local1301, local273), Static230.method3949(local1301, local326), Static230.method3949(local1301, local332), local254, local1353); if (GlRenderer.enabled && local152 > 0) { - Static242.method4197(local322, local1242, local1301 == -2 || !local1248.aBoolean311, local234 == -1 || !Static199.method3593(local178 - 1).aBoolean198, local168, local173, local200 - Static83.activeTileHeightMap[0][local168][local173], local202 - Static83.activeTileHeightMap[0][local168 + 1][local173], local209 - Static83.activeTileHeightMap[0][local168 + 1][local173 + 1], -Static83.activeTileHeightMap[0][local168][local173 + 1] + local349); + Static242.method4197(local322, local1242, local1301 == -2 || !local1248.aBoolean311, local234 == -1 || !FluTypeList.get(local178 - 1).aBoolean198, local168, local173, local200 - Static83.activeTileHeightMap[0][local168][local173], local202 - Static83.activeTileHeightMap[0][local168 + 1][local173], local209 - Static83.activeTileHeightMap[0][local168 + 1][local173 + 1], -Static83.activeTileHeightMap[0][local168][local173 + 1] + local349); } } } @@ -507,7 +504,7 @@ public final class Static45 { Static259.anIntArray514[0] = arg2; @Pc(71) int local71 = local51 + 1; Static84.anIntArray209[0] = arg9; - @Pc(78) int[][] local78 = Static148.collisionMaps[Static55.level].anIntArrayArray30; + @Pc(78) int[][] local78 = PathFinder.collisionMaps[Static55.level].anIntArrayArray30; @Pc(198) int local198; while (local71 != local64) { local10 = Static84.anIntArray209[local64]; @@ -518,16 +515,16 @@ public final class Static45 { break; } if (arg8 != 0) { - if ((arg8 < 5 || arg8 == 10) && Static148.collisionMaps[Static55.level].method3042(arg3, local3, local10, arg0, arg8 - 1, 1, arg6)) { + if ((arg8 < 5 || arg8 == 10) && PathFinder.collisionMaps[Static55.level].method3042(arg3, local3, local10, arg0, arg8 - 1, 1, arg6)) { local53 = true; break; } - if (arg8 < 10 && Static148.collisionMaps[Static55.level].method3046(arg3, arg8 - 1, arg0, local10, 1, arg6, local3)) { + if (arg8 < 10 && PathFinder.collisionMaps[Static55.level].method3046(arg3, arg8 - 1, arg0, local10, 1, arg6, local3)) { local53 = true; break; } } - if (arg10 != 0 && arg5 != 0 && Static148.collisionMaps[Static55.level].method3052(arg0, local10, local3, 1, arg10, arg1, arg3, arg5)) { + if (arg10 != 0 && arg5 != 0 && PathFinder.collisionMaps[Static55.level].method3052(arg0, local10, local3, 1, arg10, arg1, arg3, arg5)) { local53 = true; break; } @@ -663,8 +660,4 @@ public final class Static45 { } } - @OriginalMember(owner = "client!di", name = "d", descriptor = "(I)V") - public static void method1172() { - Static262.aClass99_34.method3103(); - } } diff --git a/client/src/main/java/Static49.java b/client/src/main/java/Static49.java index e72316a..fb5e5d4 100644 --- a/client/src/main/java/Static49.java +++ b/client/src/main/java/Static49.java @@ -5,13 +5,13 @@ import org.openrs2.deob.annotation.Pc; public final class Static49 { @OriginalMember(owner = "client!dm", name = "j", descriptor = "Lclient!na;") - public static final JagString aClass100_351 = Static28.parse(" "); + public static final JagString aClass100_351 = JagString.parse(" "); @OriginalMember(owner = "client!dm", name = "m", descriptor = "I") public static int anInt1459 = 0; @OriginalMember(owner = "client!dm", name = "n", descriptor = "Lclient!na;") - public static final JagString PERCENT_SIGN = Static28.parse("(U"); + public static final JagString PERCENT_SIGN = JagString.parse("(U"); @OriginalMember(owner = "client!dm", name = "q", descriptor = "I") public static int anInt1462 = 0; @@ -64,7 +64,7 @@ public final class Static49 { } while (local68 <= 0); } while (local72 >= 103); } while (local68 >= 103); - local95 = Static271.get(local17); + local95 = LocTypeList.get(local17); } while (local78 == 22 && !Preferences.showGroundDecorations && local95.anInt4429 == 0 && local95.anInt4435 != 1 && !local95.aBoolean206); local39 = true; if (!local95.isReady()) { @@ -77,8 +77,8 @@ public final class Static49 { @OriginalMember(owner = "client!dm", name = "a", descriptor = "(B)V") public static void method1202() { - Static57.aClass3_Sub15_Sub1_3.method2233(); - @Pc(13) int local13 = Static57.aClass3_Sub15_Sub1_3.method2238(8); + Protocol.inboundBuffer.method2233(); + @Pc(13) int local13 = Protocol.inboundBuffer.method2238(8); @Pc(22) int local22; if (Static272.anInt5214 > local13) { for (local22 = local13; local22 < Static272.anInt5214; local22++) { @@ -92,12 +92,12 @@ public final class Static49 { for (local22 = 0; local22 < local13; local22++) { @Pc(61) int local61 = Static33.anIntArray79[local22]; @Pc(65) Npc local65 = Static175.npcs[local61]; - @Pc(70) int local70 = Static57.aClass3_Sub15_Sub1_3.method2238(1); + @Pc(70) int local70 = Protocol.inboundBuffer.method2238(1); if (local70 == 0) { Static33.anIntArray79[Static272.anInt5214++] = local61; local65.anInt3430 = Static83.loop; } else { - @Pc(92) int local92 = Static57.aClass3_Sub15_Sub1_3.method2238(2); + @Pc(92) int local92 = Protocol.inboundBuffer.method2238(2); if (local92 == 0) { Static33.anIntArray79[Static272.anInt5214++] = local61; local65.anInt3430 = Static83.loop; @@ -108,25 +108,25 @@ public final class Static49 { if (local92 == 1) { Static33.anIntArray79[Static272.anInt5214++] = local61; local65.anInt3430 = Static83.loop; - local139 = Static57.aClass3_Sub15_Sub1_3.method2238(3); + local139 = Protocol.inboundBuffer.method2238(3); local65.method2684(1, local139); - local149 = Static57.aClass3_Sub15_Sub1_3.method2238(1); + local149 = Protocol.inboundBuffer.method2238(1); if (local149 == 1) { Static44.anIntArray106[Static116.anInt2951++] = local61; } } else if (local92 == 2) { Static33.anIntArray79[Static272.anInt5214++] = local61; local65.anInt3430 = Static83.loop; - if (Static57.aClass3_Sub15_Sub1_3.method2238(1) == 1) { - local139 = Static57.aClass3_Sub15_Sub1_3.method2238(3); + if (Protocol.inboundBuffer.method2238(1) == 1) { + local139 = Protocol.inboundBuffer.method2238(3); local65.method2684(2, local139); - local149 = Static57.aClass3_Sub15_Sub1_3.method2238(3); + local149 = Protocol.inboundBuffer.method2238(3); local65.method2684(2, local149); } else { - local139 = Static57.aClass3_Sub15_Sub1_3.method2238(3); + local139 = Protocol.inboundBuffer.method2238(3); local65.method2684(0, local139); } - local139 = Static57.aClass3_Sub15_Sub1_3.method2238(1); + local139 = Protocol.inboundBuffer.method2238(1); if (local139 == 1) { Static44.anIntArray106[Static116.anInt2951++] = local61; } @@ -187,14 +187,4 @@ public final class Static49 { Static133.method4012(Static50.anIntArray132[0], Static50.anIntArray132[2], Static50.anIntArray132[1], Static50.anIntArray132[3]); } - @OriginalMember(owner = "client!dm", name = "d", descriptor = "(I)V") - public static void method1208() { - Static224.aBoolean247 = false; - Static231.anInt5202 = 0; - Static266.reply = -3; - Static92.anInt2430 = 0; - Static184.loginStep = 1; - Static276.anInt5816 = 0; - Static204.anInt4765 = -1; - } } diff --git a/client/src/main/java/Static5.java b/client/src/main/java/Static5.java index 9d5829e..4f7ec06 100644 --- a/client/src/main/java/Static5.java +++ b/client/src/main/java/Static5.java @@ -4,51 +4,28 @@ import org.openrs2.deob.annotation.Pc; public final class Static5 { - @OriginalMember(owner = "client!af", name = "a", descriptor = "Lclient!ve;") - public static Js5 aClass153_1; - @OriginalMember(owner = "client!af", name = "d", descriptor = "I") public static int anInt40; - @OriginalMember(owner = "client!af", name = "c", descriptor = "I") - public static int anInt39 = -1; - - @OriginalMember(owner = "client!af", name = "k", descriptor = "I") + @OriginalMember(owner = "client!af", name = "k", descriptor = "I") public static int anInt45 = 0; @OriginalMember(owner = "client!af", name = "l", descriptor = "[S") public static final short[] aShortArray2 = new short[] { 30, 6, 31, 29, 10, 44, 37, 57 }; @OriginalMember(owner = "client!af", name = "m", descriptor = "Lclient!na;") - public static final JagString aClass100_10 = Static28.parse("
"); + public static final JagString aClass100_10 = JagString.parse("
"); @OriginalMember(owner = "client!af", name = "a", descriptor = "(ILjava/lang/String;)V") public static void method31(@OriginalArg(1) String arg0) { System.out.println("Error: " + Static40.method1014("%0a", "\n", arg0)); } - @OriginalMember(owner = "client!af", name = "a", descriptor = "(BI)Lclient!be;") - public static Component getComponent(@OriginalArg(1) int id) { - @Pc(7) int interfaceId = id >> 16; - @Pc(18) int componentId = id & 0xFFFF; - if (Static241.components[interfaceId] == null || Static241.components[interfaceId][componentId] == null) { - @Pc(33) boolean success = Static245.load(interfaceId); - if (!success) { - return null; - } - // todo: this should not be necessary, data/server-related? - if (Static241.components.length <= interfaceId || Static241.components[interfaceId].length <= componentId) { - return null; - } - } - return Static241.components[interfaceId][componentId]; - } - @OriginalMember(owner = "client!af", name = "b", descriptor = "(B)V") public static void method34() { - Static116.clear(false); + WorldMap.clear(false); System.gc(); - Static196.setGameState(25); + client.setGameState(25); } @OriginalMember(owner = "client!af", name = "a", descriptor = "(IIIIIILclient!th;IJ)Z") diff --git a/client/src/main/java/Static50.java b/client/src/main/java/Static50.java index aeb95cf..166911e 100644 --- a/client/src/main/java/Static50.java +++ b/client/src/main/java/Static50.java @@ -15,11 +15,11 @@ public final class Static50 { public static int[] anIntArray134 = new int[2]; @OriginalMember(owner = "client!e", name = "Ac", descriptor = "Lclient!na;") - public static final JagString aClass100_362 = Static28.parse("Forced tweening ENABLED(Q"); + public static final JagString aClass100_362 = JagString.parse("Forced tweening ENABLED(Q"); @OriginalMember(owner = "client!e", name = "Dc", descriptor = "Lclient!na;") - public static final JagString aClass100_363 = Static28.parse("_labels"); + public static final JagString aClass100_363 = JagString.parse("_labels"); @OriginalMember(owner = "client!e", name = "Tc", descriptor = "Lclient!na;") - public static final JagString aClass100_365 = Static28.parse("www)2wtqa"); + public static final JagString aClass100_365 = JagString.parse("www)2wtqa"); } diff --git a/client/src/main/java/Static52.java b/client/src/main/java/Static52.java index d88ec3b..92bfa5f 100644 --- a/client/src/main/java/Static52.java +++ b/client/src/main/java/Static52.java @@ -32,12 +32,6 @@ public final class Static52 { } } - @OriginalMember(owner = "client!eb", name = "d", descriptor = "(I)V") - public static void method1287() { - Static241.components = new Component[Static202.aClass153_84.method4483()][]; - Static223.aBooleanArray115 = new boolean[Static202.aClass153_84.method4483()]; - } - @OriginalMember(owner = "client!eb", name = "b", descriptor = "(II)Lclient!na;") public static JagString method1288(@OriginalArg(1) int arg0) { if (arg0 < 100000) { diff --git a/client/src/main/java/Static53.java b/client/src/main/java/Static53.java index 517893c..88a5401 100644 --- a/client/src/main/java/Static53.java +++ b/client/src/main/java/Static53.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static53 { - @OriginalMember(owner = "client!ec", name = "z", descriptor = "I") - public static int anInt1716; - - @OriginalMember(owner = "client!ec", name = "d", descriptor = "Lclient!gn;") + @OriginalMember(owner = "client!ec", name = "d", descriptor = "Lclient!gn;") public static final LruHashTable aClass54_5 = new LruHashTable(16); @OriginalMember(owner = "client!ec", name = "l", descriptor = "I") @@ -16,13 +13,6 @@ public final class Static53 { @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 } }; - @OriginalMember(owner = "client!ec", name = "a", descriptor = "(II)V") - public static void method1289() { - Static190.aClass99_26.method3102(50); - Static124.aClass99_17.method3102(50); - Static87.aClass99_12.method3102(50); - } - @OriginalMember(owner = "client!ec", name = "a", descriptor = "([[IZILclient!hg;[IIIIZ[[FZI[[FIIIZ[[I[[FBI[Z)V") public static void method1291(@OriginalArg(0) int[][] arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) GlTile arg3, @OriginalArg(4) int[] arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) boolean arg8, @OriginalArg(9) float[][] arg9, @OriginalArg(10) boolean arg10, @OriginalArg(12) float[][] arg11, @OriginalArg(13) int arg12, @OriginalArg(14) int arg13, @OriginalArg(15) int arg14, @OriginalArg(16) boolean arg15, @OriginalArg(17) int[][] arg16, @OriginalArg(18) float[][] arg17, @OriginalArg(19) byte arg18, @OriginalArg(20) int arg19, @OriginalArg(21) boolean[] arg20) { @Pc(11) int local11 = (arg2 << 8) + (arg1 ? 255 : 0); @@ -87,8 +77,4 @@ public final class Static53 { Static43.redraw(local19); } - @OriginalMember(owner = "client!ec", name = "b", descriptor = "(I)V") - public static void method1295() { - Static125.aClass99_19.clear(); - } } diff --git a/client/src/main/java/Static54.java b/client/src/main/java/Static54.java index be88141..00f3f54 100644 --- a/client/src/main/java/Static54.java +++ b/client/src/main/java/Static54.java @@ -5,21 +5,21 @@ import org.openrs2.deob.annotation.Pc; public final class Static54 { @OriginalMember(owner = "client!ed", name = "D", descriptor = "Lclient!na;") - public static final JagString aClass100_374 = Static28.parse("details"); + public static final JagString aClass100_374 = JagString.parse("details"); @OriginalMember(owner = "client!ed", name = "H", descriptor = "Lclient!na;") - public static final JagString aClass100_375 = Static28.parse("<)4col> x"); + public static final JagString aClass100_375 = JagString.parse("<)4col> x"); @OriginalMember(owner = "client!ed", name = "a", descriptor = "(III)V") public static void method1304(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - if (Static245.load(arg1)) { - Static2.method7(Static241.components[arg1], arg0); + if (InterfaceList.load(arg1)) { + Static2.method7(InterfaceList.components[arg1], arg0); } } @OriginalMember(owner = "client!ed", name = "a", descriptor = "(IBIILclient!be;)V") public static void method1305(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Component arg3) { - Static107.loop(); + client.audioLoop(); if (GlRenderer.enabled) { Static46.method1187(arg2, arg1, arg2 + arg3.anInt445, arg1 + arg3.anInt459); } else { @@ -85,7 +85,7 @@ public final class Static54 { for (local146 = 0; local146 < Static251.anInt5454; local146++) { 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]); + @Pc(382) LocType local382 = LocTypeList.get(Static199.anIntArray417[local146]); if (local382.multiLocs != null) { local382 = local382.getMultiLoc(); if (local382 == null || local382.mapElement == -1) { @@ -245,11 +245,6 @@ public final class Static54 { method1307(arg0, arg1, arg2, local14 + 1); } - @OriginalMember(owner = "client!ed", name = "c", descriptor = "(I)V") - public static void method1308() { - Static83.aClass99_3.clear(); - } - @OriginalMember(owner = "client!ed", name = "a", descriptor = "(IIII)I") public static int method1309(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { if (arg0 > 243) { @@ -266,31 +261,31 @@ public final class Static54 { @OriginalMember(owner = "client!ed", name = "b", descriptor = "(II)Lclient!ba;") public static World getWorld(@OriginalArg(1) int arg0) { - return Static61.aBoolean109 && arg0 >= Static19.anInt636 && arg0 <= Static171.anInt4157 ? Static196.aClass10_Sub1Array2[arg0 - Static19.anInt636] : null; + return WorldList.loaded && arg0 >= WorldList.minId && arg0 <= WorldList.maxId ? WorldList.worlds[arg0 - WorldList.minId] : null; } @OriginalMember(owner = "client!ed", name = "d", descriptor = "(B)V") public static void loop() { - for (@Pc(5) int local5 = 0; local5 < Static189.anInt4451; local5++) { - @Pc(12) int local12 = Static164.anIntArray362[local5]--; - if (Static164.anIntArray362[local5] >= -10) { - @Pc(79) SynthSound local79 = Static173.aClass138Array1[local5]; + for (@Pc(5) int local5 = 0; local5 < SoundPlayer.anInt4451; local5++) { + @Pc(12) int local12 = SoundPlayer.anIntArray362[local5]--; + if (SoundPlayer.anIntArray362[local5] >= -10) { + @Pc(79) SynthSound local79 = SoundPlayer.aClass138Array1[local5]; if (local79 == null) { - local79 = SynthSound.create(Static248.js5Archive4, Static200.anIntArray421[local5], 0); + local79 = SynthSound.create(client.js5Archive4, SoundPlayer.anIntArray421[local5], 0); if (local79 == null) { continue; } - Static164.anIntArray362[local5] += local79.method3990(); - Static173.aClass138Array1[local5] = local79; + SoundPlayer.anIntArray362[local5] += local79.method3990(); + SoundPlayer.aClass138Array1[local5] = local79; } - if (Static164.anIntArray362[local5] < 0) { + if (SoundPlayer.anIntArray362[local5] < 0) { @Pc(209) int local209; - if (Static26.anIntArray68[local5] == 0) { + if (SoundPlayer.anIntArray68[local5] == 0) { 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(125) int local125 = (SoundPlayer.anIntArray68[local5] & 0xFF) * 128; + @Pc(133) int local133 = SoundPlayer.anIntArray68[local5] >> 8 & 0xFF; + @Pc(141) int local141 = SoundPlayer.anIntArray68[local5] >> 16 & 0xFF; @Pc(151) int local151 = local133 * 128 + 64 - PlayerList.self.zFine; if (local151 < 0) { local151 = -local151; @@ -301,7 +296,7 @@ public final class Static54 { } @Pc(180) int local180 = local167 + local151 - 128; if (local125 < local180) { - Static164.anIntArray362[local5] = -100; + SoundPlayer.anIntArray362[local5] = -100; continue; } if (local180 < 0) { @@ -310,34 +305,34 @@ public final class Static54 { local209 = Preferences.ambientSoundsVolume * (local125 - local180) / local125; } if (local209 > 0) { - @Pc(223) PcmSound local223 = local79.method3989().method2648(Static56.resampler); + @Pc(223) PcmSound local223 = local79.method3989().method2648(client.resampler); @Pc(228) SoundPcmStream local228 = Static284.method404(local223, local209); - local228.method396(Static276.anIntArray563[local5] - 1); - Static204.soundStream.method1343(local228); + local228.method396(SoundPlayer.anIntArray563[local5] - 1); + client.soundStream.method1343(local228); } - Static164.anIntArray362[local5] = -100; + SoundPlayer.anIntArray362[local5] = -100; } } else { - Static189.anInt4451--; - for (@Pc(28) int local28 = local5; local28 < Static189.anInt4451; local28++) { - Static200.anIntArray421[local28] = Static200.anIntArray421[local28 + 1]; - Static173.aClass138Array1[local28] = Static173.aClass138Array1[local28 + 1]; - Static276.anIntArray563[local28] = Static276.anIntArray563[local28 + 1]; - Static164.anIntArray362[local28] = Static164.anIntArray362[local28 + 1]; - Static26.anIntArray68[local28] = Static26.anIntArray68[local28 + 1]; + SoundPlayer.anInt4451--; + for (@Pc(28) int local28 = local5; local28 < SoundPlayer.anInt4451; local28++) { + SoundPlayer.anIntArray421[local28] = SoundPlayer.anIntArray421[local28 + 1]; + SoundPlayer.aClass138Array1[local28] = SoundPlayer.aClass138Array1[local28 + 1]; + SoundPlayer.anIntArray563[local28] = SoundPlayer.anIntArray563[local28 + 1]; + SoundPlayer.anIntArray362[local28] = SoundPlayer.anIntArray362[local28 + 1]; + SoundPlayer.anIntArray68[local28] = SoundPlayer.anIntArray68[local28 + 1]; } local5--; } } if (MidiPlayer.jingle && !Static136.method2655()) { - if (Preferences.musicVolume != 0 && Static221.anInt4363 != -1) { - Static122.method2410(Static130.js5Archive6, Static221.anInt4363, Preferences.musicVolume); + if (Preferences.musicVolume != 0 && MusicPlayer.groupId != -1) { + Static122.method2410(client.js5Archive6, MusicPlayer.groupId, Preferences.musicVolume); } 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; + } else if (Preferences.musicVolume != 0 && MusicPlayer.groupId != -1 && !Static136.method2655()) { + Protocol.outboundBuffer.p1isaac(137); + Protocol.outboundBuffer.p4(MusicPlayer.groupId); + MusicPlayer.groupId = -1; } } } diff --git a/client/src/main/java/Static55.java b/client/src/main/java/Static55.java index 52c7d56..49adef9 100644 --- a/client/src/main/java/Static55.java +++ b/client/src/main/java/Static55.java @@ -8,11 +8,8 @@ public final class Static55 { @OriginalMember(owner = "client!ee", name = "c", descriptor = "I") public static int anInt1736; - @OriginalMember(owner = "client!ee", name = "g", descriptor = "I") - public static int alternatePort; - @OriginalMember(owner = "client!ee", name = "a", descriptor = "Lclient!na;") - public static final JagString aClass100_376 = Static28.parse(" GMT"); + public static final JagString aClass100_376 = JagString.parse(" GMT"); @OriginalMember(owner = "client!ee", name = "f", descriptor = "S") public static short aShort12 = 1; diff --git a/client/src/main/java/Static56.java b/client/src/main/java/Static56.java index 5a3b563..7604078 100644 --- a/client/src/main/java/Static56.java +++ b/client/src/main/java/Static56.java @@ -5,27 +5,18 @@ public final class Static56 { @OriginalMember(owner = "client!ef", name = "j", descriptor = "Lclient!mm;") public static SoftwareSprite aClass3_Sub2_Sub1_Sub1_1; - @OriginalMember(owner = "client!ef", name = "p", descriptor = "Lclient!vj;") - public static Resampler resampler; - - @OriginalMember(owner = "client!ef", name = "a", descriptor = "[I") + @OriginalMember(owner = "client!ef", name = "a", descriptor = "[I") public static final int[] anIntArray141 = new int[] { 768, 1024, 1280, 512, 1536, 256, 0, 1792 }; - @OriginalMember(owner = "client!ef", name = "b", descriptor = "Lclient!n;") - public static final SoftLruHashTable models = new SoftLruHashTable(30); - - @OriginalMember(owner = "client!ef", name = "c", descriptor = "[I") + @OriginalMember(owner = "client!ef", name = "c", descriptor = "[I") public static final int[] anIntArray142 = new int[500]; @OriginalMember(owner = "client!ef", name = "f", descriptor = "Lclient!na;") - public static final JagString aClass100_379 = Static28.parse(":duelstake:"); + public static final JagString aClass100_379 = JagString.parse(":duelstake:"); @OriginalMember(owner = "client!ef", name = "g", descriptor = "I") public static int anInt1742 = -1; - @OriginalMember(owner = "client!ef", name = "h", descriptor = "Lclient!na;") - public static final JagString aClass100_380 = Static28.parse("unzap"); - @OriginalMember(owner = "client!ef", name = "i", descriptor = "I") public static double pitchAccel = 0; diff --git a/client/src/main/java/Static57.java b/client/src/main/java/Static57.java index 9935da0..badd284 100644 --- a/client/src/main/java/Static57.java +++ b/client/src/main/java/Static57.java @@ -9,19 +9,13 @@ public final class Static57 { @OriginalMember(owner = "client!eg", name = "t", descriptor = "I") public static int anInt1757; - @OriginalMember(owner = "client!eg", name = "e", descriptor = "Lclient!i;") - public static final Packet aClass3_Sub15_Sub1_3 = new Packet(65536); - - @OriginalMember(owner = "client!eg", name = "v", descriptor = "I") - public static int anInt1758 = 0; - @OriginalMember(owner = "client!eg", name = "w", descriptor = "I") public static volatile int anInt1759 = 0; @OriginalMember(owner = "client!eg", name = "a", descriptor = "(IIIIIIII)V") public static void method1320(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) { - if (Static245.load(arg4)) { - Static36.method946(Static241.components[arg4], -1, arg5, arg1, arg3, arg6, arg0, arg2); + if (InterfaceList.load(arg4)) { + Static36.method946(InterfaceList.components[arg4], -1, arg5, arg1, arg3, arg6, arg0, arg2); } } } diff --git a/client/src/main/java/Static58.java b/client/src/main/java/Static58.java index 5f0aec1..aff5889 100644 --- a/client/src/main/java/Static58.java +++ b/client/src/main/java/Static58.java @@ -4,34 +4,9 @@ import org.openrs2.deob.annotation.Pc; public final class Static58 { - @OriginalMember(owner = "client!eh", name = "f", descriptor = "Lclient!ve;") - public static Js5 aClass153_28; - - @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") - public static void init() { - @Pc(8) int[] local8 = new int[Static170.anInt3245]; - @Pc(10) int local10 = 0; - @Pc(12) int local12; - for (local12 = 0; local12 < Static170.anInt3245; local12++) { - @Pc(19) ObjType local19 = Static71.get(local12); - if (local19.manWear1 >= 0 || local19.womanWear1 >= 0) { - local8[local10++] = local12; - } - } - Static234.anIntArray455 = new int[local10]; - for (local12 = 0; local12 < local10; local12++) { - Static234.anIntArray455[local12] = local8[local12]; - } - } - - @OriginalMember(owner = "client!eh", name = "a", descriptor = "(Lclient!ve;I)V") - public static void init(@OriginalArg(0) Js5 arg0) { - Static23.aClass153_11 = arg0; - } - @OriginalMember(owner = "client!eh", name = "a", descriptor = "(I[[I[[FI[[FIBIIBZBI[[FILclient!hg;)V") public static void method1324(@OriginalArg(0) int arg0, @OriginalArg(1) int[][] arg1, @OriginalArg(2) float[][] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) int arg5, @OriginalArg(6) byte arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(10) boolean arg9, @OriginalArg(11) byte arg10, @OriginalArg(12) int arg11, @OriginalArg(13) float[][] arg12, @OriginalArg(14) int arg13, @OriginalArg(15) GlTile arg14) { @Pc(11) int local11 = (arg0 << 8) + 255; diff --git a/client/src/main/java/Static59.java b/client/src/main/java/Static59.java index 8d480dd..92cb5d3 100644 --- a/client/src/main/java/Static59.java +++ b/client/src/main/java/Static59.java @@ -43,27 +43,14 @@ public final class Static59 { @OriginalMember(owner = "client!ej", name = "i", descriptor = "(I)V") public static void method1373() { - Static6.outboundBuffer.p1isaac(243); - Static6.outboundBuffer.p1(Static144.getWindowMode()); - Static6.outboundBuffer.p2(GameShell.canvasWidth); - Static6.outboundBuffer.p2(GameShell.canvasHeight); - Static6.outboundBuffer.p1(Preferences.antiAliasingMode); + Protocol.outboundBuffer.p1isaac(243); + Protocol.outboundBuffer.p1(Static144.getWindowMode()); + Protocol.outboundBuffer.p2(GameShell.canvasWidth); + Protocol.outboundBuffer.p2(GameShell.canvasHeight); + Protocol.outboundBuffer.p1(Preferences.antiAliasingMode); } - @OriginalMember(owner = "client!ej", name = "a", descriptor = "(Lclient!ve;ILclient!ve;Lclient!of;)V") - public static void init(@OriginalArg(0) Js5 arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) QuickChatCommandDecoder arg2) { - Static262.aClass153_108 = arg0; - Static107.anInterface3_1 = arg2; - Static238.aClass153_96 = arg1; - if (Static238.aClass153_96 != null) { - Static144.anInt3490 = Static238.aClass153_96.method4504(1); - } - if (Static262.aClass153_108 != null) { - Static34.anInt1047 = Static262.aClass153_108.method4504(1); - } - } - - @OriginalMember(owner = "client!ej", name = "a", descriptor = "(IZIJ)Lclient!na;") + @OriginalMember(owner = "client!ej", name = "a", descriptor = "(IZIJ)Lclient!na;") public static JagString method1376(@OriginalArg(3) long arg0) { @Pc(35) long local35 = arg0 / (long) 10; @Pc(37) int local37 = 1; diff --git a/client/src/main/java/Static6.java b/client/src/main/java/Static6.java index 97f6109..cf2e82b 100644 --- a/client/src/main/java/Static6.java +++ b/client/src/main/java/Static6.java @@ -4,14 +4,11 @@ import org.openrs2.deob.annotation.Pc; public final class Static6 { - @OriginalMember(owner = "client!ag", name = "P", descriptor = "Lclient!i;") - public static final Packet outboundBuffer = new Packet(5000); - - @OriginalMember(owner = "client!ag", name = "ab", descriptor = "Lclient!na;") - public static final JagString aClass100_17 = Static28.parse("0"); + @OriginalMember(owner = "client!ag", name = "ab", descriptor = "Lclient!na;") + public static final JagString aClass100_17 = JagString.parse("0"); @OriginalMember(owner = "client!ag", name = "bb", descriptor = "Lclient!na;") - public static final JagString aClass100_18 = Static28.parse(""); + public static final JagString aClass100_18 = JagString.parse(""); @OriginalMember(owner = "client!ag", name = "cb", descriptor = "[Lclient!cl;") public static final AnimFrameset[] aClass3_Sub2_Sub7Array1 = new AnimFrameset[14]; @@ -20,7 +17,7 @@ public final class Static6 { public static void method84() { Static65.method1500(); for (@Pc(9) int local9 = 0; local9 < 4; local9++) { - Static148.collisionMaps[local9].resetFlags(); + PathFinder.collisionMaps[local9].resetFlags(); } System.gc(); } @@ -50,8 +47,8 @@ public final class Static6 { @OriginalMember(owner = "client!ag", name = "a", descriptor = "(IIIIIIIII)V") public static void method86(@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) { - if (Static245.load(arg0)) { - Static87.method1809(arg1, arg7, arg3, Static241.components[arg0], arg2, -1, arg6, arg5, arg4); + if (InterfaceList.load(arg0)) { + Static87.method1809(arg1, arg7, arg3, InterfaceList.components[arg0], arg2, -1, arg6, arg5, arg4); } else if (arg4 == -1) { for (@Pc(27) int local27 = 0; local27 < 100; local27++) { Static186.aBooleanArray100[local27] = true; diff --git a/client/src/main/java/Static60.java b/client/src/main/java/Static60.java index 929c635..ac23649 100644 --- a/client/src/main/java/Static60.java +++ b/client/src/main/java/Static60.java @@ -7,10 +7,7 @@ public final class Static60 { @OriginalMember(owner = "client!em", name = "t", descriptor = "[[[I") public static int[][][] anIntArrayArrayArray6; - @OriginalMember(owner = "client!em", name = "v", descriptor = "Ljava/lang/String;") - public static String hostname; - - @OriginalMember(owner = "client!em", name = "w", descriptor = "I") + @OriginalMember(owner = "client!em", name = "w", descriptor = "I") public static int anInt1892; @OriginalMember(owner = "client!em", name = "x", descriptor = "Lclient!cj;") @@ -20,7 +17,7 @@ public final class Static60 { public static int gregorianDateSeed; @OriginalMember(owner = "client!em", name = "u", descriptor = "Lclient!na;") - public static final JagString aClass100_420 = Static28.parse(")1o"); + public static final JagString aClass100_420 = JagString.parse(")1o"); @OriginalMember(owner = "client!em", name = "y", descriptor = "I") public static int clickY = 0; diff --git a/client/src/main/java/Static61.java b/client/src/main/java/Static61.java index 7a77d5b..bb41899 100644 --- a/client/src/main/java/Static61.java +++ b/client/src/main/java/Static61.java @@ -8,21 +8,18 @@ public final class Static61 { public static float aFloat7; @OriginalMember(owner = "client!en", name = "e", descriptor = "Lclient!na;") - public static final JagString aClass100_422 = Static28.parse("::fpsoff"); + public static final JagString aClass100_422 = JagString.parse("::fpsoff"); @OriginalMember(owner = "client!en", name = "h", descriptor = "Lclient!na;") - public static final JagString aClass100_423 = Static28.parse(":chalreq:"); + public static final JagString aClass100_423 = JagString.parse(":chalreq:"); @OriginalMember(owner = "client!en", name = "t", descriptor = "[I") public static final int[] anIntArray148 = new int[14]; @OriginalMember(owner = "client!en", name = "x", descriptor = "Lclient!na;") - public static final JagString aClass100_424 = Static28.parse("http:)4)4"); + public static final JagString aClass100_424 = JagString.parse("http:)4)4"); - @OriginalMember(owner = "client!en", name = "A", descriptor = "Z") - public static boolean aBoolean109 = false; - - @OriginalMember(owner = "client!en", name = "a", descriptor = "(IIIB)V") + @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 = 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(); diff --git a/client/src/main/java/Static62.java b/client/src/main/java/Static62.java index bc937fa..0c0cc0d 100644 --- a/client/src/main/java/Static62.java +++ b/client/src/main/java/Static62.java @@ -5,23 +5,13 @@ public final class Static62 { @OriginalMember(owner = "client!f", name = "P", descriptor = "[I") public static int[] anIntArray150; - @OriginalMember(owner = "client!f", name = "W", descriptor = "Lclient!fi;") - public static HuffmanCodec aClass44_1; - @OriginalMember(owner = "client!f", name = "ab", descriptor = "[[I") public static int[][] anIntArrayArray11; - @OriginalMember(owner = "client!f", name = "T", descriptor = "[S") - public static short[] aShortArray19 = new short[256]; - - @OriginalMember(owner = "client!f", name = "V", descriptor = "I") + @OriginalMember(owner = "client!f", name = "V", descriptor = "I") public static int anInt1938 = 0; @OriginalMember(owner = "client!f", name = "Z", descriptor = "I") public static int anInt1941 = 0; - @OriginalMember(owner = "client!f", name = "h", descriptor = "(I)I") - public static int total() { - return 15; - } } diff --git a/client/src/main/java/Static64.java b/client/src/main/java/Static64.java index 1a5fe30..58874da 100644 --- a/client/src/main/java/Static64.java +++ b/client/src/main/java/Static64.java @@ -8,13 +8,13 @@ public final class Static64 { public static int[] anIntArray153; @OriginalMember(owner = "client!fb", name = "i", descriptor = "Lclient!na;") - public static final JagString aClass100_431 = Static28.parse("; Max)2Age="); + public static final JagString aClass100_431 = JagString.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 = "p", descriptor = "Lclient!na;") - public static final JagString aClass100_433 = Static28.parse(""); + public static final JagString aClass100_433 = JagString.parse(""); @OriginalMember(owner = "client!fb", name = "q", descriptor = "[I") public static final int[] anIntArray154 = new int[] { -1, -1, 1, 1 }; @@ -37,8 +37,8 @@ public final class Static64 { Static159.players[local30] = null; } } - if (Static223.anInt5028 != Static57.aClass3_Sub15_Sub1_3.offset) { - throw new RuntimeException("gpp1 pos:" + Static57.aClass3_Sub15_Sub1_3.offset + " psize:" + Static223.anInt5028); + if (Protocol.length != Protocol.inboundBuffer.offset) { + throw new RuntimeException("gpp1 pos:" + Protocol.inboundBuffer.offset + " psize:" + Protocol.length); } for (local23 = 0; local23 < Static267.anInt5774; local23++) { if (Static159.players[Static105.anIntArray256[local23]] == null) { @@ -52,11 +52,11 @@ public final class Static64 { if (arg0 == 0L) { return; } - if (Static9.anInt178 >= 100 && !Static202.aBoolean233 || Static9.anInt178 >= 200) { + if (Static9.anInt178 >= 100 && !LoginManager.playerMember || Static9.anInt178 >= 200) { Static103.method2231(JagString.EMPTY, 0, LocalizedText.FRIENDLISTFULL); return; } - @Pc(35) JagString local35 = Static79.decode37(arg0).method3125(); + @Pc(35) JagString local35 = Base37.decodeLowerCase(arg0).method3125(); @Pc(42) int local42; for (local42 = 0; local42 < Static9.anInt178; local42++) { if (Static92.aLongArray3[local42] == arg0) { @@ -81,8 +81,8 @@ public final class Static64 { Static106.anIntArray258[Static9.anInt178] = 0; Static3.aBooleanArray135[Static9.anInt178] = false; Static9.anInt178++; - Static185.anInt4369 = Static119.transmitTimer; - Static6.outboundBuffer.p1isaac(120); - Static6.outboundBuffer.p8(arg0); + Static185.anInt4369 = InterfaceList.transmitTimer; + Protocol.outboundBuffer.p1isaac(120); + Protocol.outboundBuffer.p8(arg0); } } diff --git a/client/src/main/java/Static65.java b/client/src/main/java/Static65.java index 728803f..f874df2 100644 --- a/client/src/main/java/Static65.java +++ b/client/src/main/java/Static65.java @@ -8,7 +8,7 @@ public final class Static65 { public static int anInt1951 = -1; @OriginalMember(owner = "client!fc", name = "f", descriptor = "Lclient!na;") - public static final JagString aClass100_435 = Static28.parse(""); + public static final JagString aClass100_435 = JagString.parse(""); @OriginalMember(owner = "client!fc", name = "a", descriptor = "(Lclient!wa;I)Lclient!na;") public static JagString method1497(@OriginalArg(0) Buffer arg0) { diff --git a/client/src/main/java/Static67.java b/client/src/main/java/Static67.java index d7bb969..5f9f13e 100644 --- a/client/src/main/java/Static67.java +++ b/client/src/main/java/Static67.java @@ -9,15 +9,12 @@ public final class Static67 { public static Sprite[] mapfuncs; @OriginalMember(owner = "client!fe", name = "I", descriptor = "Lclient!na;") - public static final JagString aClass100_639 = Static28.parse(" "); + public static final JagString aClass100_639 = JagString.parse(" "); @OriginalMember(owner = "client!fe", name = "R", descriptor = "Z") public static boolean prevFocus = true; - @OriginalMember(owner = "client!fe", name = "jb", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_20 = new SoftLruHashTable(64); - - @OriginalMember(owner = "client!fe", name = "lb", descriptor = "[I") + @OriginalMember(owner = "client!fe", name = "lb", descriptor = "[I") public static final int[] anIntArray320 = new int[100]; @OriginalMember(owner = "client!fe", name = "nc", descriptor = "[Lclient!hj;") diff --git a/client/src/main/java/Static69.java b/client/src/main/java/Static69.java index 556130a..3be72f7 100644 --- a/client/src/main/java/Static69.java +++ b/client/src/main/java/Static69.java @@ -11,7 +11,7 @@ public final class Static69 { public static final boolean[][] aBooleanArrayArray2 = new boolean[][] { new boolean[0], { true, false, true }, { true, false, false, true }, { false, false, true, true }, { true, true, false }, { false, true, true }, { true, false, false, true }, { false, false, false, true, true }, { false, true, true }, { true, false, true, true, true }, { false, true, true, true, true }, { false, true, true, true, true, false } }; @OriginalMember(owner = "client!fh", name = "ab", descriptor = "Lclient!na;") - public static final JagString aClass100_443 = Static28.parse("::noclip"); + public static final JagString aClass100_443 = JagString.parse("::noclip"); @OriginalMember(owner = "client!fh", name = "a", descriptor = "(IIII)I") public static int method1540(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { @@ -37,9 +37,9 @@ public final class Static69 { Static190.aLongArray6[local36] = Static190.aLongArray6[local36 + 1]; Static193.aClass100Array134[local36] = Static193.aClass100Array134[local36 + 1]; } - Static185.anInt4369 = Static119.transmitTimer; - Static6.outboundBuffer.p1isaac(213); - Static6.outboundBuffer.p8(arg0); + Static185.anInt4369 = InterfaceList.transmitTimer; + Protocol.outboundBuffer.p1isaac(213); + Protocol.outboundBuffer.p8(arg0); break; } } @@ -159,17 +159,4 @@ public final class Static69 { } } - @OriginalMember(owner = "client!fh", name = "a", descriptor = "(Lclient!wa;I)V") - public static void method1546(@OriginalArg(0) Buffer arg0) { - for (@Pc(7) int local7 = 0; local7 < Static106.anInt2871; local7++) { - @Pc(18) int local18 = arg0.gSmart1or2(); - @Pc(22) int local22 = arg0.g2(); - if (local22 == 65535) { - local22 = -1; - } - if (Static196.aClass10_Sub1Array2[local18] != null) { - Static196.aClass10_Sub1Array2[local18].players = local22; - } - } - } } diff --git a/client/src/main/java/Static7.java b/client/src/main/java/Static7.java index ef1df7b..911e55d 100644 --- a/client/src/main/java/Static7.java +++ b/client/src/main/java/Static7.java @@ -8,9 +8,6 @@ public final class Static7 { @OriginalMember(owner = "client!ah", name = "t", descriptor = "I") public static int anInt986; - @OriginalMember(owner = "client!ah", name = "i", descriptor = "Lclient!n;") - public static final SoftLruHashTable sprites = new SoftLruHashTable(2); - @OriginalMember(owner = "client!ah", name = "j", descriptor = "[I") public static final int[] varps = new int[2500]; @@ -25,7 +22,7 @@ public final class Static7 { @OriginalMember(owner = "client!ah", name = "a", descriptor = "(BZ)V") public static void ping(@OriginalArg(1) boolean arg0) { - Static107.loop(); + client.audioLoop(); if (client.gameState != 30 && client.gameState != 25) { return; } @@ -34,16 +31,16 @@ public final class Static7 { return; } Static131.anInt3251 = 0; - if (!Static224.aBoolean247 && Protocol.socket != null) { - Static6.outboundBuffer.p1isaac(93); + if (!LoginManager.aBoolean247 && Protocol.socket != null) { + Protocol.outboundBuffer.p1isaac(93); try { - Protocol.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); - Static6.outboundBuffer.offset = 0; + Protocol.socket.write(Protocol.outboundBuffer.data, Protocol.outboundBuffer.offset); + Protocol.outboundBuffer.offset = 0; } catch (@Pc(53) IOException local53) { - Static224.aBoolean247 = true; + LoginManager.aBoolean247 = true; } } - Static107.loop(); + client.audioLoop(); } @OriginalMember(owner = "client!ah", name = "b", descriptor = "(I)V") @@ -60,7 +57,7 @@ public final class Static7 { if (local37 == 25 || local37 == 23 || local37 == 48 || local37 == 7 || local37 == 13 || local37 == 47 || local37 == 5 || local37 == 43 || local37 == 35 || local37 == 58 || local37 == 22 || local37 == 1006) { local93 = Static196.anIntArray408[Static231.anInt5204 - 1]; local99 = Static56.anIntArray142[Static231.anInt5204 - 1]; - @Pc(103) Component local103 = Static5.getComponent(local99); + @Pc(103) Component local103 = InterfaceList.getComponent(local99); @Pc(106) ServerActiveProperties local106 = Static36.method940(local103); if (local106.method511() || local106.method504()) { Static78.anInt2145 = 0; @@ -68,7 +65,7 @@ public final class Static7 { if (Static118.aClass13_15 != null) { Static43.redraw(Static118.aClass13_15); } - Static118.aClass13_15 = Static5.getComponent(local99); + Static118.aClass13_15 = InterfaceList.getComponent(local99); Static149.anInt3554 = clickX; Static206.anInt4773 = Static60.clickY; Static4.anInt36 = local93; diff --git a/client/src/main/java/Static70.java b/client/src/main/java/Static70.java index 32abc26..26a3d63 100644 --- a/client/src/main/java/Static70.java +++ b/client/src/main/java/Static70.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc; 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 = "k", descriptor = "I") + @OriginalMember(owner = "client!fi", name = "k", descriptor = "I") public static int type = 0; @OriginalMember(owner = "client!fi", name = "n", descriptor = "I") @@ -31,7 +28,7 @@ public final class Static70 { @OriginalMember(owner = "client!fi", name = "a", descriptor = "(III)V") 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); + @Pc(18) FloType local18 = FloTypeList.method4395(local11); if (local18 != null) { @Pc(24) int local24 = local18.texture; if (local24 >= 0 && !Rasteriser.textureProvider.method3236(local24)) { diff --git a/client/src/main/java/Static71.java b/client/src/main/java/Static71.java index a10f23d..2ad43cb 100644 --- a/client/src/main/java/Static71.java +++ b/client/src/main/java/Static71.java @@ -13,52 +13,11 @@ public final class Static71 { @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;") - public static ObjType get(@OriginalArg(0) int arg0) { - @Pc(6) ObjType local6 = (ObjType) Static27.aClass99_4.get((long) arg0); - if (local6 != null) { - return local6; - } - @Pc(25) byte[] local25 = Static167.aClass153_61.getFile(Static18.method554(arg0), Static247.method4247(arg0)); - local6 = new ObjType(); - local6.anInt2354 = arg0; - if (local25 != null) { - local6.decode(new Buffer(local25)); - } - local6.method1826(); - if (local6.certificateTemplate != -1) { - local6.generateCertificate(get(local6.certificateLink), get(local6.certificateTemplate)); - } - if (local6.lentTemplate != -1) { - local6.method1823(get(local6.lentLink), get(local6.lentTemplate)); - } - if (!Static240.aBoolean276 && local6.members) { - local6.name = LocalizedText.MEMBERS_OBJECT; - local6.team = 0; - local6.inventoryOps = Static143.aClass100Array104; - local6.stockMarket = false; - local6.ops = Static269.aClass100Array87; - } - Static27.aClass99_4.put(local6, (long) arg0); - return local6; - } - - @OriginalMember(owner = "client!fk", name = "a", descriptor = "(B)V") - public static void method1441() { - Static279.aClass99_38.method3103(); - Static56.models.method3103(); - } - @OriginalMember(owner = "client!fk", name = "a", descriptor = "([BIZ)I") public static int method1442(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int arg1) { return Static169.crc32(0, arg1, arg0); } - @OriginalMember(owner = "client!fk", name = "b", descriptor = "(IB)V") - public static void method1443() { - Static83.aClass99_3.method3102(5); - } - @OriginalMember(owner = "client!fk", name = "b", descriptor = "(I)V") public static void method1444() { for (@Pc(7) int local7 = -1; local7 < Static267.anInt5774; local7++) { @@ -77,7 +36,7 @@ public final class Static71 { @OriginalMember(owner = "client!fk", name = "c", descriptor = "(I)V") public static void transmitVerifyId() { - Static6.outboundBuffer.p1isaac(177); - Static6.outboundBuffer.p2(Static189.anInt4443); + Protocol.outboundBuffer.p1isaac(177); + Protocol.outboundBuffer.p2(Protocol.verifyId); } } diff --git a/client/src/main/java/Static72.java b/client/src/main/java/Static72.java index ace718c..ad76f7d 100644 --- a/client/src/main/java/Static72.java +++ b/client/src/main/java/Static72.java @@ -7,9 +7,6 @@ public final class Static72 { @OriginalMember(owner = "client!fl", name = "u", descriptor = "Z") public static boolean aBoolean116; - @OriginalMember(owner = "client!fl", name = "C", descriptor = "Lsignlink!im;") - public static PrivilegedRequest aClass212_3; - @OriginalMember(owner = "client!fl", name = "D", descriptor = "[[I") public static int[][] regionsXteaKeys; @@ -17,26 +14,26 @@ public final class Static72 { public static int updatedVarcstrsWriterIndex = 0; @OriginalMember(owner = "client!fl", name = "H", descriptor = "Lclient!na;") - public static final JagString aClass100_446 = Static28.parse(""); + public static final JagString aClass100_446 = JagString.parse(""); @OriginalMember(owner = "client!fl", name = "P", descriptor = "I") public static int anInt2043 = 0; @OriginalMember(owner = "client!fl", name = "Q", descriptor = "Lclient!na;") - public static final JagString EMPTY_STRING = Static28.parse(""); + public static final JagString EMPTY_STRING = JagString.parse(""); @OriginalMember(owner = "client!fl", name = "V", descriptor = "Lclient!na;") - public static final JagString aClass100_448 = Static28.parse("(Y"); + public static final JagString aClass100_448 = JagString.parse("(Y"); @OriginalMember(owner = "client!fl", name = "b", descriptor = "(II)Lclient!cl;") public static AnimFrameset getAnimFrameset(@OriginalArg(0) int arg0) { - @Pc(19) AnimFrameset local19 = (AnimFrameset) Static267.aClass99_37.get((long) arg0); + @Pc(19) AnimFrameset local19 = (AnimFrameset) SeqTypeList.aClass99_37.get((long) arg0); if (local19 != null) { return local19; } - local19 = Static87.method1803(Static225.aClass153_92, Static5.aClass153_1, arg0); + local19 = Static87.method1803(SeqTypeList.aClass153_92, SeqTypeList.aClass153_1, arg0); if (local19 != null) { - Static267.aClass99_37.put(local19, (long) arg0); + SeqTypeList.aClass99_37.put(local19, (long) arg0); } return local19; } @@ -90,9 +87,4 @@ public final class Static72 { } } - @OriginalMember(owner = "client!fl", name = "a", descriptor = "(IB)V") - public static void method1570() { - Static142.aClass99_23.method3102(5); - Static267.aClass99_37.method3102(5); - } } diff --git a/client/src/main/java/Static73.java b/client/src/main/java/Static73.java index c6b4b65..cf93865 100644 --- a/client/src/main/java/Static73.java +++ b/client/src/main/java/Static73.java @@ -4,14 +4,8 @@ import org.openrs2.deob.annotation.Pc; public final class Static73 { - @OriginalMember(owner = "client!fm", name = "S", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_10 = new SoftLruHashTable(4); - @OriginalMember(owner = "client!fm", name = "W", descriptor = "Lclient!na;") - public static final JagString aClass100_453 = Static28.parse(")2"); - - @OriginalMember(owner = "client!fm", name = "db", descriptor = "Lclient!gn;") - public static final LruHashTable aClass54_7 = new LruHashTable(64); + public static final JagString aClass100_453 = JagString.parse(")2"); @OriginalMember(owner = "client!fm", name = "fb", descriptor = "[I") public static final int[] anIntArray183 = new int[14]; @@ -20,14 +14,14 @@ public final class Static73 { public static void method1596(@OriginalArg(0) boolean arg0) { if (arg0) { if (InterfaceList.topLevelInterface != -1) { - Static109.method2275(InterfaceList.topLevelInterface); + InterfaceList.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); } InterfaceList.topLevelInterface = -1; Static119.aClass133_9 = new HashTable(8); - Static52.method1287(); + InterfaceList.method1287(); InterfaceList.topLevelInterface = Static156.loginScreenId; Static210.method3712(false); Static87.method1807(); @@ -39,8 +33,8 @@ public final class Static73 { PlayerList.self.zFine = 3000; PlayerList.self.xFine = 3000; if (!GlRenderer.enabled) { - Static145.method2743(Static209.js5Archive8); - Static196.setGameState(10); + Static145.method2743(client.js5Archive8); + client.setGameState(10); return; } if (Static227.cameraType == 2) { @@ -51,7 +45,7 @@ public final class Static73 { } Static86.setInstantFade(); Static26.setupLoadingScreenRegion(); - Static196.setGameState(28); + client.setGameState(28); } @OriginalMember(owner = "client!fm", name = "a", descriptor = "(ZII)V") diff --git a/client/src/main/java/Static74.java b/client/src/main/java/Static74.java index 8b500af..295d83d 100644 --- a/client/src/main/java/Static74.java +++ b/client/src/main/java/Static74.java @@ -9,7 +9,7 @@ public final class Static74 { public static final CRC32 aCRC32_1 = new CRC32(); @OriginalMember(owner = "client!fn", name = "Z", descriptor = "Lclient!na;") - public static final JagString aClass100_461 = Static28.parse(")1 "); + public static final JagString aClass100_461 = JagString.parse(")1 "); @OriginalMember(owner = "client!fn", name = "a", descriptor = "(ZIIIIIII)V") public static void method1623(@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) { @@ -74,10 +74,10 @@ public final class Static74 { @OriginalMember(owner = "client!fn", name = "c", descriptor = "(II)V") public static void method1626(@OriginalArg(0) int arg0) { - if (arg0 == -1 || !Static245.load(arg0)) { + if (arg0 == -1 || !InterfaceList.load(arg0)) { return; } - @Pc(31) Component[] local31 = Static241.components[arg0]; + @Pc(31) Component[] local31 = InterfaceList.components[arg0]; for (@Pc(33) int local33 = 0; local33 < local31.length; local33++) { @Pc(41) Component local41 = local31[local33]; if (local41.anObjectArray3 != null) { diff --git a/client/src/main/java/Static75.java b/client/src/main/java/Static75.java index 7f635f0..7a893e3 100644 --- a/client/src/main/java/Static75.java +++ b/client/src/main/java/Static75.java @@ -7,143 +7,6 @@ public final class Static75 { @OriginalMember(owner = "client!g", name = "d", descriptor = "I") public static int anInt2119 = 0; - @OriginalMember(owner = "client!g", name = "a", descriptor = "(IZ)V") - public static void method1629(@OriginalArg(1) boolean arg0) { - Static230.dynamicMapRegion = arg0; - @Pc(13) int local13; - @Pc(20) int local20; - @Pc(26) int local26; - @Pc(31) int local31; - @Pc(60) int local60; - @Pc(64) int local64; - @Pc(138) int local138; - @Pc(151) int local151; - @Pc(169) int local169; - if (!Static230.dynamicMapRegion) { - local13 = Static57.aClass3_Sub15_Sub1_3.g2sub(); - local20 = (Static223.anInt5028 - Static57.aClass3_Sub15_Sub1_3.offset) / 16; - Static72.regionsXteaKeys = new int[local20][4]; - for (local26 = 0; local26 < local20; local26++) { - for (local31 = 0; local31 < 4; local31++) { - Static72.regionsXteaKeys[local26][local31] = Static57.aClass3_Sub15_Sub1_3.p4rme(); - } - } - local26 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); - local31 = Static57.aClass3_Sub15_Sub1_3.g2(); - local60 = Static57.aClass3_Sub15_Sub1_3.g2sub(); - local64 = Static57.aClass3_Sub15_Sub1_3.g2sub(); - Static238.regionBitPacked = new int[local20]; - Static273.mapFilesBuffer = new byte[local20][]; - Static191.npcSpawnsFilesBuffer = null; - Static99.underWaterMapFileIds = new int[local20]; - Static156.locationMapFilesBuffer = new byte[local20][]; - Static19.underWaterLocationsMapFilesBuffer = new byte[local20][]; - Static175.npcSpawnsFileIds = null; - Static36.mapFileIds = new int[local20]; - Static186.underWaterMapFilesBuffer = new byte[local20][]; - Static172.locationsMapFileIds = new int[local20]; - Static35.underWaterLocationsMapFileIds = new int[local20]; - local20 = 0; - @Pc(100) boolean local100 = false; - if ((local31 / 8 == 48 || local31 / 8 == 49) && local60 / 8 == 48) { - local100 = true; - } - if (local31 / 8 == 48 && local60 / 8 == 148) { - local100 = true; - } - for (local138 = (local31 - 6) / 8; local138 <= (local31 + 6) / 8; local138++) { - for (local151 = (local60 - 6) / 8; local151 <= (local60 + 6) / 8; local151++) { - local169 = (local138 << 8) + local151; - if (local100 && (local151 == 49 || local151 == 149 || local151 == 147 || local138 == 50 || local138 == 49 && local151 == 47)) { - Static238.regionBitPacked[local20] = local169; - Static36.mapFileIds[local20] = -1; - Static172.locationsMapFileIds[local20] = -1; - Static99.underWaterMapFileIds[local20] = -1; - Static35.underWaterLocationsMapFileIds[local20] = -1; - } else { - Static238.regionBitPacked[local20] = local169; - 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++; - } - } - Static127.method2463(local26, local60, local31, local64, false, local13); - return; - } - local13 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); - local20 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); - local26 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); - local31 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); - Static57.aClass3_Sub15_Sub1_3.method2233(); - @Pc(391) int local391; - for (local60 = 0; local60 < 4; local60++) { - for (local64 = 0; local64 < 13; local64++) { - for (local391 = 0; local391 < 13; local391++) { - local138 = Static57.aClass3_Sub15_Sub1_3.method2238(1); - if (local138 == 1) { - Static187.anIntArrayArrayArray18[local60][local64][local391] = Static57.aClass3_Sub15_Sub1_3.method2238(26); - } else { - Static187.anIntArrayArrayArray18[local60][local64][local391] = -1; - } - } - } - } - Static57.aClass3_Sub15_Sub1_3.method2244(); - local60 = (Static223.anInt5028 - Static57.aClass3_Sub15_Sub1_3.offset) / 16; - Static72.regionsXteaKeys = new int[local60][4]; - for (local64 = 0; local64 < local60; local64++) { - for (local391 = 0; local391 < 4; local391++) { - Static72.regionsXteaKeys[local64][local391] = Static57.aClass3_Sub15_Sub1_3.p4rme(); - } - } - local64 = Static57.aClass3_Sub15_Sub1_3.g2(); - Static35.underWaterLocationsMapFileIds = new int[local60]; - Static172.locationsMapFileIds = new int[local60]; - Static36.mapFileIds = new int[local60]; - Static19.underWaterLocationsMapFilesBuffer = new byte[local60][]; - Static175.npcSpawnsFileIds = null; - Static99.underWaterMapFileIds = new int[local60]; - Static156.locationMapFilesBuffer = new byte[local60][]; - Static273.mapFilesBuffer = new byte[local60][]; - Static238.regionBitPacked = new int[local60]; - Static191.npcSpawnsFilesBuffer = null; - Static186.underWaterMapFilesBuffer = new byte[local60][]; - local60 = 0; - for (local391 = 0; local391 < 4; local391++) { - for (local138 = 0; local138 < 13; local138++) { - for (local151 = 0; local151 < 13; local151++) { - local169 = Static187.anIntArrayArrayArray18[local391][local138][local151]; - if (local169 != -1) { - @Pc(555) int local555 = local169 >> 14 & 0x3FF; - @Pc(561) int local561 = local169 >> 3 & 0x7FF; - @Pc(571) int local571 = local561 / 8 + (local555 / 8 << 8); - @Pc(573) int local573; - for (local573 = 0; local573 < local60; local573++) { - if (local571 == Static238.regionBitPacked[local573]) { - local571 = -1; - break; - } - } - if (local571 != -1) { - Static238.regionBitPacked[local60] = local571; - @Pc(609) int local609 = local571 & 0xFF; - local573 = local571 >> 8 & 0xFF; - 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++; - } - } - } - } - } - Static127.method2463(local26, local64, local20, local31, false, local13); - } - @OriginalMember(owner = "client!g", name = "b", descriptor = "(I)V") public static void setDefaultChunksAtmosphere() { @Pc(9) Environment local9 = new Environment(); @@ -175,23 +38,23 @@ public final class Static75 { @Pc(31) int local31; @Pc(39) int local39; @Pc(45) int local45; - if (Static164.anInt3985 == 195) { - local15 = Static57.aClass3_Sub15_Sub1_3.p1neg(); + if (Protocol.opcode == 195) { + local15 = Protocol.inboundBuffer.p1neg(); local19 = local15 & 0x3; local23 = local15 >> 2; local27 = Static133.anIntArray453[local23]; - local31 = Static57.aClass3_Sub15_Sub1_3.g1(); + local31 = Protocol.inboundBuffer.g1(); local39 = (local31 >> 4 & 0x7) + Static115.anInt2940; local45 = (local31 & 0x7) + Static180.anInt4264; if (local39 >= 0 && local45 >= 0 && local39 < 104 && local45 < 104) { Static29.method800(Static55.level, local45, local19, local39, -1, -1, local27, local23, 0); } - } else if (Static164.anInt3985 == 33) { - local15 = Static57.aClass3_Sub15_Sub1_3.g2le(); - local23 = Static57.aClass3_Sub15_Sub1_3.g1(); + } else if (Protocol.opcode == 33) { + local15 = Protocol.inboundBuffer.g2le(); + local23 = Protocol.inboundBuffer.g1(); local27 = (local23 & 0x7) + Static180.anInt4264; local19 = (local23 >> 4 & 0x7) + Static115.anInt2940; - local31 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + local31 = Protocol.inboundBuffer.g2sub(); if (local19 >= 0 && local27 >= 0 && local19 < 104 && local27 < 104) { @Pc(122) ObjStack local122 = new ObjStack(); local122.anInt5550 = local31; @@ -210,98 +73,98 @@ public final class Static75 { @Pc(224) int local224; @Pc(236) int local236; @Pc(317) ProjAnim local317; - if (Static164.anInt3985 == 121) { - local15 = Static57.aClass3_Sub15_Sub1_3.g1(); + if (Protocol.opcode == 121) { + local15 = Protocol.inboundBuffer.g1(); local23 = Static115.anInt2940 * 2 + (local15 >> 4 & 0xF); local19 = (local15 & 0xF) + Static180.anInt4264 * 2; - local27 = local23 + Static57.aClass3_Sub15_Sub1_3.g1s(); - local31 = Static57.aClass3_Sub15_Sub1_3.g1s() + local19; - local39 = Static57.aClass3_Sub15_Sub1_3.g2s(); - local45 = Static57.aClass3_Sub15_Sub1_3.g2(); - local218 = Static57.aClass3_Sub15_Sub1_3.g1() * 4; - local224 = Static57.aClass3_Sub15_Sub1_3.g1() * 4; - local228 = Static57.aClass3_Sub15_Sub1_3.g2(); - local232 = Static57.aClass3_Sub15_Sub1_3.g2(); - local236 = Static57.aClass3_Sub15_Sub1_3.g1(); + local27 = local23 + Protocol.inboundBuffer.g1s(); + local31 = Protocol.inboundBuffer.g1s() + local19; + local39 = Protocol.inboundBuffer.g2s(); + local45 = Protocol.inboundBuffer.g2(); + local218 = Protocol.inboundBuffer.g1() * 4; + local224 = Protocol.inboundBuffer.g1() * 4; + local228 = Protocol.inboundBuffer.g2(); + local232 = Protocol.inboundBuffer.g2(); + local236 = Protocol.inboundBuffer.g1(); if (local236 == 255) { local236 = -1; } - local247 = Static57.aClass3_Sub15_Sub1_3.g1(); + local247 = Protocol.inboundBuffer.g1(); if (local23 >= 0 && local19 >= 0 && local23 < 208 && local19 < 208 && local27 >= 0 && local31 >= 0 && local27 < 208 && local31 < 208 && local45 != 65535) { local31 *= 64; local27 = local27 * 64; local19 = local19 * 64; 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); + local317 = new ProjAnim(local45, Static55.level, local23, local19, SceneGraph.getTileHeight(Static55.level, local23, local19) - local218, Static83.loop + local228, local232 + Static83.loop, local236, local247, local39, local224); + local317.method3705(local31, Static83.loop + local228, -local224 + SceneGraph.getTileHeight(Static55.level, local27, local31), local27); Static217.aClass69_116.addTail(new ProjAnimNode(local317)); } - } else if (Static164.anInt3985 == 17) { - local15 = Static57.aClass3_Sub15_Sub1_3.g1(); + } else if (Protocol.opcode == 17) { + local15 = Protocol.inboundBuffer.g1(); local23 = Static115.anInt2940 + (local15 >> 4 & 0x7); local19 = Static180.anInt4264 + (local15 & 0x7); - local27 = Static57.aClass3_Sub15_Sub1_3.g2(); - local31 = Static57.aClass3_Sub15_Sub1_3.g1(); - local39 = Static57.aClass3_Sub15_Sub1_3.g2(); + local27 = Protocol.inboundBuffer.g2(); + local31 = Protocol.inboundBuffer.g1(); + local39 = Protocol.inboundBuffer.g2(); if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) { 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); + @Pc(427) SpotAnim local427 = new SpotAnim(local27, Static55.level, local23, local19, SceneGraph.getTileHeight(Static55.level, local23, local19) - local31, local39, Static83.loop); Static99.aClass69_64.addTail(new SpotAnimNode(local427)); } - } else if (Static164.anInt3985 == 179) { - local15 = Static57.aClass3_Sub15_Sub1_3.g1add(); + } else if (Protocol.opcode == 179) { + local15 = Protocol.inboundBuffer.g1add(); local23 = local15 >> 2; local19 = local15 & 0x3; local27 = Static133.anIntArray453[local23]; - local31 = Static57.aClass3_Sub15_Sub1_3.g1(); + local31 = Protocol.inboundBuffer.g1(); local39 = Static115.anInt2940 + (local31 >> 4 & 0x7); local45 = (local31 & 0x7) + Static180.anInt4264; - local218 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + local218 = Protocol.inboundBuffer.g2sub(); if (local39 >= 0 && local45 >= 0 && local39 < 104 && local45 < 104) { Static29.method800(Static55.level, local45, local19, local39, -1, local218, local27, local23, 0); } - } else if (Static164.anInt3985 == 20) { - local15 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); + } else if (Protocol.opcode == 20) { + local15 = Protocol.inboundBuffer.g1ssub(); local23 = (local15 >> 4 & 0x7) + Static115.anInt2940; local19 = Static180.anInt4264 + (local15 & 0x7); - local27 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); + local27 = Protocol.inboundBuffer.g1ssub(); local31 = local27 >> 2; local39 = local27 & 0x3; local45 = Static133.anIntArray453[local31]; - local218 = Static57.aClass3_Sub15_Sub1_3.g2le(); + local218 = Protocol.inboundBuffer.g2le(); if (local218 == 65535) { local218 = -1; } Static92.method1881(Static55.level, local39, local31, local19, local45, local23, local218); } else { @Pc(633) int local633; - if (Static164.anInt3985 == 202) { - local15 = Static57.aClass3_Sub15_Sub1_3.g1(); + if (Protocol.opcode == 202) { + local15 = Protocol.inboundBuffer.g1(); local23 = local15 >> 2; local19 = local15 & 0x3; - local27 = Static57.aClass3_Sub15_Sub1_3.g1(); + local27 = Protocol.inboundBuffer.g1(); local31 = (local27 >> 4 & 0x7) + Static115.anInt2940; local39 = (local27 & 0x7) + Static180.anInt4264; - @Pc(605) byte local605 = Static57.aClass3_Sub15_Sub1_3.p1sub(); - @Pc(609) byte local609 = Static57.aClass3_Sub15_Sub1_3.p1sub(); - @Pc(613) byte local613 = Static57.aClass3_Sub15_Sub1_3.g1sub(); - local228 = Static57.aClass3_Sub15_Sub1_3.g2sub(); - local232 = Static57.aClass3_Sub15_Sub1_3.g2le(); - @Pc(625) byte local625 = Static57.aClass3_Sub15_Sub1_3.g1s(); - local247 = Static57.aClass3_Sub15_Sub1_3.g2(); - local633 = Static57.aClass3_Sub15_Sub1_3.g2lesadd(); + @Pc(605) byte local605 = Protocol.inboundBuffer.p1sub(); + @Pc(609) byte local609 = Protocol.inboundBuffer.p1sub(); + @Pc(613) byte local613 = Protocol.inboundBuffer.g1sub(); + local228 = Protocol.inboundBuffer.g2sub(); + local232 = Protocol.inboundBuffer.g2le(); + @Pc(625) byte local625 = Protocol.inboundBuffer.g1s(); + local247 = Protocol.inboundBuffer.g2(); + local633 = Protocol.inboundBuffer.g2lesadd(); if (!GlRenderer.enabled) { Static170.method2574(local625, local247, local633, local232, local39, local613, local19, local605, local31, local23, local609, local228); } } - if (Static164.anInt3985 == 14) { - local15 = Static57.aClass3_Sub15_Sub1_3.g1(); + if (Protocol.opcode == 14) { + local15 = Protocol.inboundBuffer.g1(); local19 = Static180.anInt4264 + (local15 & 0x7); local23 = (local15 >> 4 & 0x7) + Static115.anInt2940; - local27 = Static57.aClass3_Sub15_Sub1_3.g2(); - local31 = Static57.aClass3_Sub15_Sub1_3.g2(); - local39 = Static57.aClass3_Sub15_Sub1_3.g2(); + local27 = Protocol.inboundBuffer.g2(); + local31 = Protocol.inboundBuffer.g2(); + local39 = Protocol.inboundBuffer.g2(); if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) { @Pc(710) LinkedList local710 = Static159.aClass69ArrayArrayArray1[Static55.level][local23][local19]; if (local710 != null) { @@ -315,14 +178,14 @@ public final class Static75 { Static220.spawnGroundObject(local19, local23); } } - } else if (Static164.anInt3985 == 135) { - local15 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); - local23 = Static57.aClass3_Sub15_Sub1_3.p1neg(); + } else if (Protocol.opcode == 135) { + local15 = Protocol.inboundBuffer.g2leadd(); + local23 = Protocol.inboundBuffer.p1neg(); local27 = Static180.anInt4264 + (local23 & 0x7); local19 = (local23 >> 4 & 0x7) + Static115.anInt2940; - local31 = Static57.aClass3_Sub15_Sub1_3.g2le(); - local39 = Static57.aClass3_Sub15_Sub1_3.g2le(); - if (local19 >= 0 && local27 >= 0 && local19 < 104 && local27 < 104 && Static16.anInt549 != local15) { + local31 = Protocol.inboundBuffer.g2le(); + local39 = Protocol.inboundBuffer.g2le(); + if (local19 >= 0 && local27 >= 0 && local19 < 104 && local27 < 104 && PlayerList.selfId != local15) { @Pc(812) ObjStack local812 = new ObjStack(); local812.anInt5550 = local31; local812.anInt5555 = local39; @@ -332,20 +195,20 @@ public final class Static75 { Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27].addTail(new ObjStackNode(local812)); Static220.spawnGroundObject(local27, local19); } - } else if (Static164.anInt3985 == 16) { - local15 = Static57.aClass3_Sub15_Sub1_3.g1(); + } else if (Protocol.opcode == 16) { + local15 = Protocol.inboundBuffer.g1(); local23 = Static115.anInt2940 + (local15 >> 4 & 0x7); local19 = (local15 & 0x7) + Static180.anInt4264; - local27 = local23 + Static57.aClass3_Sub15_Sub1_3.g1s(); - local31 = Static57.aClass3_Sub15_Sub1_3.g1s() + local19; - local39 = Static57.aClass3_Sub15_Sub1_3.g2s(); - local45 = Static57.aClass3_Sub15_Sub1_3.g2(); - local218 = Static57.aClass3_Sub15_Sub1_3.g1() * 4; - local224 = Static57.aClass3_Sub15_Sub1_3.g1() * 4; - local228 = Static57.aClass3_Sub15_Sub1_3.g2(); - local232 = Static57.aClass3_Sub15_Sub1_3.g2(); - local236 = Static57.aClass3_Sub15_Sub1_3.g1(); - local247 = Static57.aClass3_Sub15_Sub1_3.g1(); + local27 = local23 + Protocol.inboundBuffer.g1s(); + local31 = Protocol.inboundBuffer.g1s() + local19; + local39 = Protocol.inboundBuffer.g2s(); + local45 = Protocol.inboundBuffer.g2(); + local218 = Protocol.inboundBuffer.g1() * 4; + local224 = Protocol.inboundBuffer.g1() * 4; + local228 = Protocol.inboundBuffer.g2(); + local232 = Protocol.inboundBuffer.g2(); + local236 = Protocol.inboundBuffer.g1(); + local247 = Protocol.inboundBuffer.g1(); if (local236 == 255) { local236 = -1; } @@ -354,25 +217,25 @@ public final class Static75 { local19 = local19 * 128 + 64; local23 = local23 * 128 + 64; 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); + local317 = new ProjAnim(local45, Static55.level, local23, local19, SceneGraph.getTileHeight(Static55.level, local23, local19) - local218, local228 + Static83.loop, local232 + Static83.loop, local236, local247, local39, local224); + local317.method3705(local31, Static83.loop + local228, SceneGraph.getTileHeight(Static55.level, local27, local31) - local224, local27); Static217.aClass69_116.addTail(new ProjAnimNode(local317)); } - } else if (Static164.anInt3985 == 104) { - local15 = Static57.aClass3_Sub15_Sub1_3.g1(); + } else if (Protocol.opcode == 104) { + local15 = Protocol.inboundBuffer.g1(); local19 = Static180.anInt4264 * 2 + (local15 & 0xF); local23 = Static115.anInt2940 * 2 + (local15 >> 4 & 0xF); - local27 = Static57.aClass3_Sub15_Sub1_3.g1s() + local23; - local31 = Static57.aClass3_Sub15_Sub1_3.g1s() + local19; - local39 = Static57.aClass3_Sub15_Sub1_3.g2s(); - local45 = Static57.aClass3_Sub15_Sub1_3.g2s(); - local218 = Static57.aClass3_Sub15_Sub1_3.g2(); - local224 = Static57.aClass3_Sub15_Sub1_3.g1s(); - local228 = Static57.aClass3_Sub15_Sub1_3.g1() * 4; - local232 = Static57.aClass3_Sub15_Sub1_3.g2(); - local236 = Static57.aClass3_Sub15_Sub1_3.g2(); - local247 = Static57.aClass3_Sub15_Sub1_3.g1(); - local633 = Static57.aClass3_Sub15_Sub1_3.g1(); + local27 = Protocol.inboundBuffer.g1s() + local23; + local31 = Protocol.inboundBuffer.g1s() + local19; + local39 = Protocol.inboundBuffer.g2s(); + local45 = Protocol.inboundBuffer.g2s(); + local218 = Protocol.inboundBuffer.g2(); + local224 = Protocol.inboundBuffer.g1s(); + local228 = Protocol.inboundBuffer.g1() * 4; + local232 = Protocol.inboundBuffer.g2(); + local236 = Protocol.inboundBuffer.g2(); + local247 = Protocol.inboundBuffer.g1(); + local633 = Protocol.inboundBuffer.g1(); if (local247 == 255) { local247 = -1; } @@ -395,7 +258,7 @@ public final class Static75 { local1184 = -local39 - 1; local1194 = local1184 >> 11 & 0xF; local1188 = local1184 & 0x7FF; - if (Static16.anInt549 == local1188) { + if (PlayerList.selfId == local1188) { local1198 = PlayerList.self; } else { local1198 = Static159.players[local1188]; @@ -416,38 +279,38 @@ 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); + @Pc(1331) ProjAnim local1331 = new ProjAnim(local218, Static55.level, local23, local19, SceneGraph.getTileHeight(Static55.level, local23, local19) - local224, local232 + Static83.loop, local236 + Static83.loop, local247, local633, local45, local228); + local1331.method3705(local31, local232 + Static83.loop, -local228 + SceneGraph.getTileHeight(Static55.level, local27, local31), local27); Static217.aClass69_116.addTail(new ProjAnimNode(local1331)); } - } else if (Static164.anInt3985 == 97) { - local15 = Static57.aClass3_Sub15_Sub1_3.g1(); + } else if (Protocol.opcode == 97) { + local15 = Protocol.inboundBuffer.g1(); local23 = Static115.anInt2940 + (local15 >> 4 & 0x7); local19 = Static180.anInt4264 + (local15 & 0x7); - local27 = Static57.aClass3_Sub15_Sub1_3.g2(); + local27 = Protocol.inboundBuffer.g2(); if (local27 == 65535) { local27 = -1; } - local31 = Static57.aClass3_Sub15_Sub1_3.g1(); + local31 = Protocol.inboundBuffer.g1(); local39 = local31 >> 4 & 0xF; - local218 = Static57.aClass3_Sub15_Sub1_3.g1(); + local218 = Protocol.inboundBuffer.g1(); local45 = local31 & 0x7; if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) { local224 = local39 + 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; - Static173.aClass138Array1[Static189.anInt4451] = null; - Static26.anIntArray68[Static189.anInt4451] = local39 + (local23 << 16) + (local19 << 8); - Static189.anInt4451++; + 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 && SoundPlayer.anInt4451 < 50 && local27 != -1) { + SoundPlayer.anIntArray421[SoundPlayer.anInt4451] = local27; + SoundPlayer.anIntArray563[SoundPlayer.anInt4451] = local45; + SoundPlayer.anIntArray362[SoundPlayer.anInt4451] = local218; + SoundPlayer.aClass138Array1[SoundPlayer.anInt4451] = null; + SoundPlayer.anIntArray68[SoundPlayer.anInt4451] = local39 + (local23 << 16) + (local19 << 8); + SoundPlayer.anInt4451++; } } - } else if (Static164.anInt3985 == 240) { - local15 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); + } else if (Protocol.opcode == 240) { + local15 = Protocol.inboundBuffer.g1ssub(); local19 = Static180.anInt4264 + (local15 & 0x7); local23 = (local15 >> 4 & 0x7) + Static115.anInt2940; - local27 = Static57.aClass3_Sub15_Sub1_3.g2(); + local27 = Protocol.inboundBuffer.g2(); if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) { @Pc(1565) LinkedList local1565 = Static159.aClass69ArrayArrayArray1[Static55.level][local23][local19]; if (local1565 != null) { diff --git a/client/src/main/java/Static78.java b/client/src/main/java/Static78.java index 67d8ff9..aeb4831 100644 --- a/client/src/main/java/Static78.java +++ b/client/src/main/java/Static78.java @@ -11,10 +11,10 @@ public final class Static78 { public static Sprite titleBg; @OriginalMember(owner = "client!gd", name = "b", descriptor = "Lclient!na;") - public static final JagString aClass100_464 = Static28.parse("null"); + public static final JagString aClass100_464 = JagString.parse("null"); @OriginalMember(owner = "client!gd", name = "c", descriptor = "Lclient!na;") - public static final JagString aClass100_465 = Static28.parse(")0"); + public static final JagString aClass100_465 = JagString.parse(")0"); @OriginalMember(owner = "client!gd", name = "h", descriptor = "[I") public static final int[] anIntArray204 = new int[] { 16, 32, 64, 128 }; @@ -32,27 +32,17 @@ public final class Static78 { @OriginalMember(owner = "client!gd", name = "a", descriptor = "(JI)V") public static void method1691(@OriginalArg(0) long name) { - Static6.outboundBuffer.offset = 0; - Static6.outboundBuffer.p1(186); + Protocol.outboundBuffer.offset = 0; + Protocol.outboundBuffer.p1(186); if (GlobalConfig.LOGIN_USE_STRINGS) { - Static6.outboundBuffer.pjstr(Static79.decode37(name)); + Protocol.outboundBuffer.pjstr(Base37.decodeLowerCase(name)); } else { - Static6.outboundBuffer.p8(name); + Protocol.outboundBuffer.p8(name); } - Static179.accountCreationStep = 1; - Static226.anInt5079 = 0; - Static57.anInt1758 = 0; - Static223.anInt5034 = -3; - } - - @OriginalMember(owner = "client!gd", name = "a", descriptor = "(I)V") - public static void method1694() { - Static125.aClass99_19.method3103(); - } - - @OriginalMember(owner = "client!gd", name = "b", descriptor = "(I)V") - public static void method1695() { - Static220.aClass99_28.clear(); + CreateManager.step = 1; + CreateManager.loops = 0; + CreateManager.errors = 0; + CreateManager.reply = -3; } @OriginalMember(owner = "client!gd", name = "c", descriptor = "(I)V") @@ -63,14 +53,14 @@ public final class Static78 { @Pc(14) int id; for (id = 0; id < Static273.mapFilesBuffer.length; id++) { if (Static36.mapFileIds[id] != -1 && Static273.mapFilesBuffer[id] == null) { - Static273.mapFilesBuffer[id] = Static26.js5Archive5.getFile(Static36.mapFileIds[id], 0); + Static273.mapFilesBuffer[id] = client.js5Archive5.getFile(Static36.mapFileIds[id], 0); if (Static273.mapFilesBuffer[id] == null) { Static175.mapFilesMissingCount++; fileExists = false; } } if (Static172.locationsMapFileIds[id] != -1 && Static156.locationMapFilesBuffer[id] == null) { - Static156.locationMapFilesBuffer[id] = Static26.js5Archive5.getFileXTEA(Static172.locationsMapFileIds[id], Static72.regionsXteaKeys[id], 0); + Static156.locationMapFilesBuffer[id] = client.js5Archive5.getFileXTEA(Static172.locationsMapFileIds[id], Static72.regionsXteaKeys[id], 0); if (Static156.locationMapFilesBuffer[id] == null) { fileExists = false; Static175.mapFilesMissingCount++; @@ -79,14 +69,14 @@ public final class Static78 { if (GlRenderer.enabled) { if (Static99.underWaterMapFileIds[id] != -1 && Static186.underWaterMapFilesBuffer[id] == null) { - Static186.underWaterMapFilesBuffer[id] = Static26.js5Archive5.getFile(Static99.underWaterMapFileIds[id], 0); + Static186.underWaterMapFilesBuffer[id] = client.js5Archive5.getFile(Static99.underWaterMapFileIds[id], 0); if (Static186.underWaterMapFilesBuffer[id] == null) { fileExists = false; Static175.mapFilesMissingCount++; } } if (Static35.underWaterLocationsMapFileIds[id] != -1 && Static19.underWaterLocationsMapFilesBuffer[id] == null) { - Static19.underWaterLocationsMapFilesBuffer[id] = Static26.js5Archive5.getFile(Static35.underWaterLocationsMapFileIds[id], 0); + Static19.underWaterLocationsMapFilesBuffer[id] = client.js5Archive5.getFile(Static35.underWaterLocationsMapFileIds[id], 0); if (Static19.underWaterLocationsMapFilesBuffer[id] == null) { Static175.mapFilesMissingCount++; fileExists = false; @@ -95,7 +85,7 @@ public final class Static78 { } if (Static175.npcSpawnsFileIds != null && Static191.npcSpawnsFilesBuffer[id] == null && Static175.npcSpawnsFileIds[id] != -1) { - Static191.npcSpawnsFilesBuffer[id] = Static26.js5Archive5.getFileXTEA(Static175.npcSpawnsFileIds[id], Static72.regionsXteaKeys[id], 0); + Static191.npcSpawnsFilesBuffer[id] = client.js5Archive5.getFileXTEA(Static175.npcSpawnsFileIds[id], Static72.regionsXteaKeys[id], 0); if (Static191.npcSpawnsFilesBuffer[id] == null) { Static175.mapFilesMissingCount++; fileExists = false; @@ -156,8 +146,8 @@ public final class Static78 { Static114.drawTextOnScreen(true, JagString.concatenate(new JagString[] { LocalizedText.LOADING, Static18.COMPLETE_PERCENT})); } - Static107.loop(); - Static217.method3768(); + client.audioLoop(); + client.method3768(); @Pc(420) boolean hasUnderWaterMap = false; @Pc(427) int i; if (GlRenderer.enabled && Preferences.highWaterDetail) { @@ -170,7 +160,7 @@ public final class Static78 { } Static28.method792(GlRenderer.enabled ? 28 : 25, hasUnderWaterMap); for (i = 0; i < 4; i++) { - Static148.collisionMaps[i].resetFlags(); + PathFinder.collisionMaps[i].resetFlags(); } for (i = 0; i < 4; i++) { for (chunkX = 0; chunkX < 104; chunkX++) { @@ -194,7 +184,7 @@ public final class Static78 { if (GlRenderer.enabled) { Static75.setDefaultChunksAtmosphere(); } - Static107.loop(); + client.audioLoop(); System.gc(); Static7.ping(true); Static196.method3535(false); @@ -221,9 +211,9 @@ public final class Static78 { } Static233.method4002(false); } - Static217.method3768(); + client.method3768(); Static7.ping(true); - Static45.method1169(Static148.collisionMaps, false); + Static45.method1169(PathFinder.collisionMaps, false); if (GlRenderer.enabled) { Static120.method2395(); } @@ -253,9 +243,9 @@ public final class Static78 { Static7.ping(true); Static233.method4002(true); } - Static217.method3768(); + client.method3768(); Static7.ping(true); - Static45.method1169(Static148.collisionMaps, true); + Static45.method1169(PathFinder.collisionMaps, true); Static7.ping(true); Static105.method2255(); Static278.setRenderTiles(false); @@ -273,38 +263,38 @@ public final class Static78 { } } Static269.method2218(); - Static107.loop(); + client.audioLoop(); Static219.method3796(); - Static217.method3768(); + client.method3768(); Static231.aBoolean252 = false; if (GameShell.frame != null && Protocol.socket != null && client.gameState == 25) { - Static6.outboundBuffer.p1isaac(20); - Static6.outboundBuffer.p4(1057001181); + Protocol.outboundBuffer.p1isaac(20); + Protocol.outboundBuffer.p4(1057001181); } if (!Static230.dynamicMapRegion) { @Pc(815) int local815 = (Static52.anInt1695 + 6) / 8; @Pc(821) int local821 = (Static52.anInt1695 - 6) / 8; - chunkX = (Static80.anInt4701 - 6) / 8; - chunkZ = (Static80.anInt4701 + 6) / 8; + chunkX = (Static80.centralZoneX - 6) / 8; + chunkZ = (Static80.centralZoneX + 6) / 8; 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(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) })); + client.js5Archive5.method4486(JagString.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local837), Static86.aClass100_488, Static123.parseInt(local850) })); + client.js5Archive5.method4486(JagString.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local837), Static86.aClass100_488, Static123.parseInt(local850) })); } } } } if (client.gameState == 28) { - Static196.setGameState(10); + client.setGameState(10); } else { - Static196.setGameState(30); + client.setGameState(30); if (Protocol.socket != null) { - Static6.outboundBuffer.p1isaac(110); + Protocol.outboundBuffer.p1isaac(110); } } Static141.method2720(); - Static107.loop(); + client.audioLoop(); GameShell.resetTimer(); } } diff --git a/client/src/main/java/Static79.java b/client/src/main/java/Static79.java index eee3bf9..f614079 100644 --- a/client/src/main/java/Static79.java +++ b/client/src/main/java/Static79.java @@ -7,9 +7,6 @@ public final class Static79 { @OriginalMember(owner = "client!ge", name = "q", descriptor = "I") public static int anInt2161; - @OriginalMember(owner = "client!ge", name = "i", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_11 = new SoftLruHashTable(64); - @OriginalMember(owner = "client!ge", name = "k", descriptor = "[I") public static int[] anIntArray205 = new int[2]; @@ -23,18 +20,18 @@ public final class Static79 { } @Pc(13) int local13 = (arg2 + arg4) / 2; @Pc(15) int local15 = arg4; - @Pc(19) World local19 = Static101.worlds[local13]; - Static101.worlds[local13] = Static101.worlds[arg2]; - Static101.worlds[arg2] = local19; + @Pc(19) World local19 = WorldList.sorted[local13]; + WorldList.sorted[local13] = WorldList.sorted[arg2]; + WorldList.sorted[arg2] = local19; for (@Pc(31) int local31 = arg4; local31 < arg2; local31++) { - if (Static164.method3115(local19, Static101.worlds[local31], arg0, arg1, arg3, arg5) <= 0) { - @Pc(53) World local53 = Static101.worlds[local31]; - Static101.worlds[local31] = Static101.worlds[local15]; - Static101.worlds[local15++] = local53; + if (Static164.method3115(local19, WorldList.sorted[local31], arg0, arg1, arg3, arg5) <= 0) { + @Pc(53) World local53 = WorldList.sorted[local31]; + WorldList.sorted[local31] = WorldList.sorted[local15]; + WorldList.sorted[local15++] = local53; } } - Static101.worlds[arg2] = Static101.worlds[local15]; - Static101.worlds[local15] = local19; + WorldList.sorted[arg2] = WorldList.sorted[local15]; + WorldList.sorted[local15] = local19; method1697(arg0, arg1, local15 - 1, arg3, arg4, arg5); method1697(arg0, arg1, arg2, arg3, local15 + 1, arg5); } @@ -58,44 +55,13 @@ public final class Static79 { if (arg2 < 3 && (Static12.tileSettings[1][arg1][arg4] & 0x2) == 2) { local39 = arg2 + 1; } - Static43.method1144(arg4, arg1, arg2, arg6, local39, Static148.collisionMaps[arg2]); + Static43.method1144(arg4, arg1, arg2, arg6, local39, PathFinder.collisionMaps[arg2]); if (arg0 >= 0) { @Pc(92) boolean local92 = Preferences.showGroundDecorations; Preferences.showGroundDecorations = true; - Static185.method3397(local39, false, arg2, false, Static148.collisionMaps[arg2], arg0, arg5, arg1, arg4, arg3); + Static185.method3397(local39, false, arg2, false, PathFinder.collisionMaps[arg2], arg0, arg5, arg1, arg4, arg3); Preferences.showGroundDecorations = local92; } } - @OriginalMember(owner = "client!ge", name = "a", descriptor = "(IJ)Lclient!na;") - public static JagString decode37(@OriginalArg(1) long arg0) { - if (arg0 <= 0L || arg0 >= 6582952005840035281L) { - return null; - } else if (arg0 % 37L == 0L) { - return null; - } else { - @Pc(32) int local32 = 0; - @Pc(34) long local34 = arg0; - while (local34 != 0L) { - local34 /= 37L; - local32++; - } - @Pc(48) byte[] local48 = new byte[local32]; - while (arg0 != 0L) { - @Pc(65) long local65 = arg0; - arg0 /= 37L; - local32--; - local48[local32] = Static31.aByteArray12[(int) (local65 - arg0 * 37L)]; - } - @Pc(88) JagString local88 = new JagString(); - local88.chars = local48; - local88.length = local48.length; - return local88; - } - } - - @OriginalMember(owner = "client!ge", name = "a", descriptor = "(BLclient!ve;)V") - public static void init(@OriginalArg(1) Js5 arg0) { - Static167.aClass153_62 = arg0; - } } diff --git a/client/src/main/java/Static8.java b/client/src/main/java/Static8.java index 314ad78..7540d05 100644 --- a/client/src/main/java/Static8.java +++ b/client/src/main/java/Static8.java @@ -11,7 +11,7 @@ public final class Static8 { public static int[] anIntArray8; @OriginalMember(owner = "client!aj", name = "R", descriptor = "Lclient!na;") - public static final JagString aClass100_32 = Static28.parse(""); + public static final JagString aClass100_32 = JagString.parse(""); @OriginalMember(owner = "client!aj", name = "a", descriptor = "(BILclient!be;)I") public static int method118(@OriginalArg(1) int arg0, @OriginalArg(2) Component arg1) { @@ -24,11 +24,6 @@ public final class Static8 { } } - @OriginalMember(owner = "client!aj", name = "c", descriptor = "(II)V") - public static void method119() { - Static233.aClass99_31.method3102(5); - } - @OriginalMember(owner = "client!aj", name = "a", descriptor = "(IIIZIII)V") public static void method120(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { Static251.method4278(arg4); @@ -116,8 +111,8 @@ public final class Static8 { @OriginalMember(owner = "client!aj", name = "i", descriptor = "(I)V") public static void method121() { - for (@Pc(3) int local3 = 0; local3 < Static165.anInt4043; local3++) { - @Pc(19) VarpType local19 = Static247.method4248(local3); + for (@Pc(3) int local3 = 0; local3 < VarpTypeList.anInt4043; local3++) { + @Pc(19) VarpType local19 = VarpTypeList.get(local3); if (local19 != null && local19.clientCode == 0) { Static106.anIntArray257[local3] = 0; Static7.varps[local3] = 0; diff --git a/client/src/main/java/Static80.java b/client/src/main/java/Static80.java index 466e60a..db90b2b 100644 --- a/client/src/main/java/Static80.java +++ b/client/src/main/java/Static80.java @@ -14,13 +14,10 @@ public final class Static80 { public static int[][][] underWaterTileHeightMap; @OriginalMember(owner = "client!gf", name = "R", descriptor = "I") - public static int anInt4701; - - @OriginalMember(owner = "client!gf", name = "T", descriptor = "I") - public static int anInt4702; + public static int centralZoneX; @OriginalMember(owner = "client!gf", name = "I", descriptor = "Lclient!na;") - public static final JagString aClass100_886 = Static28.parse(")3runescape)3com)4l="); + public static final JagString aClass100_886 = JagString.parse(")3runescape)3com)4l="); @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 }; @@ -33,22 +30,22 @@ public final class Static80 { @OriginalMember(owner = "client!gf", name = "a", descriptor = "(BII)V") public static void method3616(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { 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); + @Pc(24) int local24 = WorldMap.anInt3482 - (int) ((float) WorldMap.component.anInt445 / WorldMap.zoom); + @Pc(33) int local33 = WorldMap.anInt3482 + (int) ((float) WorldMap.component.anInt445 / WorldMap.zoom); if (local24 < 0) { - WorldMap.anInt3482 = (int) ((float) Static24.component.anInt445 / WorldMap.zoom); + WorldMap.anInt3482 = (int) ((float) WorldMap.component.anInt445 / WorldMap.zoom); } 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); + @Pc(61) int local61 = (int) ((float) WorldMap.component.anInt459 / WorldMap.zoom) + WorldMap.anInt4901; + @Pc(70) int local70 = WorldMap.anInt4901 - (int) ((float) WorldMap.component.anInt459 / WorldMap.zoom); if (local33 > WorldMap.width) { - WorldMap.anInt3482 = WorldMap.width - (int) ((float) Static24.component.anInt445 / WorldMap.zoom); + WorldMap.anInt3482 = WorldMap.width - (int) ((float) WorldMap.component.anInt445 / WorldMap.zoom); } if (local70 < 0) { - WorldMap.anInt4901 = (int) ((float) Static24.component.anInt459 / WorldMap.zoom); + WorldMap.anInt4901 = (int) ((float) WorldMap.component.anInt459 / WorldMap.zoom); } if (WorldMap.length < local61) { - WorldMap.anInt4901 = WorldMap.length - (int) ((float) Static24.component.anInt459 / WorldMap.zoom); + WorldMap.anInt4901 = WorldMap.length - (int) ((float) WorldMap.component.anInt459 / WorldMap.zoom); } } diff --git a/client/src/main/java/Static81.java b/client/src/main/java/Static81.java index ed020e3..bf63ca2 100644 --- a/client/src/main/java/Static81.java +++ b/client/src/main/java/Static81.java @@ -9,17 +9,14 @@ public final class Static81 { @OriginalMember(owner = "client!gg", name = "Z", descriptor = "I") public static int anInt2222; - @OriginalMember(owner = "client!gg", name = "ab", descriptor = "Lclient!ve;") - public static Js5 aClass153_34; - @OriginalMember(owner = "client!gg", name = "bb", descriptor = "I") public static int cameraX; @OriginalMember(owner = "client!gg", name = "W", descriptor = "Lclient!na;") - public static final JagString aClass100_475 = Static28.parse("null"); + public static final JagString aClass100_475 = JagString.parse("null"); @OriginalMember(owner = "client!gg", name = "Y", descriptor = "Lclient!na;") - public static final JagString aClass100_476 = Static28.parse("::gc"); + public static final JagString aClass100_476 = JagString.parse("::gc"); @OriginalMember(owner = "client!gg", name = "db", descriptor = "I") public static int anInt2225 = -1; @@ -33,7 +30,7 @@ public final class Static81 { return; } if (arg0 != -1) { - @Pc(24) CursorType local24 = Static202.method3660(arg0); + @Pc(24) CursorType local24 = CursorTypeList.get(arg0); @Pc(28) SoftwareSprite local28 = local24.getSprite(); if (local28 == null) { arg0 = -1; @@ -53,27 +50,12 @@ public final class Static81 { Static71.anIntArrayArray10 = arg0; } - @OriginalMember(owner = "client!gg", name = "d", descriptor = "(II)Lclient!dm;") - public static IdkType method1752(@OriginalArg(0) int arg0) { - @Pc(10) IdkType local10 = (IdkType) Static67.aClass99_20.get((long) arg0); - if (local10 != null) { - return local10; - } - @Pc(21) byte[] local21 = Static216.aClass153_31.getFile(3, arg0); - local10 = new IdkType(); - if (local21 != null) { - local10.decode(new Buffer(local21)); - } - Static67.aClass99_20.put(local10, (long) arg0); - return local10; - } - @OriginalMember(owner = "client!gg", name = "e", descriptor = "(II)V") public static void method1753(@OriginalArg(0) int arg0) { - if (!Static245.load(arg0)) { + if (!InterfaceList.load(arg0)) { return; } - @Pc(15) Component[] local15 = Static241.components[arg0]; + @Pc(15) Component[] local15 = InterfaceList.components[arg0]; for (@Pc(17) int local17 = 0; local17 < local15.length; local17++) { @Pc(29) Component local29 = local15[local17]; if (local29 != null) { @@ -84,11 +66,6 @@ public final class Static81 { } } - @OriginalMember(owner = "client!gg", name = "a", descriptor = "(ILclient!ve;)V") - public static void init(@OriginalArg(1) Js5 arg0) { - Static138.anInt3443 = arg0.getGroupId(Static12.aClass100_73); - } - @OriginalMember(owner = "client!gg", name = "a", descriptor = "(Z)V") public static void method1756() { // todo: consolidate/rename static classes @@ -97,10 +74,10 @@ public final class Static81 { } if (Static60.rebootTimer > 1) { Static60.rebootTimer--; - Static209.miscTransmitAt = Static119.transmitTimer; + Static209.miscTransmitAt = InterfaceList.transmitTimer; } - if (Static224.aBoolean247) { - Static224.aBoolean247 = false; + if (LoginManager.aBoolean247) { + LoginManager.aBoolean247 = false; Static175.method3279(); return; } @@ -109,7 +86,7 @@ public final class Static81 { if (client.gameState != 30) { return; } - Static233.loop(Static6.outboundBuffer); // ReflectionCheck + Static233.loop(Protocol.outboundBuffer); // ReflectionCheck @Pc(60) Object mouseRecorder = MouseRecorder.instance.lock; @Pc(86) int offset; @Pc(79) int samples; @@ -119,14 +96,14 @@ public final class Static81 { @Pc(182) int dx; @Pc(189) int dy; synchronized (mouseRecorder) { - if (!Static245.enabled) { + if (!MouseRecorder.enabled) { MouseRecorder.instance.samples = 0; } else if (Static150.clickButton != 0 || MouseRecorder.instance.samples >= 40) { - Static6.outboundBuffer.p1isaac(123); + Protocol.outboundBuffer.p1isaac(123); samples = 0; - Static6.outboundBuffer.p1(0); - offset = Static6.outboundBuffer.offset; - for (i = 0; MouseRecorder.instance.samples > i && Static6.outboundBuffer.offset - offset < 240; i++) { + Protocol.outboundBuffer.p1(0); + offset = Protocol.outboundBuffer.offset; + for (i = 0; MouseRecorder.instance.samples > i && Protocol.outboundBuffer.offset - offset < 240; i++) { samples++; y = MouseRecorder.instance.y[i]; x = MouseRecorder.instance.x[i]; @@ -154,28 +131,28 @@ public final class Static81 { if (Static204.anInt4762 < 8 && dx >= -32 && dx <= 31 && dy >= -32 && dy <= 31) { dy += 32; dx += 32; - Static6.outboundBuffer.p2(dy + (Static204.anInt4762 << 12) + (dx << 6)); + Protocol.outboundBuffer.p2(dy + (Static204.anInt4762 << 12) + (dx << 6)); Static204.anInt4762 = 0; } else if (Static204.anInt4762 < 32 && dx >= -128 && dx <= 127 && dy >= -128 && dy <= 127) { - Static6.outboundBuffer.p1(Static204.anInt4762 + 128); + Protocol.outboundBuffer.p1(Static204.anInt4762 + 128); dy += 128; dx += 128; - Static6.outboundBuffer.p2((dx << 8) + dy); + Protocol.outboundBuffer.p2((dx << 8) + dy); Static204.anInt4762 = 0; } else if (Static204.anInt4762 < 32) { - Static6.outboundBuffer.p1(Static204.anInt4762 + 192); + Protocol.outboundBuffer.p1(Static204.anInt4762 + 192); if (outsideWindow) { - Static6.outboundBuffer.p4(Integer.MIN_VALUE); + Protocol.outboundBuffer.p4(Integer.MIN_VALUE); } else { - Static6.outboundBuffer.p4(x | y << 16); + Protocol.outboundBuffer.p4(x | y << 16); } Static204.anInt4762 = 0; } else { - Static6.outboundBuffer.p2(Static204.anInt4762 + 57344); + Protocol.outboundBuffer.p2(Static204.anInt4762 + 57344); if (outsideWindow) { - Static6.outboundBuffer.p4(Integer.MIN_VALUE); + Protocol.outboundBuffer.p4(Integer.MIN_VALUE); } else { - Static6.outboundBuffer.p4(x | y << 16); + Protocol.outboundBuffer.p4(x | y << 16); } Static204.anInt4762 = 0; } @@ -183,7 +160,7 @@ public final class Static81 { Static204.anInt4762++; } } - Static6.outboundBuffer.p1len(Static6.outboundBuffer.offset - offset); + Protocol.outboundBuffer.p1len(Protocol.outboundBuffer.offset - offset); if (MouseRecorder.instance.samples > samples) { MouseRecorder.instance.samples -= samples; for (i = 0; i < MouseRecorder.instance.samples; i++) { @@ -218,16 +195,16 @@ public final class Static81 { if (Static150.clickButton == 2) { button = 1; } - Static6.outboundBuffer.p1isaac(75); - Static6.outboundBuffer.p2leadd(button << 15 | x); - Static6.outboundBuffer.p4me(i | samples << 16); + Protocol.outboundBuffer.p1isaac(75); + Protocol.outboundBuffer.p2leadd(button << 15 | x); + Protocol.outboundBuffer.p4me(i | samples << 16); } if (Static16.anInt551 > 0) { Static16.anInt551--; } if (Preferences.aBoolean63) { - for (i = 0; i < Static182.keyQueueSize; i++) { - offset = Static227.keyCodes[i]; + for (i = 0; i < InterfaceList.keyQueueSize; i++) { + offset = InterfaceList.keyCodes[i]; if (offset == 98 || offset == 99 || offset == 96 || offset == 97) { Static197.aBoolean228 = true; break; @@ -239,24 +216,24 @@ public final class Static81 { if (Static197.aBoolean228 && Static16.anInt551 <= 0) { Static16.anInt551 = 20; Static197.aBoolean228 = false; - Static6.outboundBuffer.p1isaac(21); - Static6.outboundBuffer.p2add((int)Camera.pitchTarget); - Static6.outboundBuffer.p2le((int)Camera.yawTarget); + Protocol.outboundBuffer.p1isaac(21); + Protocol.outboundBuffer.p2add((int)Camera.pitchTarget); + Protocol.outboundBuffer.p2le((int)Camera.yawTarget); } if (GameShell.focus && !Static67.prevFocus) { Static67.prevFocus = true; - Static6.outboundBuffer.p1isaac(22); - Static6.outboundBuffer.p1(1); + Protocol.outboundBuffer.p1isaac(22); + Protocol.outboundBuffer.p1(1); } if (!GameShell.focus && Static67.prevFocus) { Static67.prevFocus = false; - Static6.outboundBuffer.p1isaac(22); - Static6.outboundBuffer.p1(0); + Protocol.outboundBuffer.p1isaac(22); + Protocol.outboundBuffer.p1(0); } - if (!Static18.serverUpdatedPreferences) { - Static6.outboundBuffer.p1isaac(98); - Static6.outboundBuffer.p4(Static145.method2746()); - Static18.serverUpdatedPreferences = true; + if (!Preferences.sentToServer) { + Protocol.outboundBuffer.p1isaac(98); + Protocol.outboundBuffer.p4(Preferences.toInt()); + Preferences.sentToServer = true; } Static31.method846(); if (client.gameState != 30) { @@ -273,7 +250,7 @@ public final class Static81 { Static71.method1444(); Static109.method2274(); Static19.loop(); // OverheadChat - if (Static24.component != null) { + if (WorldMap.component != null) { Static12.method447(); } // VarpDomain @@ -295,13 +272,13 @@ public final class Static81 { } else { @Pc(773) Component component; if (samples == 3) { - component = Static5.getComponent(i); + component = InterfaceList.getComponent(i); if (!change.stringArg.strEquals(component.aClass100_84)) { component.aClass100_84 = change.stringArg; Static43.redraw(component); } } else if (samples == 4) { - component = Static5.getComponent(i); + component = InterfaceList.getComponent(i); x = change.intArg1; dx = change.intArg2; modelId = change.intArg3; @@ -312,7 +289,7 @@ public final class Static81 { Static43.redraw(component); } } else if (samples == 5) { - component = Static5.getComponent(i); + component = InterfaceList.getComponent(i); if (component.anInt522 != change.intArg1 || change.intArg1 == -1) { component.anInt496 = 1; component.anInt500 = 0; @@ -325,14 +302,14 @@ public final class Static81 { x = y >> 10 & 0x1F; dx = y & 0x1F; modelId = y >> 5 & 0x1F; - @Pc(1189) Component local1189 = Static5.getComponent(i); + @Pc(1189) Component local1189 = InterfaceList.getComponent(i); dy = (dx << 3) + (modelId << 11) + (x << 19); if (dy != local1189.anInt474) { local1189.anInt474 = dy; Static43.redraw(local1189); } } else if (samples == 7) { - component = Static5.getComponent(i); + component = InterfaceList.getComponent(i); // todo: this should not be necessary, data/server-related? if (component != null) { @Pc(1145) boolean hidden = change.intArg1 == 1; @@ -342,7 +319,7 @@ public final class Static81 { } } } else if (samples == 8) { - component = Static5.getComponent(i); + component = InterfaceList.getComponent(i); if (change.intArg1 != component.modelXAngle || component.modelYAngle != change.intArg3 || change.intArg2 != component.modelZoom) { component.modelXAngle = change.intArg1; component.modelZoom = change.intArg2; @@ -357,14 +334,14 @@ public final class Static81 { Static43.redraw(component); } } else if (samples == 9) { - component = Static5.getComponent(i); + component = InterfaceList.getComponent(i); if (change.intArg1 != component.objId || component.objCount != change.intArg3) { component.objId = change.intArg1; component.objCount = change.intArg3; Static43.redraw(component); } } else if (samples == 10) { - component = Static5.getComponent(i); + component = InterfaceList.getComponent(i); if (component.modelXOffset != change.intArg1 || change.intArg3 != component.modelZOffset || component.modelYOffset != change.intArg2) { component.modelZOffset = change.intArg3; component.modelYOffset = change.intArg2; @@ -372,14 +349,14 @@ public final class Static81 { Static43.redraw(component); } } else if (samples == 11) { - component = Static5.getComponent(i); + component = InterfaceList.getComponent(i); component.x = component.baseX = change.intArg1; component.yMode = 0; component.xMode = 0; component.y = component.baseY = change.intArg3; Static43.redraw(component); } else if (samples == 12) { - component = Static5.getComponent(i); + component = InterfaceList.getComponent(i); x = change.intArg1; if (component != null && component.type == 0) { if (x > component.anInt491 - component.anInt459) { @@ -394,7 +371,7 @@ public final class Static81 { } } } else if (samples == 13) { - component = Static5.getComponent(i); + component = InterfaceList.getComponent(i); component.modelRotationSpeed = change.intArg1; } } @@ -454,11 +431,11 @@ public final class Static81 { } else { local1361.swapObjs(Static18.anInt588, Static4.anInt36); } - Static6.outboundBuffer.p1isaac(231); - Static6.outboundBuffer.p2(Static4.anInt36); - Static6.outboundBuffer.p4le2(Static118.aClass13_15.id); - Static6.outboundBuffer.p2add(Static18.anInt588); - Static6.outboundBuffer.p1sub(local1363); + Protocol.outboundBuffer.p1isaac(231); + Protocol.outboundBuffer.p2(Static4.anInt36); + Protocol.outboundBuffer.p4le2(Static118.aClass13_15.id); + Protocol.outboundBuffer.p2add(Static18.anInt588); + Protocol.outboundBuffer.p1sub(local1363); } } else if ((Static116.anInt2952 == 1 || Static277.method4640(Static231.anInt5204 - 1)) && Static231.anInt5204 > 2) { Static226.method3901(); @@ -473,22 +450,22 @@ public final class Static81 { Static146.aBoolean174 = false; Static56.aClass13_12 = null; Static44.aBoolean83 = false; - Static182.keyQueueSize = 0; + InterfaceList.keyQueueSize = 0; local1361 = Static180.aClass13_22; Static180.aClass13_22 = null; @Pc(1508) Component local1508 = Static43.aClass13_11; Static43.aClass13_11 = null; - while (Keyboard.nextKey() && Static182.keyQueueSize < 128) { - Static227.keyCodes[Static182.keyQueueSize] = Keyboard.keyCode; - Static205.keyChars[Static182.keyQueueSize] = Keyboard.keyChar; - Static182.keyQueueSize++; + while (Keyboard.nextKey() && InterfaceList.keyQueueSize < 128) { + InterfaceList.keyCodes[InterfaceList.keyQueueSize] = Keyboard.keyCode; + InterfaceList.keyChars[InterfaceList.keyQueueSize] = Keyboard.keyChar; + InterfaceList.keyQueueSize++; } // WorldMap.component - Static24.component = null; + WorldMap.component = null; if (InterfaceList.topLevelInterface != -1) { Static57.method1320(0, 0, 0, GameShell.canvasWidth, InterfaceList.topLevelInterface, 0, GameShell.canvasHeight); } - Static119.transmitTimer++; + InterfaceList.transmitTimer++; while (true) { @Pc(1569) Component priorityComponent; @Pc(1560) Component prioritySource; @@ -504,13 +481,13 @@ public final class Static81 { do { priorityRequest = (HookRequest) InterfaceList.lowPriorityRequests.removeHead(); if (priorityRequest == null) { - if (Static24.component == null) { + if (WorldMap.component == null) { Static137.anInt3337 = 0; } if (Static105.aClass13_14 != null) { Static4.method28(); } - if (Static191.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && Static58.wheelRotation != 0) { + if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && Static58.wheelRotation != 0) { y = Static55.level - Static58.wheelRotation; if (y < 0) { y = 0; @@ -520,7 +497,7 @@ public final class Static81 { // Cheat 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 (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) { if (Static56.anInt1742 != -1) { Static61.teleport(Static225.originX + Static56.anInt1742, Static142.originZ - -Static116.anInt2954, Static55.level); } @@ -528,11 +505,11 @@ public final class Static81 { Static125.anInt3096 = 0; } else if (Static125.anInt3096 == 2) { if (Static56.anInt1742 != -1) { - Static6.outboundBuffer.p1isaac(131); - Static6.outboundBuffer.p4me(Static98.anInt2512); - Static6.outboundBuffer.p2add(Static225.originX + Static56.anInt1742); - Static6.outboundBuffer.p2leadd(Static15.anInt506); - Static6.outboundBuffer.p2add(Static116.anInt2954 + Static142.originZ); + Protocol.outboundBuffer.p1isaac(131); + Protocol.outboundBuffer.p4me(Static98.anInt2512); + Protocol.outboundBuffer.p2add(Static225.originX + Static56.anInt1742); + Protocol.outboundBuffer.p2leadd(Static15.anInt506); + Protocol.outboundBuffer.p2add(Static116.anInt2954 + Static142.originZ); Static70.type = 1; Static17.milliseconds = 0; Static25.y = Static60.clickY; @@ -541,9 +518,9 @@ public final class Static81 { Static125.anInt3096 = 0; } else if (Static187.anInt4422 == 2) { if (Static56.anInt1742 != -1) { - Static6.outboundBuffer.p1isaac(179); - Static6.outboundBuffer.p2(Static142.originZ + Static116.anInt2954); - Static6.outboundBuffer.p2(Static56.anInt1742 + Static225.originX); + Protocol.outboundBuffer.p1isaac(179); + Protocol.outboundBuffer.p2(Static142.originZ + Static116.anInt2954); + Protocol.outboundBuffer.p2(Static56.anInt1742 + Static225.originX); Static17.milliseconds = 0; Static70.type = 1; Static122.x = Static7.clickX; @@ -602,7 +579,7 @@ public final class Static81 { if (y > 15000 && x > 15000) { Static267.anInt5775 = 250; Static48.setIdleLoops(14500); - Static6.outboundBuffer.p1isaac(245); + Protocol.outboundBuffer.p1isaac(245); } if (Static33.openUrlRequest != null && Static33.openUrlRequest.status == 1) { if (Static33.openUrlRequest.result != null) { @@ -669,17 +646,17 @@ public final class Static81 { Static263.anInt5755 = -2; } if (Static131.anInt3251 > 50) { - Static6.outboundBuffer.p1isaac(93); + Protocol.outboundBuffer.p1isaac(93); } if (Static34.verifyIdChanged) { Static71.transmitVerifyId(); Static34.verifyIdChanged = false; } try { - if (Protocol.socket != null && Static6.outboundBuffer.offset > 0) { - Protocol.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); + if (Protocol.socket != null && Protocol.outboundBuffer.offset > 0) { + Protocol.socket.write(Protocol.outboundBuffer.data, Protocol.outboundBuffer.offset); Static131.anInt3251 = 0; - Static6.outboundBuffer.offset = 0; + Protocol.outboundBuffer.offset = 0; } } catch (@Pc(2266) IOException local2266) { Static175.method3279(); @@ -690,7 +667,7 @@ public final class Static81 { if (prioritySource.createdComponentId < 0) { break; } - priorityComponent = Static5.getComponent(prioritySource.layer); + priorityComponent = InterfaceList.getComponent(prioritySource.layer); } while (priorityComponent == null || priorityComponent.createdComponents == null || prioritySource.createdComponentId >= priorityComponent.createdComponents.length || prioritySource != priorityComponent.createdComponents[prioritySource.createdComponentId]); Static82.method1767(priorityRequest); } @@ -699,7 +676,7 @@ public final class Static81 { if (prioritySource.createdComponentId < 0) { break; } - priorityComponent = Static5.getComponent(prioritySource.layer); + priorityComponent = InterfaceList.getComponent(prioritySource.layer); } while (priorityComponent == null || priorityComponent.createdComponents == null || priorityComponent.createdComponents.length <= prioritySource.createdComponentId || priorityComponent.createdComponents[prioritySource.createdComponentId] != prioritySource); Static82.method1767(priorityRequest); } @@ -708,7 +685,7 @@ public final class Static81 { if (prioritySource.createdComponentId < 0) { break; } - priorityComponent = Static5.getComponent(prioritySource.layer); + priorityComponent = InterfaceList.getComponent(prioritySource.layer); } while (priorityComponent == null || priorityComponent.createdComponents == null || prioritySource.createdComponentId >= priorityComponent.createdComponents.length || priorityComponent.createdComponents[prioritySource.createdComponentId] != prioritySource); Static82.method1767(priorityRequest); } diff --git a/client/src/main/java/Static82.java b/client/src/main/java/Static82.java index 501c906..541ecbd 100644 --- a/client/src/main/java/Static82.java +++ b/client/src/main/java/Static82.java @@ -3,10 +3,7 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static82 { - @OriginalMember(owner = "client!gi", name = "c", descriptor = "I") - public static int anInt2231 = 0; - - @OriginalMember(owner = "client!gi", name = "H", descriptor = "I") + @OriginalMember(owner = "client!gi", name = "H", descriptor = "I") public static int anInt2252 = 0; @OriginalMember(owner = "client!gi", name = "a", descriptor = "(IIIIB)V") diff --git a/client/src/main/java/Static83.java b/client/src/main/java/Static83.java index 0f0cd37..cb1a634 100644 --- a/client/src/main/java/Static83.java +++ b/client/src/main/java/Static83.java @@ -10,9 +10,6 @@ public final class Static83 { @OriginalMember(owner = "client!gj", name = "d", descriptor = "I") public static int loop = 0; - @OriginalMember(owner = "client!gj", name = "p", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_3 = new SoftLruHashTable(64); - @OriginalMember(owner = "client!gj", name = "q", descriptor = "[I") public static final int[] updatedVarps = new int[32]; diff --git a/client/src/main/java/Static84.java b/client/src/main/java/Static84.java index 560b9a8..de5d17d 100644 --- a/client/src/main/java/Static84.java +++ b/client/src/main/java/Static84.java @@ -7,10 +7,7 @@ public final class Static84 { @OriginalMember(owner = "client!gk", name = "d", descriptor = "F") public static float aFloat10; - @OriginalMember(owner = "client!gk", name = "e", descriptor = "Lclient!ve;") - public static Js5 aClass153_35; - - @OriginalMember(owner = "client!gk", name = "c", descriptor = "[I") + @OriginalMember(owner = "client!gk", name = "c", descriptor = "[I") public static final int[] anIntArray209 = new int[4096]; @OriginalMember(owner = "client!gk", name = "g", descriptor = "Z") @@ -28,16 +25,16 @@ public final class Static84 { @Pc(17) int local17; @Pc(24) int local24; if ((arg0 & 0x80) != 0) { - local13 = Static57.aClass3_Sub15_Sub1_3.g2le(); - local17 = Static57.aClass3_Sub15_Sub1_3.g1(); - @Pc(21) int local21 = Static57.aClass3_Sub15_Sub1_3.g1(); - local24 = Static57.aClass3_Sub15_Sub1_3.offset; + local13 = Protocol.inboundBuffer.g2le(); + local17 = Protocol.inboundBuffer.g1(); + @Pc(21) int local21 = Protocol.inboundBuffer.g1(); + local24 = Protocol.inboundBuffer.offset; @Pc(35) boolean local35 = (local13 & 0x8000) != 0; if (arg2.aClass100_364 != null && arg2.appearance != null) { @Pc(48) long local48 = arg2.aClass100_364.encode37(); @Pc(50) boolean local50 = false; if (local17 <= 1) { - if (!local35 && (Static124.aBoolean157 && !Static207.aBoolean236 || Static86.aBoolean129)) { + if (!local35 && (LoginManager.playerUnderage && !LoginManager.parentalChatConsent || LoginManager.mapQuickChat)) { local50 = true; } else { for (@Pc(69) int local69 = 0; local69 < Static35.anInt1093; local69++) { @@ -49,18 +46,18 @@ public final class Static84 { } } if (!local50 && Static11.anInt384 == 0) { - Static270.aClass3_Sub15_9.offset = 0; - Static57.aClass3_Sub15_Sub1_3.gBytesRev(local21, Static270.aClass3_Sub15_9.data); - Static270.aClass3_Sub15_9.offset = 0; + Protocol.chatBuffer.offset = 0; + Protocol.inboundBuffer.gBytesRev(local21, Protocol.chatBuffer.data); + Protocol.chatBuffer.offset = 0; @Pc(106) int local106 = -1; @Pc(127) JagString local127; if (local35) { - @Pc(112) QuickChatPhrase local112 = Static264.method3568(Static270.aClass3_Sub15_9); + @Pc(112) QuickChatPhrase local112 = Static264.method3568(Protocol.chatBuffer); local13 &= 0x7FFF; local106 = local112.anInt439; - local127 = local112.aClass3_Sub2_Sub6_1.method770(Static270.aClass3_Sub15_9); + local127 = local112.aClass3_Sub2_Sub6_1.method770(Protocol.chatBuffer); } else { - local127 = Static218.method2862(Static65.method1497(Static270.aClass3_Sub15_9).method3116()); + local127 = Static218.method2862(Static65.method1497(Protocol.chatBuffer).method3116()); } arg2.aClass100_640 = local127.method3144(); arg2.anInt3352 = local13 & 0xFF; @@ -75,50 +72,50 @@ public final class Static84 { } } } - Static57.aClass3_Sub15_Sub1_3.offset = local24 + local21; + Protocol.inboundBuffer.offset = local24 + local21; } if ((arg0 & 0x1) != 0) { - local13 = Static57.aClass3_Sub15_Sub1_3.gSmart1or2(); - local17 = Static57.aClass3_Sub15_Sub1_3.g1add(); + local13 = Protocol.inboundBuffer.gSmart1or2(); + local17 = Protocol.inboundBuffer.g1add(); arg2.method2686(local17, Static83.loop, local13); arg2.anInt3378 = Static83.loop + 300; - arg2.anInt3372 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); + arg2.anInt3372 = Protocol.inboundBuffer.g1ssub(); } if ((arg0 & 0x8) != 0) { - local13 = Static57.aClass3_Sub15_Sub1_3.g2(); + local13 = Protocol.inboundBuffer.g2(); if (local13 == 65535) { local13 = -1; } - local17 = Static57.aClass3_Sub15_Sub1_3.g1(); + local17 = Protocol.inboundBuffer.g1(); Player.animate(local17, local13, arg2); } if ((arg0 & 0x4) != 0) { - local13 = Static57.aClass3_Sub15_Sub1_3.g1add(); + local13 = Protocol.inboundBuffer.g1add(); @Pc(309) byte[] local309 = new byte[local13]; @Pc(314) Buffer local314 = new Buffer(local309); - Static57.aClass3_Sub15_Sub1_3.gBytes(local13, local309); + Protocol.inboundBuffer.gBytes(local13, local309); Static115.aClass3_Sub15Array1[arg1] = local314; arg2.method1262(local314); } if ((arg0 & 0x2) != 0) { - arg2.anInt3370 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + arg2.anInt3370 = Protocol.inboundBuffer.g2sub(); if (arg2.anInt3370 == 65535) { arg2.anInt3370 = -1; } } if ((arg0 & 0x400) != 0) { - arg2.anInt3380 = Static57.aClass3_Sub15_Sub1_3.p1neg(); - arg2.anInt3428 = Static57.aClass3_Sub15_Sub1_3.g1(); - arg2.anInt3416 = Static57.aClass3_Sub15_Sub1_3.g1add(); - arg2.anInt3392 = Static57.aClass3_Sub15_Sub1_3.g1(); - arg2.anInt3395 = Static57.aClass3_Sub15_Sub1_3.g2le() + Static83.loop; - arg2.anInt3386 = Static57.aClass3_Sub15_Sub1_3.g2le() + Static83.loop; - arg2.anInt3431 = Static57.aClass3_Sub15_Sub1_3.p1neg(); + arg2.anInt3380 = Protocol.inboundBuffer.p1neg(); + arg2.anInt3428 = Protocol.inboundBuffer.g1(); + arg2.anInt3416 = Protocol.inboundBuffer.g1add(); + arg2.anInt3392 = Protocol.inboundBuffer.g1(); + arg2.anInt3395 = Protocol.inboundBuffer.g2le() + Static83.loop; + arg2.anInt3386 = Protocol.inboundBuffer.g2le() + Static83.loop; + arg2.anInt3431 = Protocol.inboundBuffer.p1neg(); arg2.movementQueueSize = 1; arg2.anInt3405 = 0; } if ((arg0 & 0x20) != 0) { - arg2.aClass100_640 = Static57.aClass3_Sub15_Sub1_3.gjstr(); + arg2.aClass100_640 = Protocol.inboundBuffer.gjstr(); if (arg2.aClass100_640.charAt(0) == 126) { arg2.aClass100_640 = arg2.aClass100_640.substring(1); Static103.method2231(arg2.method1264(), 2, arg2.aClass100_640); @@ -130,34 +127,34 @@ public final class Static84 { arg2.anInt3408 = 150; } if ((arg0 & 0x200) != 0) { - local13 = Static57.aClass3_Sub15_Sub1_3.gSmart1or2(); - local17 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); + local13 = Protocol.inboundBuffer.gSmart1or2(); + local17 = Protocol.inboundBuffer.g1ssub(); arg2.method2686(local17, Static83.loop, local13); } if ((arg0 & 0x800) != 0) { - local13 = Static57.aClass3_Sub15_Sub1_3.p1neg(); + local13 = Protocol.inboundBuffer.p1neg(); @Pc(502) int[] local502 = new int[local13]; @Pc(505) int[] local505 = new int[local13]; @Pc(508) int[] local508 = new int[local13]; for (@Pc(510) int local510 = 0; local510 < local13; local510++) { - @Pc(521) int local521 = Static57.aClass3_Sub15_Sub1_3.g2le(); + @Pc(521) int local521 = Protocol.inboundBuffer.g2le(); if (local521 == 65535) { local521 = -1; } local502[local510] = local521; - local505[local510] = Static57.aClass3_Sub15_Sub1_3.g1add(); - local508[local510] = Static57.aClass3_Sub15_Sub1_3.g2(); + local505[local510] = Protocol.inboundBuffer.g1add(); + local508[local510] = Protocol.inboundBuffer.g2(); } Static32.method865(local505, local502, arg2, local508); } if ((arg0 & 0x100) != 0) { - local13 = Static57.aClass3_Sub15_Sub1_3.g2le(); + local13 = Protocol.inboundBuffer.g2le(); if (local13 == 65535) { local13 = -1; } - local17 = Static57.aClass3_Sub15_Sub1_3.p4rme(); + local17 = Protocol.inboundBuffer.p4rme(); @Pc(573) boolean local573 = true; - if (local13 != -1 && arg2.anInt3432 != -1 && Static36.get(Static34.method877(local13).seqId).anInt5355 < Static36.get(Static34.method877(arg2.anInt3432).seqId).anInt5355) { + if (local13 != -1 && arg2.anInt3432 != -1 && SeqTypeList.get(SpotAnimTypeList.get(local13).seqId).anInt5355 < SeqTypeList.get(SpotAnimTypeList.get(arg2.anInt3432).seqId).anInt5355) { local573 = false; } if (local573) { @@ -171,9 +168,9 @@ public final class Static84 { arg2.anInt3394 = local17 >> 16; arg2.anInt3418 = 1; if (arg2.anInt3432 != -1 && Static83.loop == arg2.anInt3359) { - local24 = Static34.method877(arg2.anInt3432).seqId; + local24 = SpotAnimTypeList.get(arg2.anInt3432).seqId; if (local24 != -1) { - @Pc(663) SeqType local663 = Static36.get(local24); + @Pc(663) SeqType local663 = SeqTypeList.get(local24); if (local663 != null && local663.frames != null) { SoundPlayer.playSeqSound(arg2.zFine, local663, arg2.xFine, arg2 == PlayerList.self, 0); } @@ -182,8 +179,8 @@ public final class Static84 { } } if ((arg0 & 0x40) != 0) { - arg2.anInt3382 = Static57.aClass3_Sub15_Sub1_3.g2(); - arg2.anInt3363 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); + arg2.anInt3382 = Protocol.inboundBuffer.g2(); + arg2.anInt3363 = Protocol.inboundBuffer.g2leadd(); } } diff --git a/client/src/main/java/Static85.java b/client/src/main/java/Static85.java index 76f64ec..e359cd6 100644 --- a/client/src/main/java/Static85.java +++ b/client/src/main/java/Static85.java @@ -4,28 +4,17 @@ import org.openrs2.deob.annotation.Pc; public final class Static85 { - @OriginalMember(owner = "client!gl", name = "a", descriptor = "Lclient!ve;") - public static Js5 aClass153_36; - @OriginalMember(owner = "client!gl", name = "d", descriptor = "I") public static int anInt2261; - @OriginalMember(owner = "client!gl", name = "e", descriptor = "I") - public static int greenDelta; - @OriginalMember(owner = "client!gl", name = "f", descriptor = "I") public static int anInt2263; - @OriginalMember(owner = "client!gl", name = "a", descriptor = "(Lclient!ve;I)V") - public static void init(@OriginalArg(0) Js5 arg0) { - Static84.aClass153_35 = arg0; - } - - @OriginalMember(owner = "client!gl", name = "a", descriptor = "(II)V") + @OriginalMember(owner = "client!gl", name = "a", descriptor = "(II)V") public static void method1775(@OriginalArg(1) int arg0) { - Static103.method2245(); + InterfaceList.method2245(); Static119.method2386(); - @Pc(17) int local17 = Static247.method4248(arg0).clientCode; + @Pc(17) int local17 = VarpTypeList.get(arg0).clientCode; if (local17 == 0) { return; } diff --git a/client/src/main/java/Static86.java b/client/src/main/java/Static86.java index 546c11a..0149cf2 100644 --- a/client/src/main/java/Static86.java +++ b/client/src/main/java/Static86.java @@ -3,17 +3,11 @@ import org.openrs2.deob.annotation.Pc; public final class Static86 { - @OriginalMember(owner = "client!gm", name = "ib", descriptor = "Lclient!ve;") - public static Js5 modelsArchive; - - @OriginalMember(owner = "client!gm", name = "R", descriptor = "I") + @OriginalMember(owner = "client!gm", name = "R", descriptor = "I") public static int anInt2293 = (int) (Math.random() * 17.0D) - 8; @OriginalMember(owner = "client!gm", name = "W", descriptor = "Lclient!na;") - public static final JagString aClass100_488 = Static28.parse("_"); - - @OriginalMember(owner = "client!gm", name = "bb", descriptor = "Z") - public static boolean aBoolean129 = false; + public static final JagString aClass100_488 = JagString.parse("_"); @OriginalMember(owner = "client!gm", name = "gb", descriptor = "[I") public static final int[] anIntArray211 = new int[] { 0, 4, 4, 8, 0, 0, 8, 0, 0 }; @@ -41,8 +35,8 @@ public final class Static86 { Static175.npcs[local30] = null; } } - if (Static223.anInt5028 != Static57.aClass3_Sub15_Sub1_3.offset) { - throw new RuntimeException("gnp1 pos:" + Static57.aClass3_Sub15_Sub1_3.offset + " psize:" + Static223.anInt5028); + if (Protocol.length != Protocol.inboundBuffer.offset) { + throw new RuntimeException("gnp1 pos:" + Protocol.inboundBuffer.offset + " psize:" + Protocol.length); } for (local19 = 0; local19 < Static272.anInt5214; local19++) { if (Static175.npcs[Static33.anIntArray79[local19]] == null) { diff --git a/client/src/main/java/Static87.java b/client/src/main/java/Static87.java index d6a449b..fbf59bd 100644 --- a/client/src/main/java/Static87.java +++ b/client/src/main/java/Static87.java @@ -4,23 +4,17 @@ import org.openrs2.deob.annotation.Pc; public final class Static87 { - @OriginalMember(owner = "client!gn", name = "t", descriptor = "Lclient!ve;") - public static Js5 aClass153_38; - @OriginalMember(owner = "client!gn", name = "d", descriptor = "Z") public static boolean aBoolean130 = false; - @OriginalMember(owner = "client!gn", name = "i", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_12 = new SoftLruHashTable(20); - @OriginalMember(owner = "client!gn", name = "v", descriptor = "Lclient!na;") - public static final JagString NULL = Static28.parse("null"); + public static final JagString NULL = JagString.parse("null"); @OriginalMember(owner = "client!gn", name = "a", descriptor = "(Z)Z") public static boolean showVideoAd() { if (client.objectTag) { try { - Static9.aClass100_35.method3157(GameShell.signLink.applet); + Static9.aClass100_35.browserControlCall(GameShell.signLink.applet); return true; } catch (@Pc(14) Throwable local14) { } @@ -31,7 +25,7 @@ public final class Static87 { @OriginalMember(owner = "client!gn", name = "a", descriptor = "(Lclient!ve;ZLclient!ve;BI)Lclient!cl;") public static AnimFrameset method1803(@OriginalArg(0) Js5 arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(4) int arg2) { @Pc(5) boolean local5 = true; - @Pc(16) int[] local16 = arg0.method4503(arg2); + @Pc(16) int[] local16 = arg0.getFileIds(arg2); for (@Pc(18) int local18 = 0; local18 < local16.length; local18++) { @Pc(30) byte[] local30 = arg0.method4502(local16[local18], arg2); if (local30 == null) { @@ -83,8 +77,8 @@ public final class Static87 { local49 = (Static238.regionBitPacked[local20] & 0xFF) * 64 - Static142.originZ; local53 = local9[local20]; if (local53 != null) { - Static107.loop(); - Static269.method2203(Static148.collisionMaps, arg0, Static80.anInt4701 * 8 - 48, local49, local38, (Static52.anInt1695 - 6) * 8, local53); + client.audioLoop(); + Static269.method2203(PathFinder.collisionMaps, arg0, Static80.centralZoneX * 8 - 48, local49, local38, (Static52.anInt1695 - 6) * 8, local53); } } for (local20 = 0; local20 < local18; local20++) { @@ -92,7 +86,7 @@ public final class Static87 { local49 = (Static238.regionBitPacked[local20] & 0xFF) * 64 - Static142.originZ; local53 = local9[local20]; if (local53 == null && Static52.anInt1695 < 800) { - Static107.loop(); + client.audioLoop(); for (@Pc(130) int local130 = 0; local130 < local7; local130++) { Static23.method645(local130, local49, local38, 64, 64); } @@ -316,11 +310,11 @@ public final class Static87 { if (local503 > 65536) { local514 = 16711680; } - Fonts.p12Full.renderRight(JagString.concatenate(new JagString[] { Static25.aClass100_154, Static123.parseInt(local503), Static17.aClass100_101 }), local270, local276, local514, -1); + Fonts.p12Full.renderRight(JagString.concatenate(new JagString[] { Cheat.aClass100_154, Static123.parseInt(local503), Static17.aClass100_101 }), local270, local276, local514, -1); local276 += 15; if (GlRenderer.enabled) { local514 = 16776960; - local518 = (Static63.onCardTexture + Static63.anInt1945 + Static63.onCard2d) / 1024; + local518 = (GlCleaner.onCardTexture + GlCleaner.anInt1945 + GlCleaner.onCard2d) / 1024; if (local518 > 65536) { local514 = 16711680; } @@ -331,9 +325,9 @@ public final class Static87 { local545 = 0; local556 = 0; for (local563 = 0; local563 < 28; local563++) { - local518 += Static269.js5Providers[local563].method535(); - local556 += Static269.js5Providers[local563].method529(); - local545 += Static269.js5Providers[local563].method533(); + local518 += client.js5Providers[local563].method535(); + local556 += client.js5Providers[local563].method529(); + local545 += client.js5Providers[local563].method533(); } local571 = local556 * 10000 / local518; local563 = local545 * 100 / local518; @@ -550,7 +544,7 @@ public final class Static87 { } } if (local30.aBoolean32 && local30.objId != -1) { - @Pc(1989) ObjType local1989 = Static71.get(local30.objId); + @Pc(1989) ObjType local1989 = ObjTypeList.get(local30.objId); local1934 = local1989.name; if (local1934 == null) { local1934 = Static92.aClass100_510; @@ -673,10 +667,10 @@ public final class Static87 { } local503 = 0; if (local30.objId != -1) { - local2611 = Static71.get(local30.objId); + local2611 = ObjTypeList.get(local30.objId); if (local2611 != null) { local2611 = local2611.method1820(local30.objCount); - @Pc(2630) SeqType local2630 = local276 == -1 ? null : Static36.get(local276); + @Pc(2630) SeqType local2630 = local276 == -1 ? null : SeqTypeList.get(local276); local2589 = local2611.getModel(local30.anInt496, local30.anInt500, local2630, 1, local30.anInt510); if (local2589 == null) { Static43.redraw(local30); @@ -689,11 +683,11 @@ public final class Static87 { local2589 = Static134.aClass59_2.method1954(null, -1, null, null, 0, -1, 0, -1, -1); } else { local514 = local30.modelId & 0x7FF; - if (local514 == Static16.anInt549) { + if (local514 == PlayerList.selfId) { local514 = 2047; } @Pc(2751) Player local2751 = Static159.players[local514]; - @Pc(2760) SeqType local2760 = local276 == -1 ? null : Static36.get(local276); + @Pc(2760) SeqType local2760 = local276 == -1 ? null : SeqTypeList.get(local276); if (local2751 != null && (int) local2751.aClass100_364.encode37() << 11 == (local30.modelId & 0xFFFFF800)) { local2589 = local2751.appearance.method1954(null, -1, null, local2760, 0, -1, 0, local30.anInt510, 0); } @@ -704,7 +698,7 @@ public final class Static87 { Static43.redraw(local30); } } else { - @Pc(2689) SeqType local2689 = Static36.get(local276); + @Pc(2689) SeqType local2689 = SeqTypeList.get(local276); local2589 = local30.method488(local30.anInt496, local2689, local30.anInt510, local30.anInt500, local2587, PlayerList.self.appearance); if (local2589 == null && Static211.aBoolean72) { Static43.redraw(local30); @@ -780,7 +774,7 @@ public final class Static87 { for (local468 = 0; local468 < local30.baseHeight; local468++) { for (local503 = 0; local503 < local30.baseWidth; local503++) { if (local30.objTypes[local276] > 0) { - local2611 = Static71.get(local30.objTypes[local276] - 1); + local2611 = ObjTypeList.get(local30.objTypes[local276] - 1); @Pc(3159) JagString local3159; if (local2611.stackable != 1 && local30.objCounts[local276] == 1) { local3159 = JagString.concatenate(new JagString[] { Static8.aClass100_32, local2611.name, Static230.aClass100_978 }); diff --git a/client/src/main/java/Static88.java b/client/src/main/java/Static88.java index e7d4d01..68ede68 100644 --- a/client/src/main/java/Static88.java +++ b/client/src/main/java/Static88.java @@ -6,12 +6,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static88 { - @OriginalMember(owner = "client!h", name = "a", descriptor = "(Lclient!ve;Lclient!ve;Z)V") - public static void init(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1) { - Static86.modelsArchive = arg0; - Static58.aClass153_28 = arg1; - } - @OriginalMember(owner = "client!h", name = "a", descriptor = "(BILclient!jl;)V") public static void method1818(@OriginalArg(1) int maxCycles, @OriginalArg(2) HookRequest request) { @Pc(4) Object[] local4 = request.arguments; @@ -338,7 +332,7 @@ public final class Static88 { local803 = Static254.intStack[isp + 1]; local1052 = Static254.intStack[isp + 2]; if (local803 != 0) { - local1063 = Static5.getComponent(type); + local1063 = InterfaceList.getComponent(type); if (local1063.createdComponents == null) { local1063.createdComponents = new Component[local1052 + 1]; } @@ -377,14 +371,14 @@ public final class Static88 { } throw new RuntimeException("Tried to .cc_delete static .active-component!"); } - local1204 = Static5.getComponent(component.id); + local1204 = InterfaceList.getComponent(component.id); local1204.createdComponents[component.createdComponentId] = null; Static43.redraw(local1204); continue; } if (opcode == 102) { isp--; - component = Static5.getComponent(Static254.intStack[isp]); + component = InterfaceList.getComponent(Static254.intStack[isp]); component.createdComponents = null; Static43.redraw(component); continue; @@ -409,7 +403,7 @@ public final class Static88 { if (opcode == 201) { isp--; type = Static254.intStack[isp]; - local1204 = Static5.getComponent(type); + local1204 = InterfaceList.getComponent(type); if (local1204 == null) { Static254.intStack[isp++] = 0; } else { @@ -470,7 +464,7 @@ public final class Static88 { } else { opcode -= 1000; isp--; - component = Static5.getComponent(Static254.intStack[isp]); + component = InterfaceList.getComponent(Static254.intStack[isp]); } if (opcode == 1100) { isp -= 2; @@ -678,7 +672,7 @@ public final class Static88 { component = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2; } else { isp--; - component = Static5.getComponent(Static254.intStack[isp]); + component = InterfaceList.getComponent(Static254.intStack[isp]); opcode -= 1000; } Static43.redraw(component); @@ -698,7 +692,7 @@ public final class Static88 { } else { component.objId = local803; component.objCount = local1052; - @Pc(13416) ObjType local13416 = Static71.get(local803); + @Pc(13416) ObjType local13416 = ObjTypeList.get(local803); component.modelYOffset = local13416.zAngle2d; component.modelXOffset = local13416.xOffset2d; component.modelXAngle = local13416.xAngle2d; @@ -756,7 +750,7 @@ public final class Static88 { } else if (opcode >= 1300 && opcode < 1400 || opcode >= 2300 && opcode < 2400) { if (opcode >= 2000) { isp--; - component = Static5.getComponent(Static254.intStack[isp]); + component = InterfaceList.getComponent(Static254.intStack[isp]); opcode -= 1000; } else { component = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2; @@ -833,7 +827,7 @@ public final class Static88 { } else { opcode -= 1000; isp--; - component = Static5.getComponent(Static254.intStack[isp]); + component = InterfaceList.getComponent(Static254.intStack[isp]); } @Pc(12937) int[] local12937 = null; ssp--; @@ -1059,7 +1053,7 @@ public final class Static88 { } } else if (opcode < 2600) { isp--; - component = Static5.getComponent(Static254.intStack[isp]); + component = InterfaceList.getComponent(Static254.intStack[isp]); if (opcode == 2500) { Static254.intStack[isp++] = component.x; continue; @@ -1086,7 +1080,7 @@ public final class Static88 { } } else if (opcode < 2700) { isp--; - component = Static5.getComponent(Static254.intStack[isp]); + component = InterfaceList.getComponent(Static254.intStack[isp]); if (opcode == 2600) { Static254.intStack[isp++] = component.anInt489; continue; @@ -1142,13 +1136,13 @@ public final class Static88 { } else if (opcode < 2800) { if (opcode == 2700) { isp--; - component = Static5.getComponent(Static254.intStack[isp]); + component = InterfaceList.getComponent(Static254.intStack[isp]); Static254.intStack[isp++] = component.objId; continue; } if (opcode == 2701) { isp--; - component = Static5.getComponent(Static254.intStack[isp]); + component = InterfaceList.getComponent(Static254.intStack[isp]); if (component.objId == -1) { Static254.intStack[isp++] = 0; } else { @@ -1169,7 +1163,7 @@ public final class Static88 { } if (opcode == 2703) { isp--; - component = Static5.getComponent(Static254.intStack[isp]); + component = InterfaceList.getComponent(Static254.intStack[isp]); if (component.createdComponents == null) { Static254.intStack[isp++] = 0; continue; @@ -1198,7 +1192,7 @@ public final class Static88 { } } else if (opcode < 2900) { isp--; - component = Static5.getComponent(Static254.intStack[isp]); + component = InterfaceList.getComponent(Static254.intStack[isp]); if (opcode == 2800) { Static254.intStack[isp++] = Static36.method940(component).method512(); continue; @@ -1245,23 +1239,23 @@ public final class Static88 { if (string.isInt()) { local803 = string.parseInt(); } - Static6.outboundBuffer.p1isaac(23); - Static6.outboundBuffer.p4(local803); + Protocol.outboundBuffer.p1isaac(23); + Protocol.outboundBuffer.p4(local803); continue; } if (opcode == 3105) { ssp--; string = Static3.stringStack[ssp]; - Static6.outboundBuffer.p1isaac(244); - Static6.outboundBuffer.p8(string.encode37()); + Protocol.outboundBuffer.p1isaac(244); + Protocol.outboundBuffer.p8(string.encode37()); continue; } if (opcode == 3106) { ssp--; string = Static3.stringStack[ssp]; - Static6.outboundBuffer.p1isaac(65); - Static6.outboundBuffer.p1(string.length() + 1); - Static6.outboundBuffer.pjstr(string); + Protocol.outboundBuffer.p1isaac(65); + Protocol.outboundBuffer.p1(string.length() + 1); + Protocol.outboundBuffer.pjstr(string); continue; } if (opcode == 3107) { @@ -1277,7 +1271,7 @@ public final class Static88 { local803 = Static254.intStack[isp + 1]; type = Static254.intStack[isp]; local1052 = Static254.intStack[isp + 2]; - local1063 = Static5.getComponent(local1052); + local1063 = InterfaceList.getComponent(local1052); Static40.method1015(local803, type, local1063); continue; } @@ -1292,14 +1286,14 @@ public final class Static88 { if (opcode == 3110) { isp--; type = Static254.intStack[isp]; - Static6.outboundBuffer.p1isaac(111); - Static6.outboundBuffer.p2(type); + Protocol.outboundBuffer.p1isaac(111); + Protocol.outboundBuffer.p2(type); continue; } } else if (opcode < 3300) { if (opcode == 3200) { isp -= 3; - Static26.method744(Static254.intStack[isp + 1], Static254.intStack[isp], Static254.intStack[isp + 2]); + SoundPlayer.play(Static254.intStack[isp + 1], Static254.intStack[isp], Static254.intStack[isp + 2]); continue; } if (opcode == 3201) { @@ -1341,7 +1335,7 @@ public final class Static88 { if (opcode == 3304) { isp--; type = Static254.intStack[isp]; - Static254.intStack[isp++] = Static246.list(type).size; + Static254.intStack[isp++] = InvTypeList.list(type).size; continue; } if (opcode == 3305) { @@ -1388,7 +1382,7 @@ public final class Static88 { continue; } if (opcode == 3312) { - Static254.intStack[isp++] = Static2.aBoolean1 ? 1 : 0; + Static254.intStack[isp++] = LoginManager.mapMembers ? 1 : 0; continue; } if (opcode == 3313) { @@ -1413,10 +1407,10 @@ public final class Static88 { continue; } if (opcode == 3316) { - if (Static191.staffModLevel < 2) { + if (LoginManager.staffModLevel < 2) { Static254.intStack[isp++] = 0; } else { - Static254.intStack[isp++] = Static191.staffModLevel; + Static254.intStack[isp++] = LoginManager.staffModLevel; } continue; } @@ -1437,7 +1431,7 @@ public final class Static88 { continue; } if (opcode == 3323) { - if (Static249.anInt5431 >= 5 && Static249.anInt5431 <= 9) { + if (LoginManager.playerModLevel >= 5 && LoginManager.playerModLevel <= 9) { Static254.intStack[isp++] = 1; continue; } @@ -1445,15 +1439,15 @@ public final class Static88 { continue; } if (opcode == 3324) { - if (Static249.anInt5431 >= 5 && Static249.anInt5431 <= 9) { - Static254.intStack[isp++] = Static249.anInt5431; + if (LoginManager.playerModLevel >= 5 && LoginManager.playerModLevel <= 9) { + Static254.intStack[isp++] = LoginManager.playerModLevel; continue; } Static254.intStack[isp++] = 0; continue; } if (opcode == 3325) { - Static254.intStack[isp++] = Static202.aBoolean233 ? 1 : 0; + Static254.intStack[isp++] = LoginManager.playerMember ? 1 : 0; continue; } if (opcode == 3326) { @@ -1465,11 +1459,11 @@ public final class Static88 { continue; } if (opcode == 3328) { - Static254.intStack[isp++] = Static124.aBoolean157 && !Static207.aBoolean236 ? 1 : 0; + Static254.intStack[isp++] = LoginManager.playerUnderage && !LoginManager.parentalChatConsent ? 1 : 0; continue; } if (opcode == 3329) { - Static254.intStack[isp++] = Static86.aBoolean129 ? 1 : 0; + Static254.intStack[isp++] = LoginManager.mapQuickChat ? 1 : 0; continue; } if (opcode == 3330) { @@ -1493,7 +1487,7 @@ public final class Static88 { continue; } if (opcode == 3333) { - Static254.intStack[isp++] = Static5.anInt39; + Static254.intStack[isp++] = LoginManager.anInt39; continue; } if (opcode == 3335) { @@ -1522,7 +1516,7 @@ public final class Static88 { isp -= 2; type = Static254.intStack[isp]; local803 = Static254.intStack[isp + 1]; - local3422 = Static253.method4330(type); + local3422 = EnumTypeList.get(type); if (local3422.valueType == 115) { } Static3.stringStack[ssp++] = local3422.getString(local803); @@ -1534,7 +1528,7 @@ public final class Static88 { local803 = Static254.intStack[isp + 1]; local652 = Static254.intStack[isp + 3]; local1052 = Static254.intStack[isp + 2]; - @Pc(3469) EnumType local3469 = Static253.method4330(local1052); + @Pc(3469) EnumType local3469 = EnumTypeList.get(local1052); if (local3469.keyType == type && local3469.valueType == local803) { if (local803 == 115) { Static3.stringStack[ssp++] = local3469.getString(local652); @@ -1553,7 +1547,7 @@ public final class Static88 { if (local803 == -1) { throw new RuntimeException("C3409-2"); } - @Pc(3549) EnumType local3549 = Static253.method4330(local803); + @Pc(3549) EnumType local3549 = EnumTypeList.get(local803); if (local3549.valueType != type) { throw new RuntimeException("C3409-1"); } @@ -1568,7 +1562,7 @@ public final class Static88 { if (type == -1) { throw new RuntimeException("C3410-2"); } - local3422 = Static253.method4330(type); + local3422 = EnumTypeList.get(type); if (local3422.valueType != 115) { throw new RuntimeException("C3410-1"); } @@ -1578,7 +1572,7 @@ public final class Static88 { if (opcode == 3411) { isp--; type = Static254.intStack[isp]; - @Pc(3645) EnumType local3645 = Static253.method4330(type); + @Pc(3645) EnumType local3645 = EnumTypeList.get(type); Static254.intStack[isp++] = local3645.table.method3864(); continue; } @@ -1756,7 +1750,7 @@ public final class Static88 { isp--; type = Static254.intStack[isp]; if (Static166.anInt4054 != 0 && Static35.anInt1093 > type) { - Static3.stringStack[ssp++] = Static79.decode37(Static190.aLongArray6[type]).method3125(); + Static3.stringStack[ssp++] = Base37.decodeLowerCase(Static190.aLongArray6[type]).method3125(); continue; } Static3.stringStack[ssp++] = Static72.EMPTY_STRING; @@ -2041,7 +2035,7 @@ public final class Static88 { if (opcode == 4200) { isp--; type = Static254.intStack[isp]; - Static3.stringStack[ssp++] = Static71.get(type).name; + Static3.stringStack[ssp++] = ObjTypeList.get(type).name; continue; } @Pc(11269) ObjType local11269; @@ -2049,7 +2043,7 @@ public final class Static88 { isp -= 2; type = Static254.intStack[isp]; local803 = Static254.intStack[isp + 1]; - local11269 = Static71.get(type); + local11269 = ObjTypeList.get(type); if (local803 >= 1 && local803 <= 5 && local11269.ops[local803 - 1] != null) { Static3.stringStack[ssp++] = local11269.ops[local803 - 1]; continue; @@ -2061,7 +2055,7 @@ public final class Static88 { isp -= 2; type = Static254.intStack[isp]; local803 = Static254.intStack[isp + 1]; - local11269 = Static71.get(type); + local11269 = ObjTypeList.get(type); if (local803 >= 1 && local803 <= 5 && local11269.inventoryOps[local803 - 1] != null) { Static3.stringStack[ssp++] = local11269.inventoryOps[local803 - 1]; continue; @@ -2072,20 +2066,20 @@ public final class Static88 { if (opcode == 4203) { isp--; type = Static254.intStack[isp]; - Static254.intStack[isp++] = Static71.get(type).cost; + Static254.intStack[isp++] = ObjTypeList.get(type).cost; continue; } if (opcode == 4204) { isp--; type = Static254.intStack[isp]; - Static254.intStack[isp++] = Static71.get(type).stackable == 1 ? 1 : 0; + Static254.intStack[isp++] = ObjTypeList.get(type).stackable == 1 ? 1 : 0; continue; } @Pc(11417) ObjType local11417; if (opcode == 4205) { isp--; type = Static254.intStack[isp]; - local11417 = Static71.get(type); + local11417 = ObjTypeList.get(type); if (local11417.certificateTemplate == -1 && local11417.certificateLink >= 0) { Static254.intStack[isp++] = local11417.certificateLink; continue; @@ -2096,7 +2090,7 @@ public final class Static88 { if (opcode == 4206) { isp--; type = Static254.intStack[isp]; - local11417 = Static71.get(type); + local11417 = ObjTypeList.get(type); if (local11417.certificateTemplate >= 0 && local11417.certificateLink >= 0) { Static254.intStack[isp++] = local11417.certificateLink; continue; @@ -2107,18 +2101,18 @@ public final class Static88 { if (opcode == 4207) { isp--; type = Static254.intStack[isp]; - Static254.intStack[isp++] = Static71.get(type).members ? 1 : 0; + Static254.intStack[isp++] = ObjTypeList.get(type).members ? 1 : 0; continue; } if (opcode == 4208) { isp -= 2; type = Static254.intStack[isp]; local803 = Static254.intStack[isp + 1]; - local5294 = Static110.method2277(local803); + local5294 = ParamTypeList.get(local803); if (local5294.isString()) { - Static3.stringStack[ssp++] = Static71.get(type).method1819(local5294.defaultString, local803); + Static3.stringStack[ssp++] = ObjTypeList.get(type).method1819(local5294.defaultString, local803); } else { - Static254.intStack[isp++] = Static71.get(type).getParam(local5294.defaultInt, local803); + Static254.intStack[isp++] = ObjTypeList.get(type).getParam(local5294.defaultInt, local803); } continue; } @@ -2148,11 +2142,11 @@ public final class Static88 { isp -= 2; type = Static254.intStack[isp]; local803 = Static254.intStack[isp + 1]; - local5294 = Static110.method2277(local803); + local5294 = ParamTypeList.get(local803); if (local5294.isString()) { - Static3.stringStack[ssp++] = Static214.get(type).getParam(local803, local5294.defaultString); + Static3.stringStack[ssp++] = NpcTypeList.get(type).getParam(local803, local5294.defaultString); } else { - Static254.intStack[isp++] = Static214.get(type).getParam(local803, local5294.defaultInt); + Static254.intStack[isp++] = NpcTypeList.get(type).getParam(local803, local5294.defaultInt); } continue; } @@ -2168,10 +2162,10 @@ public final class Static88 { Static59.anInt1812 = Static254.intStack[isp]; Static49.anInt1459 = Static254.intStack[isp + 1]; Static84.anInt2256 = Static254.intStack[isp + 2]; - Static6.outboundBuffer.p1isaac(157); - Static6.outboundBuffer.p1(Static59.anInt1812); - Static6.outboundBuffer.p1(Static49.anInt1459); - Static6.outboundBuffer.p1(Static84.anInt2256); + Protocol.outboundBuffer.p1isaac(157); + Protocol.outboundBuffer.p1(Static59.anInt1812); + Protocol.outboundBuffer.p1(Static49.anInt1459); + Protocol.outboundBuffer.p1(Static84.anInt2256); continue; } if (opcode == 5002) { @@ -2180,10 +2174,10 @@ public final class Static88 { isp -= 2; local803 = Static254.intStack[isp]; local1052 = Static254.intStack[isp + 1]; - Static6.outboundBuffer.p1isaac(99); - Static6.outboundBuffer.p8(string.encode37()); - Static6.outboundBuffer.p1(local803 - 1); - Static6.outboundBuffer.p1(local1052); + Protocol.outboundBuffer.p1isaac(99); + Protocol.outboundBuffer.p8(string.encode37()); + Protocol.outboundBuffer.p1(local803 - 1); + Protocol.outboundBuffer.p1(local1052); continue; } if (opcode == 5003) { @@ -2217,7 +2211,7 @@ public final class Static88 { ssp--; string = Static3.stringStack[ssp]; if (!string.startsWith(Static12.aClass100_74)) { - if (Static191.staffModLevel == 0 && (Static124.aBoolean157 && !Static207.aBoolean236 || Static86.aBoolean129)) { + if (LoginManager.staffModLevel == 0 && (LoginManager.playerUnderage && !LoginManager.parentalChatConsent || LoginManager.mapQuickChat)) { continue; } local2522 = string.toLowerCase(); @@ -2332,13 +2326,13 @@ public final class Static88 { local5943 = 5; } } - Static6.outboundBuffer.p1isaac(237); - Static6.outboundBuffer.p1(0); - c = Static6.outboundBuffer.offset; - Static6.outboundBuffer.p1(local5555); - Static6.outboundBuffer.p1(local5943); - Static146.method2748(Static6.outboundBuffer, string); - Static6.outboundBuffer.p1len(Static6.outboundBuffer.offset - c); + Protocol.outboundBuffer.p1isaac(237); + Protocol.outboundBuffer.p1(0); + c = Protocol.outboundBuffer.offset; + Protocol.outboundBuffer.p1(local5555); + Protocol.outboundBuffer.p1(local5943); + Static146.method2748(Protocol.outboundBuffer, string); + Protocol.outboundBuffer.p1len(Protocol.outboundBuffer.offset - c); continue; } Static127.method2470(string); @@ -2348,13 +2342,13 @@ public final class Static88 { ssp -= 2; local2522 = Static3.stringStack[ssp + 1]; string = Static3.stringStack[ssp]; - if (Static191.staffModLevel != 0 || (!Static124.aBoolean157 || Static207.aBoolean236) && !Static86.aBoolean129) { - Static6.outboundBuffer.p1isaac(201); - Static6.outboundBuffer.p1(0); - local1052 = Static6.outboundBuffer.offset; - Static6.outboundBuffer.p8(string.encode37()); - Static146.method2748(Static6.outboundBuffer, local2522); - Static6.outboundBuffer.p1len(Static6.outboundBuffer.offset - local1052); + if (LoginManager.staffModLevel != 0 || (!LoginManager.playerUnderage || LoginManager.parentalChatConsent) && !LoginManager.mapQuickChat) { + Protocol.outboundBuffer.p1isaac(201); + Protocol.outboundBuffer.p1(0); + local1052 = Protocol.outboundBuffer.offset; + Protocol.outboundBuffer.p8(string.encode37()); + Static146.method2748(Protocol.outboundBuffer, local2522); + Protocol.outboundBuffer.p1len(Protocol.outboundBuffer.offset - local1052); } continue; } @@ -2414,14 +2408,14 @@ public final class Static88 { if (opcode == 5050) { isp--; type = Static254.intStack[isp]; - Static3.stringStack[ssp++] = Static235.method4045(type).aClass100_79; + Static3.stringStack[ssp++] = QuickChatCatTypeList.method4045(type).aClass100_79; continue; } @Pc(6378) QuickChatCatType local6378; if (opcode == 5051) { isp--; type = Static254.intStack[isp]; - local6378 = Static235.method4045(type); + local6378 = QuickChatCatTypeList.method4045(type); if (local6378.anIntArray30 == null) { Static254.intStack[isp++] = 0; } else { @@ -2433,7 +2427,7 @@ public final class Static88 { isp -= 2; type = Static254.intStack[isp]; local803 = Static254.intStack[isp + 1]; - @Pc(6416) QuickChatCatType local6416 = Static235.method4045(type); + @Pc(6416) QuickChatCatType local6416 = QuickChatCatTypeList.method4045(type); local652 = local6416.anIntArray30[local803]; Static254.intStack[isp++] = local652; continue; @@ -2441,7 +2435,7 @@ public final class Static88 { if (opcode == 5053) { isp--; type = Static254.intStack[isp]; - local6378 = Static235.method4045(type); + local6378 = QuickChatCatTypeList.method4045(type); if (local6378.anIntArray32 == null) { Static254.intStack[isp++] = 0; } else { @@ -2453,19 +2447,19 @@ public final class Static88 { isp -= 2; local803 = Static254.intStack[isp + 1]; type = Static254.intStack[isp]; - Static254.intStack[isp++] = Static235.method4045(type).anIntArray32[local803]; + Static254.intStack[isp++] = QuickChatCatTypeList.method4045(type).anIntArray32[local803]; continue; } if (opcode == 5055) { isp--; type = Static254.intStack[isp]; - Static3.stringStack[ssp++] = Static230.method3953(type).method769(); + Static3.stringStack[ssp++] = QuickChatPhraseTypeList.get(type).method769(); continue; } if (opcode == 5056) { isp--; type = Static254.intStack[isp]; - @Pc(6527) QuickChatPhraseType local6527 = Static230.method3953(type); + @Pc(6527) QuickChatPhraseType local6527 = QuickChatPhraseTypeList.get(type); if (local6527.anIntArray72 == null) { Static254.intStack[isp++] = 0; } else { @@ -2477,61 +2471,61 @@ public final class Static88 { isp -= 2; local803 = Static254.intStack[isp + 1]; type = Static254.intStack[isp]; - Static254.intStack[isp++] = Static230.method3953(type).anIntArray72[local803]; + Static254.intStack[isp++] = QuickChatPhraseTypeList.get(type).anIntArray72[local803]; continue; } if (opcode == 5058) { Static122.aClass12_1 = new QuickChatPhrase(); isp--; Static122.aClass12_1.anInt439 = Static254.intStack[isp]; - Static122.aClass12_1.aClass3_Sub2_Sub6_1 = Static230.method3953(Static122.aClass12_1.anInt439); + Static122.aClass12_1.aClass3_Sub2_Sub6_1 = QuickChatPhraseTypeList.get(Static122.aClass12_1.anInt439); Static122.aClass12_1.anIntArray33 = new int[Static122.aClass12_1.aClass3_Sub2_Sub6_1.method767()]; continue; } if (opcode == 5059) { - Static6.outboundBuffer.p1isaac(167); - Static6.outboundBuffer.p1(0); - type = Static6.outboundBuffer.offset; - Static6.outboundBuffer.p1(0); - Static6.outboundBuffer.p2(Static122.aClass12_1.anInt439); - Static122.aClass12_1.aClass3_Sub2_Sub6_1.method760(Static6.outboundBuffer, Static122.aClass12_1.anIntArray33); - Static6.outboundBuffer.p1len(Static6.outboundBuffer.offset - type); + Protocol.outboundBuffer.p1isaac(167); + Protocol.outboundBuffer.p1(0); + type = Protocol.outboundBuffer.offset; + Protocol.outboundBuffer.p1(0); + Protocol.outboundBuffer.p2(Static122.aClass12_1.anInt439); + Static122.aClass12_1.aClass3_Sub2_Sub6_1.method760(Protocol.outboundBuffer, Static122.aClass12_1.anIntArray33); + Protocol.outboundBuffer.p1len(Protocol.outboundBuffer.offset - type); continue; } if (opcode == 5060) { ssp--; string = Static3.stringStack[ssp]; - Static6.outboundBuffer.p1isaac(178); - Static6.outboundBuffer.p1(0); - local803 = Static6.outboundBuffer.offset; - Static6.outboundBuffer.p8(string.encode37()); - Static6.outboundBuffer.p2(Static122.aClass12_1.anInt439); - Static122.aClass12_1.aClass3_Sub2_Sub6_1.method760(Static6.outboundBuffer, Static122.aClass12_1.anIntArray33); - Static6.outboundBuffer.p1len(Static6.outboundBuffer.offset - local803); + Protocol.outboundBuffer.p1isaac(178); + Protocol.outboundBuffer.p1(0); + local803 = Protocol.outboundBuffer.offset; + Protocol.outboundBuffer.p8(string.encode37()); + Protocol.outboundBuffer.p2(Static122.aClass12_1.anInt439); + Static122.aClass12_1.aClass3_Sub2_Sub6_1.method760(Protocol.outboundBuffer, Static122.aClass12_1.anIntArray33); + Protocol.outboundBuffer.p1len(Protocol.outboundBuffer.offset - local803); continue; } if (opcode == 5061) { - Static6.outboundBuffer.p1isaac(167); - Static6.outboundBuffer.p1(0); - type = Static6.outboundBuffer.offset; - Static6.outboundBuffer.p1(1); - Static6.outboundBuffer.p2(Static122.aClass12_1.anInt439); - Static122.aClass12_1.aClass3_Sub2_Sub6_1.method760(Static6.outboundBuffer, Static122.aClass12_1.anIntArray33); - Static6.outboundBuffer.p1len(Static6.outboundBuffer.offset - type); + Protocol.outboundBuffer.p1isaac(167); + Protocol.outboundBuffer.p1(0); + type = Protocol.outboundBuffer.offset; + Protocol.outboundBuffer.p1(1); + Protocol.outboundBuffer.p2(Static122.aClass12_1.anInt439); + Static122.aClass12_1.aClass3_Sub2_Sub6_1.method760(Protocol.outboundBuffer, Static122.aClass12_1.anIntArray33); + Protocol.outboundBuffer.p1len(Protocol.outboundBuffer.offset - type); continue; } if (opcode == 5062) { isp -= 2; local803 = Static254.intStack[isp + 1]; type = Static254.intStack[isp]; - Static254.intStack[isp++] = Static235.method4045(type).anIntArray31[local803]; + Static254.intStack[isp++] = QuickChatCatTypeList.method4045(type).anIntArray31[local803]; continue; } if (opcode == 5063) { isp -= 2; local803 = Static254.intStack[isp + 1]; type = Static254.intStack[isp]; - Static254.intStack[isp++] = Static235.method4045(type).anIntArray29[local803]; + Static254.intStack[isp++] = QuickChatCatTypeList.method4045(type).anIntArray29[local803]; continue; } if (opcode == 5064) { @@ -2541,7 +2535,7 @@ public final class Static88 { if (local803 == -1) { Static254.intStack[isp++] = -1; } else { - Static254.intStack[isp++] = Static235.method4045(type).method469(local803); + Static254.intStack[isp++] = QuickChatCatTypeList.method4045(type).method469(local803); } continue; } @@ -2552,21 +2546,21 @@ public final class Static88 { if (local803 == -1) { Static254.intStack[isp++] = -1; } else { - Static254.intStack[isp++] = Static235.method4045(type).method466(local803); + Static254.intStack[isp++] = QuickChatCatTypeList.method4045(type).method466(local803); } continue; } if (opcode == 5066) { isp--; type = Static254.intStack[isp]; - Static254.intStack[isp++] = Static230.method3953(type).method767(); + Static254.intStack[isp++] = QuickChatPhraseTypeList.get(type).method767(); continue; } if (opcode == 5067) { isp -= 2; local803 = Static254.intStack[isp + 1]; type = Static254.intStack[isp]; - local1052 = Static230.method3953(type).method765(local803); + local1052 = QuickChatPhraseTypeList.get(type).method765(local803); Static254.intStack[isp++] = local1052; continue; } @@ -2589,7 +2583,7 @@ public final class Static88 { type = Static254.intStack[isp]; local1052 = Static254.intStack[isp + 2]; local803 = Static254.intStack[isp + 1]; - @Pc(6996) QuickChatPhraseType local6996 = Static230.method3953(type); + @Pc(6996) QuickChatPhraseType local6996 = QuickChatPhraseTypeList.get(type); if (local6996.method765(local803) != 0) { throw new RuntimeException("bad command"); } @@ -2892,16 +2886,16 @@ public final class Static88 { local2522 = Static3.stringStack[ssp + 1]; isp--; local1052 = Static254.intStack[isp]; - Static6.outboundBuffer.p1isaac(117); - Static6.outboundBuffer.p1(Static229.method3937(string) + Static229.method3937(local2522) + 1); - Static6.outboundBuffer.pjstr(string); - Static6.outboundBuffer.pjstr(local2522); - Static6.outboundBuffer.p1(local1052); + Protocol.outboundBuffer.p1isaac(117); + Protocol.outboundBuffer.p1(Buffer.getStringLength(string) + Buffer.getStringLength(local2522) + 1); + Protocol.outboundBuffer.pjstr(string); + Protocol.outboundBuffer.pjstr(local2522); + Protocol.outboundBuffer.p1(local1052); continue; } if (opcode == 5401) { isp -= 2; - Static259.aShortArray88[Static254.intStack[isp]] = (short) Static105.method2253(Static254.intStack[isp + 1]); + client.aShortArray88[Static254.intStack[isp]] = (short) Static105.method2253(Static254.intStack[isp + 1]); Static211.method924(); Static269.clearObjectSpriteCache(); Static278.method4649(); @@ -3025,11 +3019,11 @@ public final class Static88 { Static254.anInt5556 = Static254.intStack[isp + 8]; Static195.anInt4581 = Static254.intStack[isp + 9]; Static262.anInt5752 = Static254.intStack[isp + 10]; - Static209.js5Archive8.isFileReady(Static55.anInt1736); - Static209.js5Archive8.isFileReady(Static169.anInt4073); - Static209.js5Archive8.isFileReady(Static85.anInt2261); - Static209.js5Archive8.isFileReady(Static136.anInt3324); - Static209.js5Archive8.isFileReady(Static254.anInt5556); + client.js5Archive8.isFileReady(Static55.anInt1736); + client.js5Archive8.isFileReady(Static169.anInt4073); + client.js5Archive8.isFileReady(Static85.anInt2261); + client.js5Archive8.isFileReady(Static136.anInt3324); + client.js5Archive8.isFileReady(Static254.anInt5556); Static261.aBoolean298 = true; continue; } @@ -3126,7 +3120,7 @@ public final class Static88 { local2522 = Static3.stringStack[ssp + 1]; isp--; local1052 = Static254.intStack[isp]; - if (client.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0 && Static82.anInt2231 == 0) { + if (client.gameState == 10 && LoginManager.anInt4937 == 0 && LoginManager.step == 0 && CreateManager.step == 0 && WorldList.step == 0) { Static225.method3896(string, local2522, local1052); } continue; @@ -3136,21 +3130,21 @@ public final class Static88 { continue; } if (opcode == 5602) { - if (Static184.loginStep == 0) { - Static266.reply = -2; + if (LoginManager.step == 0) { + LoginManager.reply = -2; } continue; } if (opcode == 5603) { isp -= 4; - if (client.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0 && Static82.anInt2231 == 0) { + if (client.gameState == 10 && LoginManager.anInt4937 == 0 && LoginManager.step == 0 && CreateManager.step == 0 && WorldList.step == 0) { Static125.method2448(Static254.intStack[isp + 2], Static254.intStack[isp + 3], Static254.intStack[isp], Static254.intStack[isp + 1]); } continue; } if (opcode == 5604) { ssp--; - if (client.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0 && Static82.anInt2231 == 0) { + if (client.gameState == 10 && LoginManager.anInt4937 == 0 && LoginManager.step == 0 && CreateManager.step == 0 && WorldList.step == 0) { Static78.method1691(Static3.stringStack[ssp].encode37()); } continue; @@ -3158,38 +3152,38 @@ public final class Static88 { if (opcode == 5605) { isp -= 4; ssp -= 2; - if (client.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0 && Static82.anInt2231 == 0) { + if (client.gameState == 10 && LoginManager.anInt4937 == 0 && LoginManager.step == 0 && CreateManager.step == 0 && WorldList.step == 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; } if (opcode == 5606) { - if (Static179.accountCreationStep == 0) { - Static223.anInt5034 = -2; + if (CreateManager.step == 0) { + CreateManager.reply = -2; } continue; } if (opcode == 5607) { - Static254.intStack[isp++] = Static266.reply; + Static254.intStack[isp++] = LoginManager.reply; continue; } if (opcode == 5608) { - Static254.intStack[isp++] = Static231.anInt5202; + Static254.intStack[isp++] = LoginManager.hopTime; continue; } if (opcode == 5609) { - Static254.intStack[isp++] = Static223.anInt5034; + Static254.intStack[isp++] = CreateManager.reply; continue; } if (opcode == 5610) { for (type = 0; type < 5; type++) { - Static3.stringStack[ssp++] = Static229.aClass100Array156.length > type ? Static229.aClass100Array156[type].method3125() : Static72.EMPTY_STRING; + Static3.stringStack[ssp++] = CreateManager.suggestedNames.length > type ? CreateManager.suggestedNames[type].method3125() : Static72.EMPTY_STRING; } - Static229.aClass100Array156 = null; + CreateManager.suggestedNames = null; continue; } if (opcode == 5611) { - Static254.intStack[isp++] = Static204.anInt4765; + Static254.intStack[isp++] = LoginManager.disallowResult; continue; } } else if (opcode < 6100) { @@ -3225,17 +3219,17 @@ public final class Static88 { } Static269.clearObjectSpriteCache(); Preferences.write(GameShell.signLink); - Static18.serverUpdatedPreferences = false; + Preferences.sentToServer = false; continue; } if (opcode == 6002) { isp--; Preferences.setAllVisibleLevels(Static254.intStack[isp] == 1); - Static90.clearLocCache(); + LocTypeList.clear(); Static145.method2742(); Static269.method2218(); Preferences.write(GameShell.signLink); - Static18.serverUpdatedPreferences = false; + Preferences.sentToServer = false; continue; } if (opcode == 6003) { @@ -3243,7 +3237,7 @@ public final class Static88 { Preferences.removeRoofsSelectively = Static254.intStack[isp] == 1; Static269.method2218(); Preferences.write(GameShell.signLink); - Static18.serverUpdatedPreferences = false; + Preferences.sentToServer = false; continue; } if (opcode == 6005) { @@ -3251,7 +3245,7 @@ public final class Static88 { Preferences.showGroundDecorations = Static254.intStack[isp] == 1; Static145.method2742(); Preferences.write(GameShell.signLink); - Static18.serverUpdatedPreferences = false; + Preferences.sentToServer = false; continue; } if (opcode == 6006) { @@ -3259,35 +3253,35 @@ public final class Static88 { Preferences.highDetailTextures = Static254.intStack[isp] == 1; ((Js5GlTextureProvider) Rasteriser.textureProvider).method3245(!Preferences.highDetailTextures); Preferences.write(GameShell.signLink); - Static18.serverUpdatedPreferences = false; + Preferences.sentToServer = false; continue; } if (opcode == 6007) { isp--; Preferences.manyIdleAnimations = Static254.intStack[isp] == 1; Preferences.write(GameShell.signLink); - Static18.serverUpdatedPreferences = false; + Preferences.sentToServer = false; continue; } if (opcode == 6008) { isp--; Preferences.flickeringEffectsOn = Static254.intStack[isp] == 1; Preferences.write(GameShell.signLink); - Static18.serverUpdatedPreferences = false; + Preferences.sentToServer = false; continue; } if (opcode == 6009) { isp--; Preferences.manyGroundTextures = Static254.intStack[isp] == 1; Preferences.write(GameShell.signLink); - Static18.serverUpdatedPreferences = false; + Preferences.sentToServer = false; continue; } if (opcode == 6010) { isp--; Preferences.characterShadowsOn = Static254.intStack[isp] == 1; Preferences.write(GameShell.signLink); - Static18.serverUpdatedPreferences = false; + Preferences.sentToServer = false; continue; } if (opcode == 6011) { @@ -3298,7 +3292,7 @@ public final class Static88 { } Preferences.sceneryShadowsType = type; Preferences.write(GameShell.signLink); - Static18.serverUpdatedPreferences = false; + Preferences.sentToServer = false; continue; } if (opcode == 6012) { @@ -3325,7 +3319,7 @@ public final class Static88 { } Static145.method2742(); Preferences.write(GameShell.signLink); - Static18.serverUpdatedPreferences = false; + Preferences.sentToServer = false; continue; } if (opcode == 6014) { @@ -3335,7 +3329,7 @@ public final class Static88 { Static145.method2742(); } Preferences.write(GameShell.signLink); - Static18.serverUpdatedPreferences = false; + Preferences.sentToServer = false; continue; } if (opcode == 6015) { @@ -3345,7 +3339,7 @@ public final class Static88 { Static86.setInstantFade(); } Preferences.write(GameShell.signLink); - Static18.serverUpdatedPreferences = false; + Preferences.sentToServer = false; continue; } if (opcode == 6016) { @@ -3365,7 +3359,7 @@ public final class Static88 { Preferences.stereo = Static254.intStack[isp] == 1; Static211.method930(); Preferences.write(GameShell.signLink); - Static18.serverUpdatedPreferences = false; + Preferences.sentToServer = false; continue; } if (opcode == 6018) { @@ -3379,7 +3373,7 @@ public final class Static88 { } Preferences.soundEffectVolume = type; Preferences.write(GameShell.signLink); - Static18.serverUpdatedPreferences = false; + Preferences.sentToServer = false; continue; } if (opcode == 6019) { @@ -3392,8 +3386,8 @@ public final class Static88 { type = 255; } if (type != Preferences.musicVolume) { - if (Preferences.musicVolume == 0 && Static221.anInt4363 != -1) { - Static122.method2410(Static130.js5Archive6, Static221.anInt4363, type); + if (Preferences.musicVolume == 0 && MusicPlayer.groupId != -1) { + Static122.method2410(client.js5Archive6, MusicPlayer.groupId, type); MidiPlayer.jingle = false; } else if (type == 0) { Static241.method4548(); @@ -3404,7 +3398,7 @@ public final class Static88 { Preferences.musicVolume = type; } Preferences.write(GameShell.signLink); - Static18.serverUpdatedPreferences = false; + Preferences.sentToServer = false; continue; } if (opcode == 6020) { @@ -3418,7 +3412,7 @@ public final class Static88 { } Preferences.ambientSoundsVolume = type; Preferences.write(GameShell.signLink); - Static18.serverUpdatedPreferences = false; + Preferences.sentToServer = false; continue; } if (opcode == 6021) { @@ -3443,7 +3437,7 @@ public final class Static88 { } Preferences.setParticles(type); Preferences.write(GameShell.signLink); - Static18.serverUpdatedPreferences = false; + Preferences.sentToServer = false; Static254.intStack[isp++] = local1552 ? 0 : 1; continue; } @@ -3676,8 +3670,8 @@ public final class Static88 { } } else if (opcode < 6600) { if (opcode == 6500) { - if (client.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0) { - Static254.intStack[isp++] = Static207.fetch() == -1 ? 0 : 1; + if (client.gameState == 10 && LoginManager.anInt4937 == 0 && LoginManager.step == 0 && CreateManager.step == 0) { + Static254.intStack[isp++] = WorldList.fetch() == -1 ? 0 : 1; continue; } Static254.intStack[isp++] = 1; @@ -3695,12 +3689,12 @@ public final class Static88 { Static3.stringStack[ssp++] = Static72.EMPTY_STRING; Static254.intStack[isp++] = 0; } else { - Static254.intStack[isp++] = world.anInt382; + Static254.intStack[isp++] = world.id; Static254.intStack[isp++] = world.flags; - Static3.stringStack[ssp++] = world.aClass100_69; + Static3.stringStack[ssp++] = world.activity; local10247 = world.getWorldInfo(); - Static254.intStack[isp++] = local10247.anInt1739; - Static3.stringStack[ssp++] = local10247.aClass100_378; + Static254.intStack[isp++] = local10247.flag; + Static3.stringStack[ssp++] = local10247.name; Static254.intStack[isp++] = world.players; } continue; @@ -3715,12 +3709,12 @@ public final class Static88 { Static3.stringStack[ssp++] = Static72.EMPTY_STRING; Static254.intStack[isp++] = 0; } else { - Static254.intStack[isp++] = world.anInt382; + Static254.intStack[isp++] = world.id; Static254.intStack[isp++] = world.flags; - Static3.stringStack[ssp++] = world.aClass100_69; + Static3.stringStack[ssp++] = world.activity; local10247 = world.getWorldInfo(); - Static254.intStack[isp++] = local10247.anInt1739; - Static3.stringStack[ssp++] = local10247.aClass100_378; + Static254.intStack[isp++] = local10247.flag; + Static3.stringStack[ssp++] = local10247.name; Static254.intStack[isp++] = world.players; } continue; @@ -3728,7 +3722,7 @@ public final class Static88 { if (opcode == 6503) { isp--; type = Static254.intStack[isp]; - if (client.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0) { + if (client.gameState == 10 && LoginManager.anInt4937 == 0 && LoginManager.step == 0 && CreateManager.step == 0) { Static254.intStack[isp++] = Static176.hopWorld(type) ? 1 : 0; continue; } @@ -3757,10 +3751,10 @@ public final class Static88 { Static254.intStack[isp++] = 0; } else { Static254.intStack[isp++] = local10440.flags; - Static3.stringStack[ssp++] = local10440.aClass100_69; + Static3.stringStack[ssp++] = local10440.activity; @Pc(10458) Class32 local10458 = local10440.getWorldInfo(); - Static254.intStack[isp++] = local10458.anInt1739; - Static3.stringStack[ssp++] = local10458.aClass100_378; + Static254.intStack[isp++] = local10458.flag; + Static3.stringStack[ssp++] = local10458.name; Static254.intStack[isp++] = local10440.players; } continue; @@ -3791,11 +3785,11 @@ public final class Static88 { isp -= 2; type = Static254.intStack[isp]; local803 = Static254.intStack[isp + 1]; - local5294 = Static110.method2277(local803); + local5294 = ParamTypeList.get(local803); if (local5294.isString()) { - Static3.stringStack[ssp++] = Static123.method2417(type).getParam(local5294.defaultString, local803); + Static3.stringStack[ssp++] = StructTypeList.get(type).getParam(local5294.defaultString, local803); } else { - Static254.intStack[isp++] = Static123.method2417(type).getParam(local803, local5294.defaultInt); + Static254.intStack[isp++] = StructTypeList.get(type).getParam(local803, local5294.defaultInt); } continue; } @@ -3803,11 +3797,11 @@ public final class Static88 { isp -= 2; local803 = Static254.intStack[isp + 1]; type = Static254.intStack[isp]; - local5294 = Static110.method2277(local803); + local5294 = ParamTypeList.get(local803); if (local5294.isString()) { - Static3.stringStack[ssp++] = Static271.get(type).method3430(local5294.defaultString, local803); + Static3.stringStack[ssp++] = LocTypeList.get(type).method3430(local5294.defaultString, local803); } else { - Static254.intStack[isp++] = Static271.get(type).getParam(local5294.defaultInt, local803); + Static254.intStack[isp++] = LocTypeList.get(type).getParam(local5294.defaultInt, local803); } continue; } @@ -4028,7 +4022,7 @@ public final class Static88 { component = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2; } else { isp--; - component = Static5.getComponent(Static254.intStack[isp]); + component = InterfaceList.getComponent(Static254.intStack[isp]); opcode -= 1000; } if (opcode == 1000) { @@ -4142,13 +4136,7 @@ public final class Static88 { @OriginalMember(owner = "client!h", name = "a", descriptor = "(I)Lclient!ba;") public static World getNextWorld() { - return Static101.worlds.length > Static51.worldPos ? Static101.worlds[Static51.worldPos++] : null; + return WorldList.sorted.length > Static51.worldPos ? WorldList.sorted[Static51.worldPos++] : null; } - @OriginalMember(owner = "client!h", name = "a", descriptor = "(Ljava/awt/Component;Z)V") - public static void start(@OriginalArg(0) java.awt.Component arg0) { - arg0.addMouseListener(Static93.instance); - arg0.addMouseMotionListener(Static93.instance); - arg0.addFocusListener(Static93.instance); - } } diff --git a/client/src/main/java/Static89.java b/client/src/main/java/Static89.java index f64e6db..48982d2 100644 --- a/client/src/main/java/Static89.java +++ b/client/src/main/java/Static89.java @@ -17,9 +17,6 @@ public final class Static89 { @OriginalMember(owner = "client!ha", name = "m", descriptor = "I") public static int anInt2385 = 0; - @OriginalMember(owner = "client!ha", name = "p", descriptor = "Lclient!gn;") - public static final LruHashTable recentUse = new LruHashTable(64); - @OriginalMember(owner = "client!ha", name = "q", descriptor = "I") public static int anInt2388 = 0; @@ -35,7 +32,7 @@ public final class Static89 { local11 = 4; } for (@Pc(21) int local21 = 0; local21 < local11; local21++) { - Static107.loop(); + client.audioLoop(); for (@Pc(32) int local32 = 0; local32 < 13; local32++) { for (@Pc(39) int local39 = 0; local39 < 13; local39++) { @Pc(52) int local52 = Static187.anIntArrayArrayArray18[local21][local32][local39]; @@ -49,7 +46,7 @@ public final class Static89 { @Pc(98) int local98 = (local88 / 8 << 8) + local76 / 8; for (@Pc(100) int local100 = 0; local100 < Static238.regionBitPacked.length; local100++) { if (Static238.regionBitPacked[local100] == local98 && local13[local100] != null) { - Static245.method4228(local82, local32 * 8, local21, Static148.collisionMaps, local39 * 8, local13[local100], local65, (local76 & 0x7) * 8, (local88 & 0x7) * 8, arg0); + Static245.method4228(local82, local32 * 8, local21, PathFinder.collisionMaps, local39 * 8, local13[local100], local65, (local76 & 0x7) * 8, (local88 & 0x7) * 8, arg0); local54 = true; break; } @@ -98,8 +95,8 @@ public final class Static89 { @OriginalMember(owner = "client!ha", name = "a", descriptor = "([IJIZ)Lclient!na;") public static JagString method1838(@OriginalArg(0) int[] arg0, @OriginalArg(1) long arg1, @OriginalArg(2) int arg2) { - if (Static107.anInterface3_1 != null) { - @Pc(17) JagString local17 = Static107.anInterface3_1.method30(arg2, arg0, arg1); + if (QuickChatPhraseTypeList.decoder != null) { + @Pc(17) JagString local17 = QuickChatPhraseTypeList.decoder.method30(arg2, arg0, arg1); if (local17 != null) { return local17; } diff --git a/client/src/main/java/Static9.java b/client/src/main/java/Static9.java index 4063270..188767e 100644 --- a/client/src/main/java/Static9.java +++ b/client/src/main/java/Static9.java @@ -7,14 +7,11 @@ public final class Static9 { @OriginalMember(owner = "client!al", name = "e", descriptor = "I") public static int anInt172; - @OriginalMember(owner = "client!al", name = "q", descriptor = "Lclient!ve;") - public static Js5 aClass153_2; - - @OriginalMember(owner = "client!al", name = "m", descriptor = "I") + @OriginalMember(owner = "client!al", name = "m", descriptor = "I") public static int anInt178 = 0; @OriginalMember(owner = "client!al", name = "r", descriptor = "Lclient!na;") - public static final JagString aClass100_35 = Static28.parse("showVideoAd"); + public static final JagString aClass100_35 = JagString.parse("showVideoAd"); @OriginalMember(owner = "client!al", name = "a", descriptor = "(Lclient!pb;BIIIIIII)V") public static void method181(@OriginalArg(0) LocType 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) { @@ -74,19 +71,6 @@ 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 (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) { - Static269.js5Providers[arg3].method528(); - } - return new Js5(Static269.js5Providers[arg3], arg0, arg2); - } - @OriginalMember(owner = "client!al", name = "a", descriptor = "(ILclient!wa;)Lclient!ci;") public static TextureOp29SubOp1 method184(@OriginalArg(1) Buffer arg0) { return new TextureOp29SubOp1(arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g3(), arg0.g1()); @@ -106,14 +90,6 @@ public final class Static9 { } } - @OriginalMember(owner = "client!al", name = "a", descriptor = "(ZI)V") - public static void method186(@OriginalArg(0) boolean arg0) { - if (arg0 != Static240.aBoolean276) { - Static240.aBoolean276 = arg0; - Static176.method3302(); - } - } - @OriginalMember(owner = "client!al", name = "a", descriptor = "(III)Z") public static boolean method187(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { @Pc(7) int local7 = Static140.anIntArrayArrayArray12[arg0][arg1][arg2]; diff --git a/client/src/main/java/Static90.java b/client/src/main/java/Static90.java index 50e3fb0..3a5e57c 100644 --- a/client/src/main/java/Static90.java +++ b/client/src/main/java/Static90.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 Static90 { @@ -9,41 +8,13 @@ public final class Static90 { @OriginalMember(owner = "client!hb", name = "b", descriptor = "(Lclient!na;I)V") public static void method1853(@OriginalArg(0) JagString arg0) { - Static116.clear(false); + WorldMap.clear(false); Static133.method4011(arg0); } - @OriginalMember(owner = "client!hb", name = "c", descriptor = "(I)V") - public static void clearLocCache() { - Static179.aClass99_25.clear(); - Static169.aClass99_24.clear(); - Static93.aClass99_14.clear(); - Static262.aClass99_36.clear(); - } - @OriginalMember(owner = "client!hb", name = "b", descriptor = "(II)Z") public static boolean method1855(@OriginalArg(0) int arg0) { - return arg0 >= 0 && Static258.aBooleanArray130.length > arg0 ? Static258.aBooleanArray130[arg0] : false; + return arg0 >= 0 && MapList.aBooleanArray130.length > arg0 ? MapList.aBooleanArray130[arg0] : false; } - @OriginalMember(owner = "client!hb", name = "a", descriptor = "(ZI)Lclient!ck;") - public static BasType method1856(@OriginalArg(1) int arg0) { - @Pc(10) BasType local10 = (BasType) Static262.aClass99_34.get((long) arg0); - if (local10 != null) { - return local10; - } - @Pc(21) byte[] local21 = Static167.aClass153_62.getFile(32, arg0); - local10 = new BasType(); - if (local21 != null) { - local10.method880(new Buffer(local21)); - } - local10.method878(); - Static262.aClass99_34.put(local10, (long) arg0); - return local10; - } - - @OriginalMember(owner = "client!hb", name = "a", descriptor = "(Z)V") - public static void method1857() { - Static45.aClass99_6.clear(); - } } diff --git a/client/src/main/java/Static91.java b/client/src/main/java/Static91.java index 7da54f2..b88afae 100644 --- a/client/src/main/java/Static91.java +++ b/client/src/main/java/Static91.java @@ -31,7 +31,7 @@ public final class Static91 { if (local12 != null) { return local12; } - @Pc(22) byte[] local22 = Static16.js5Archive12.getFile(arg0, 0); + @Pc(22) byte[] local22 = client.js5Archive12.getFile(arg0, 0); if (local22 == null) { return null; } @@ -88,7 +88,7 @@ public final class Static91 { for (@Pc(13) AreaSound local13 = (AreaSound) Static152.aClass69_87.method2289(); local13 != null; local13 = (AreaSound) Static152.aClass69_87.method2288()) { if (arg0 == local13.npc) { if (local13.primaryStream != null) { - Static204.soundStream.removeSubStream(local13.primaryStream); + client.soundStream.removeSubStream(local13.primaryStream); local13.primaryStream = null; } local13.unlink(); @@ -97,11 +97,6 @@ public final class Static91 { } } - @OriginalMember(owner = "client!hc", name = "a", descriptor = "(Lclient!ve;I)V") - public static void init(@OriginalArg(0) Js5 arg0) { - Static182.aClass153_77 = arg0; - } - @OriginalMember(owner = "client!hc", name = "a", descriptor = "(Lclient!na;Z)I") public static int method1879(@OriginalArg(0) JagString arg0) { if (WorldMap.labels == null || arg0.length() == 0) { diff --git a/client/src/main/java/Static92.java b/client/src/main/java/Static92.java index 0480ef6..01623ab 100644 --- a/client/src/main/java/Static92.java +++ b/client/src/main/java/Static92.java @@ -7,9 +7,6 @@ public final class Static92 { @OriginalMember(owner = "client!hd", name = "e", descriptor = "Lclient!qf;") public static Sprite aClass3_Sub2_Sub1_6; - @OriginalMember(owner = "client!hd", name = "a", descriptor = "I") - public static int anInt2430 = 0; - @OriginalMember(owner = "client!hd", name = "g", descriptor = "[J") public static final long[] aLongArray3 = new long[200]; @@ -17,7 +14,7 @@ public final class Static92 { public static int anInt2433 = 0; @OriginalMember(owner = "client!hd", name = "l", descriptor = "Lclient!na;") - public static final JagString aClass100_510 = Static28.parse("null"); + public static final JagString aClass100_510 = JagString.parse("null"); @OriginalMember(owner = "client!hd", name = "a", descriptor = "(IIIIIIII)V") public static void method1881(@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) { @@ -70,8 +67,4 @@ public final class Static92 { } } - @OriginalMember(owner = "client!hd", name = "a", descriptor = "(I)V") - public static void method1882() { - Static220.aClass99_28.method3103(); - } } diff --git a/client/src/main/java/Static93.java b/client/src/main/java/Static93.java index 6dc91c7..4a75a88 100644 --- a/client/src/main/java/Static93.java +++ b/client/src/main/java/Static93.java @@ -4,12 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static93 { - @OriginalMember(owner = "client!he", name = "cb", descriptor = "Lclient!ve;") - public static Js5 modelsArchive; - - @OriginalMember(owner = "client!he", name = "V", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_13 = new SoftLruHashTable(64); - @OriginalMember(owner = "client!he", name = "Y", descriptor = "I") public static volatile int anInt2467 = 0; @@ -20,16 +14,13 @@ public final class Static93 { public static Mouse instance = new Mouse(); @OriginalMember(owner = "client!he", name = "db", descriptor = "Lclient!na;") - public static final JagString aClass100_517 = Static28.parse(""); + public static final JagString aClass100_517 = JagString.parse(""); @OriginalMember(owner = "client!he", name = "eb", descriptor = "[I") public static final int[] anIntArray219 = new int[1000]; - @OriginalMember(owner = "client!he", name = "fb", descriptor = "Lclient!n;") - public static final SoftLruHashTable aClass99_14 = new SoftLruHashTable(30); - @OriginalMember(owner = "client!he", name = "gb", descriptor = "Lclient!na;") - public static final JagString aClass100_518 = Static28.parse("www"); + public static final JagString aClass100_518 = JagString.parse("www"); @OriginalMember(owner = "client!he", name = "c", descriptor = "(II)V") public static void method1906(@OriginalArg(1) int arg0) { diff --git a/client/src/main/java/Static96.java b/client/src/main/java/Static96.java index bcbc214..d2369fe 100644 --- a/client/src/main/java/Static96.java +++ b/client/src/main/java/Static96.java @@ -11,18 +11,18 @@ public final class Static96 { public static int[] anIntArray235; @OriginalMember(owner = "client!hh", name = "a", descriptor = "Lclient!na;") - public static final JagString aClass100_520 = Static28.parse("(U4"); + public static final JagString aClass100_520 = JagString.parse("(U4"); @OriginalMember(owner = "client!hh", name = "b", descriptor = "Lclient!na;") - public static final JagString aClass100_521 = Static28.parse("::tele "); + public static final JagString aClass100_521 = JagString.parse("::tele "); @OriginalMember(owner = "client!hh", name = "k", descriptor = "Lclient!na;") - public static final JagString aClass100_522 = Static28.parse("::wm0"); + public static final JagString aClass100_522 = JagString.parse("::wm0"); @OriginalMember(owner = "client!hh", name = "a", descriptor = "(II)V") public static void method1949(@OriginalArg(1) int arg0) { - if (Static245.load(arg0)) { - Static118.method2354(-1, Static241.components[arg0]); + if (InterfaceList.load(arg0)) { + Static118.method2354(-1, InterfaceList.components[arg0]); } } @@ -46,7 +46,7 @@ public final class Static96 { Static84.anIntArray209[0] = arg11; @Pc(69) int local69 = 0; @Pc(71) boolean local71 = false; - @Pc(76) int[][] local76 = Static148.collisionMaps[Static55.level].anIntArrayArray30; + @Pc(76) int[][] local76 = PathFinder.collisionMaps[Static55.level].anIntArrayArray30; @Pc(201) int local201; @Pc(242) int local242; label397: while (local69 != local65) { @@ -58,16 +58,16 @@ public final class Static96 { break; } if (arg6 != 0) { - if ((arg6 < 5 || arg6 == 10) && Static148.collisionMaps[Static55.level].method3042(arg0, local3, local10, arg5, arg6 - 1, arg4, arg3)) { + if ((arg6 < 5 || arg6 == 10) && PathFinder.collisionMaps[Static55.level].method3042(arg0, local3, local10, arg5, arg6 - 1, arg4, arg3)) { local71 = true; break; } - if (arg6 < 10 && Static148.collisionMaps[Static55.level].method3046(arg0, arg6 - 1, arg5, local10, arg4, arg3, local3)) { + if (arg6 < 10 && PathFinder.collisionMaps[Static55.level].method3046(arg0, arg6 - 1, arg5, local10, arg4, arg3, local3)) { local71 = true; break; } } - if (arg1 != 0 && arg9 != 0 && Static148.collisionMaps[Static55.level].method3052(arg5, local10, local3, arg4, arg1, arg7, arg0, arg9)) { + if (arg1 != 0 && arg9 != 0 && PathFinder.collisionMaps[Static55.level].method3052(arg5, local10, local3, arg4, arg1, arg7, arg0, arg9)) { local71 = true; break; } diff --git a/client/src/main/java/Static97.java b/client/src/main/java/Static97.java index 38b43ee..5f5ed58 100644 --- a/client/src/main/java/Static97.java +++ b/client/src/main/java/Static97.java @@ -9,9 +9,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static97 { - @OriginalMember(owner = "client!hi", name = "g", descriptor = "I") - public static int worldListAlternatePort; - @OriginalMember(owner = "client!hi", name = "a", descriptor = "I") public static int anInt2503 = -1; @@ -96,33 +93,6 @@ public final class Static97 { } } - @OriginalMember(owner = "client!hi", name = "a", descriptor = "(Lclient!wa;I)V") - public static void method1962(@OriginalArg(0) Buffer arg0) { - @Pc(9) int local9 = arg0.gSmart1or2(); - Static203.aClass32Array1 = new Class32[local9]; - @Pc(14) int local14; - for (local14 = 0; local14 < local9; local14++) { - Static203.aClass32Array1[local14] = new Class32(); - Static203.aClass32Array1[local14].anInt1739 = arg0.gSmart1or2(); - Static203.aClass32Array1[local14].aClass100_378 = arg0.gjstr2(); - } - Static19.anInt636 = arg0.gSmart1or2(); - Static171.anInt4157 = arg0.gSmart1or2(); - Static106.anInt2871 = arg0.gSmart1or2(); - Static196.aClass10_Sub1Array2 = new World[Static171.anInt4157 + 1 - Static19.anInt636]; - for (local14 = 0; local14 < Static106.anInt2871; local14++) { - @Pc(77) int local77 = arg0.gSmart1or2(); - @Pc(85) World local85 = Static196.aClass10_Sub1Array2[local77] = new World(); - local85.country = arg0.g1(); - local85.flags = arg0.g4(); - local85.anInt382 = local77 + Static19.anInt636; - local85.aClass100_69 = arg0.gjstr2(); - local85.aClass100_71 = arg0.gjstr2(); - } - Static80.anInt4702 = arg0.g4(); - Static61.aBoolean109 = true; - } - @OriginalMember(owner = "client!hi", name = "a", descriptor = "(Lclient!be;B)Lclient!na;") public static JagString method1963(@OriginalArg(0) Component arg0) { if (Static36.method940(arg0).method512() == 0) { diff --git a/client/src/main/java/Static98.java b/client/src/main/java/Static98.java index 2d5564b..1a41f21 100644 --- a/client/src/main/java/Static98.java +++ b/client/src/main/java/Static98.java @@ -7,9 +7,6 @@ public final class Static98 { @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 = "a", descriptor = "(II)V") public static void method1964(@OriginalArg(0) int arg0) { WorldMap.anInt4901 = -1; diff --git a/client/src/main/java/Static99.java b/client/src/main/java/Static99.java index 0410b8c..436e0da 100644 --- a/client/src/main/java/Static99.java +++ b/client/src/main/java/Static99.java @@ -12,7 +12,7 @@ public final class Static99 { public static final LinkedList aClass69_64 = new LinkedList(); @OriginalMember(owner = "client!hk", name = "db", descriptor = "Lclient!na;") - public static final JagString aClass100_529 = Static28.parse("::wm3"); + public static final JagString aClass100_529 = JagString.parse("::wm3"); @OriginalMember(owner = "client!hk", name = "fb", descriptor = "[I") public static final int[] anIntArray240 = new int[25]; diff --git a/client/src/main/java/StructTypeList.java b/client/src/main/java/StructTypeList.java new file mode 100644 index 0000000..f0a1cf2 --- /dev/null +++ b/client/src/main/java/StructTypeList.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 StructTypeList { + @OriginalMember(owner = "client!sk", name = "bb", descriptor = "Lclient!gn;") + public static final LruHashTable types = new LruHashTable(64); + @OriginalMember(owner = "client!bm", name = "e", descriptor = "Lclient!ve;") + public static Js5 archive; + + @OriginalMember(owner = "client!eh", name = "a", descriptor = "(Lclient!ve;I)V") + public static void init(@OriginalArg(0) Js5 arg0) { + archive = arg0; + } + + @OriginalMember(owner = "client!jj", name = "a", descriptor = "(BI)Lclient!lk;") + public static StructType get(@OriginalArg(1) int arg0) { + @Pc(10) StructType local10 = (StructType) types.get((long) arg0); + if (local10 != null) { + return local10; + } + @Pc(26) byte[] local26 = archive.getFile(26, arg0); + local10 = new StructType(); + if (local26 != null) { + local10.decode(new Buffer(local26)); + } + types.put(local10, (long) arg0); + return local10; + } +} diff --git a/client/src/main/java/SubScript.java b/client/src/main/java/SubScript.java deleted file mode 100644 index 0472e49..0000000 --- a/client/src/main/java/SubScript.java +++ /dev/null @@ -1,6 +0,0 @@ -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/TitleScreen.java b/client/src/main/java/TitleScreen.java new file mode 100644 index 0000000..1ec8e2c --- /dev/null +++ b/client/src/main/java/TitleScreen.java @@ -0,0 +1,58 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class TitleScreen { + @OriginalMember(owner = "client!oi", name = "a", descriptor = "(Lclient!ve;B)V") + public static void load(@OriginalArg(0) Js5 archive) { + if (Static18.loaded) { + return; + } + + if (GlRenderer.enabled) { + Static46.clear(); + } else { + SoftwareRaster.clear(); + } + + @Pc(20) int height = GameShell.canvasHeight; + @Pc(26) int width = height * 956 / 503; + Static78.titleBg = Static130.loadSpriteAutoDetect(archive, Static262.bgId); + Static78.titleBg.renderResizedTransparent((GameShell.canvasWidth - width) / 2, 0, width, height); + Static243.logo = Static40.loadIndexedSpriteAutoDetect(Static136.logoId, archive); + Static243.logo.renderTransparent(GameShell.canvasWidth / 2 - Static243.logo.width / 2, 18); + Static18.loaded = true; + } + + @OriginalMember(owner = "client!je", name = "f", descriptor = "(B)V") + public static void clear() { + if (Static18.loaded) { + Static243.logo = null; + Static18.loaded = false; + Static78.titleBg = null; + } + } + + @OriginalMember(owner = "client!nd", name = "a", descriptor = "(ILclient!ve;)V") + public static void init(@OriginalArg(1) Js5 arg0) { + Static262.bgId = arg0.getGroupId(Static27.aClass100_165); + Static136.logoId = arg0.getGroupId(Static165.aClass100_776); + } + + @OriginalMember(owner = "client!lk", name = "a", descriptor = "(ILclient!ve;)I") + public static int getReady(@OriginalArg(1) Js5 archive) { + @Pc(1) int ready = 0; + if (archive.isFileReady(Static262.bgId)) { + ready++; + } + if (archive.isFileReady(Static136.logoId)) { + ready++; + } + return ready; + } + + @OriginalMember(owner = "client!ia", name = "a", descriptor = "(I)I") + public static int getTotal() { + return 2; + } +} diff --git a/client/src/main/java/UnderwaterMaterialRenderer.java b/client/src/main/java/UnderwaterMaterialRenderer.java index 910d459..cf2877d 100644 --- a/client/src/main/java/UnderwaterMaterialRenderer.java +++ b/client/src/main/java/UnderwaterMaterialRenderer.java @@ -8,7 +8,9 @@ import org.openrs2.deob.annotation.Pc; @OriginalClass("client!wg") public final class UnderwaterMaterialRenderer implements MaterialRenderer { - @OriginalMember(owner = "client!wg", name = "c", descriptor = "I") + @OriginalMember(owner = "client!wg", name = "b", descriptor = "Z") + public static boolean aBoolean308 = false; + @OriginalMember(owner = "client!wg", name = "c", descriptor = "I") private int anInt5805 = -1; @OriginalMember(owner = "client!wg", name = "a", descriptor = "[F") @@ -34,18 +36,39 @@ public final class UnderwaterMaterialRenderer implements MaterialRenderer { local40.glTexParameteri(GL2.GL_TEXTURE_1D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); local40.glTexParameteri(GL2.GL_TEXTURE_1D, GL2.GL_TEXTURE_WRAP_S, GL2.GL_CLAMP_TO_EDGE); this.anInt5805 = local17[0]; - Static275.aBoolean308 = GlRenderer.maxTextureUnits > 2 && GlRenderer.extTexture3dSupported; + aBoolean308 = GlRenderer.maxTextureUnits > 2 && GlRenderer.extTexture3dSupported; this.method4606(); } } + @OriginalMember(owner = "client!wg", name = "e", descriptor = "()I") + public static int method4607() { + return aBoolean308 ? 33986 : 33985; + } + + @OriginalMember(owner = "client!wg", name = "f", descriptor = "()V") + public static void method4608() { + @Pc(1) GL2 local1 = GlRenderer.gl; + local1.glClientActiveTexture(method4607()); + local1.glDisableClientState(GL2.GL_TEXTURE_COORD_ARRAY); + local1.glClientActiveTexture(GL2.GL_TEXTURE0); + } + + @OriginalMember(owner = "client!wg", name = "g", descriptor = "()V") + public static void method4609() { + @Pc(1) GL2 local1 = GlRenderer.gl; + local1.glClientActiveTexture(method4607()); + local1.glEnableClientState(GL2.GL_TEXTURE_COORD_ARRAY); + local1.glClientActiveTexture(GL2.GL_TEXTURE0); + } + @OriginalMember(owner = "client!wg", name = "d", descriptor = "()V") private void method4606() { @Pc(1) GL2 local1 = GlRenderer.gl; this.anInt5806 = local1.glGenLists(2); local1.glNewList(this.anInt5806, GL2.GL_COMPILE); local1.glActiveTexture(GL2.GL_TEXTURE1); - if (Static275.aBoolean308) { + if (aBoolean308) { local1.glBindTexture(GL2.GL_TEXTURE_3D, Static151.anInt3587); local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_ADD); local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_COLOR); @@ -77,7 +100,7 @@ public final class UnderwaterMaterialRenderer implements MaterialRenderer { local1.glEndList(); local1.glNewList(this.anInt5806 + 1, GL2.GL_COMPILE); local1.glActiveTexture(GL2.GL_TEXTURE1); - if (Static275.aBoolean308) { + if (aBoolean308) { local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_MODULATE); local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_COLOR); local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_ALPHA, GL2.GL_MODULATE); @@ -127,14 +150,14 @@ public final class UnderwaterMaterialRenderer implements MaterialRenderer { public final void method4604(@OriginalArg(0) int arg0) { @Pc(1) GL2 local1 = GlRenderer.gl; local1.glActiveTexture(GL2.GL_TEXTURE1); - if (Static275.aBoolean308 || arg0 >= 0) { + if (aBoolean308 || arg0 >= 0) { local1.glPushMatrix(); local1.glLoadIdentity(); local1.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); local1.glRotatef((float) Static254.anInt5559 * 360.0F / 2048.0F, 1.0F, 0.0F, 0.0F); local1.glRotatef((float) Static59.anInt1815 * 360.0F / 2048.0F, 0.0F, 1.0F, 0.0F); local1.glTranslatef((float) -Static12.anInt406, (float) -Static199.anInt4675, (float) -Static230.anInt5158); - if (Static275.aBoolean308) { + if (aBoolean308) { this.aFloatArray29[0] = 0.001F; this.aFloatArray29[1] = 9.0E-4F; this.aFloatArray29[2] = 0.0F; diff --git a/client/src/main/java/VarbitTypeList.java b/client/src/main/java/VarbitTypeList.java new file mode 100644 index 0000000..ecf3cbd --- /dev/null +++ b/client/src/main/java/VarbitTypeList.java @@ -0,0 +1,45 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class VarbitTypeList { + @OriginalMember(owner = "client!jl", name = "G", descriptor = "Lclient!n;") + public static final SoftLruHashTable types = new SoftLruHashTable(64); + @OriginalMember(owner = "client!nj", name = "c", descriptor = "Lclient!ve;") + public static Js5 archive; + + @OriginalMember(owner = "client!og", name = "a", descriptor = "(Lclient!ve;I)V") + public static void init(@OriginalArg(0) Js5 arg0) { + archive = arg0; + } + + @OriginalMember(owner = "client!jl", name = "a", descriptor = "(IB)Lclient!kk;") + public static VarbitType get(@OriginalArg(0) int arg0) { + @Pc(10) VarbitType local10 = (VarbitType) types.get((long) arg0); + if (local10 != null) { + return local10; + } + @Pc(31) byte[] local31 = archive.getFile(Static254.method4349(arg0), Static274.method3845(arg0)); + local10 = new VarbitType(); + if (local31 != null) { + local10.decode(new Buffer(local31)); + } + types.put(local10, (long) arg0); + return local10; + } + + @OriginalMember(owner = "client!wa", name = "d", descriptor = "(BI)V") + public static void clean() { + types.clean(5); + } + + @OriginalMember(owner = "client!gd", name = "a", descriptor = "(I)V") + public static void method1694() { + types.method3103(); + } + + @OriginalMember(owner = "client!ec", name = "b", descriptor = "(I)V") + public static void method1295() { + types.clear(); + } +} diff --git a/client/src/main/java/VarpTypeList.java b/client/src/main/java/VarpTypeList.java new file mode 100644 index 0000000..f458dad --- /dev/null +++ b/client/src/main/java/VarpTypeList.java @@ -0,0 +1,48 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class VarpTypeList { + @OriginalMember(owner = "client!sm", name = "c", descriptor = "Lclient!n;") + public static final SoftLruHashTable types = new SoftLruHashTable(64); + @OriginalMember(owner = "client!gg", name = "ab", descriptor = "Lclient!ve;") + public static Js5 archive; + @OriginalMember(owner = "client!nb", name = "p", descriptor = "I") + public static int anInt4043; + + @OriginalMember(owner = "client!sj", name = "a", descriptor = "(Lclient!ve;B)V") + public static void init(@OriginalArg(0) Js5 arg0) { + archive = arg0; + anInt4043 = archive.getGroupCapacity(16); + } + + @OriginalMember(owner = "client!ub", name = "a", descriptor = "(II)Lclient!eh;") + public static VarpType get(@OriginalArg(1) int arg0) { + @Pc(10) VarpType local10 = (VarpType) types.get((long) arg0); + if (local10 != null) { + return local10; + } + @Pc(20) byte[] local20 = archive.getFile(16, arg0); + local10 = new VarpType(); + if (local20 != null) { + local10.decode(new Buffer(local20)); + } + types.put(local10, (long) arg0); + return local10; + } + + @OriginalMember(owner = "client!ud", name = "d", descriptor = "(I)V") + public static void method4266() { + types.clear(); + } + + @OriginalMember(owner = "client!ab", name = "b", descriptor = "(B)V") + public static void method4657() { + types.method3103(); + } + + @OriginalMember(owner = "client!bn", name = "c", descriptor = "(II)V") + public static void clean() { + types.clean(5); + } +} diff --git a/client/src/main/java/WordPack.java b/client/src/main/java/WordPack.java new file mode 100644 index 0000000..29d4350 --- /dev/null +++ b/client/src/main/java/WordPack.java @@ -0,0 +1,14 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; + +public class WordPack { + @OriginalMember(owner = "client!vl", name = "f", descriptor = "Lclient!na;") + public static final JagString CABBAGE = JagString.parse("Cabbage"); + @OriginalMember(owner = "client!f", name = "W", descriptor = "Lclient!fi;") + public static HuffmanCodec codec; + + @OriginalMember(owner = "client!a", name = "a", descriptor = "(Lclient!fi;I)V") + public static void init(@OriginalArg(0) HuffmanCodec arg0) { + codec = arg0; + } +} diff --git a/client/src/main/java/World.java b/client/src/main/java/World.java index 6e200c8..b548926 100644 --- a/client/src/main/java/World.java +++ b/client/src/main/java/World.java @@ -5,16 +5,16 @@ import org.openrs2.deob.annotation.OriginalMember; public final class World extends AbstractWorld { @OriginalMember(owner = "client!ba", name = "t", descriptor = "Lclient!na;") - public JagString aClass100_69; + public JagString activity; @OriginalMember(owner = "client!ba", name = "u", descriptor = "I") - public int anInt382; + public int id; @OriginalMember(owner = "client!ba", name = "A", descriptor = "Lclient!na;") - public JagString aClass100_71; + public JagString hostname; @OriginalMember(owner = "client!ba", name = "g", descriptor = "(I)Lclient!ee;") public final Class32 getWorldInfo() { - return Static203.aClass32Array1[this.country]; + return WorldList.countries[this.country]; } } diff --git a/client/src/main/java/WorldList.java b/client/src/main/java/WorldList.java new file mode 100644 index 0000000..9dfa7d5 --- /dev/null +++ b/client/src/main/java/WorldList.java @@ -0,0 +1,216 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +import java.io.IOException; +import java.net.Socket; + +public class WorldList { + @OriginalMember(owner = "client!gi", name = "c", descriptor = "I") + public static int step = 0; + @OriginalMember(owner = "client!be", name = "kc", descriptor = "J") + public static long openTime = 0L; + @OriginalMember(owner = "client!sk", name = "gb", descriptor = "J") + public static long closeTime = 0L; + @OriginalMember(owner = "client!en", name = "A", descriptor = "Z") + public static boolean loaded = false; + @OriginalMember(owner = "client!jb", name = "y", descriptor = "I") + public static int bufferLen = 0; + @OriginalMember(owner = "client!si", name = "cb", descriptor = "[B") + public static byte[] buffer; + @OriginalMember(owner = "client!lb", name = "u", descriptor = "I") + public static int bufferOff = 0; + @OriginalMember(owner = "client!hm", name = "fb", descriptor = "[Lclient!ba;") + public static World[] sorted = new World[0]; + @OriginalMember(owner = "client!ic", name = "n", descriptor = "I") + public static int size; + @OriginalMember(owner = "client!gf", name = "T", descriptor = "I") + public static int checksum; + @OriginalMember(owner = "client!qh", name = "e", descriptor = "[Lclient!ee;") + public static Class32[] countries; + @OriginalMember(owner = "client!bi", name = "R", descriptor = "I") + public static int minId; + @OriginalMember(owner = "client!ni", name = "q", descriptor = "I") + public static int maxId; + @OriginalMember(owner = "client!pl", name = "a", descriptor = "[Lclient!ba;") + public static World[] worlds; + @OriginalMember(owner = "client!k", name = "t", descriptor = "I") + public static int errors = 0; + + @OriginalMember(owner = "client!ql", name = "b", descriptor = "(I)I") + public static int fetch() { + try { + if (step == 0) { + if (MonotonicClock.currentTimeMillis() - 5000L < closeTime) { + return 0; + } + Protocol.socketRequest = GameShell.signLink.openSocket(client.worldListHostname, client.worldListPort); + openTime = MonotonicClock.currentTimeMillis(); + step = 1; + } + if (openTime + 30000L < MonotonicClock.currentTimeMillis()) { + return close(1000); + } + @Pc(82) int local82; + @Pc(124) int local124; + if (step == 1) { + if (Protocol.socketRequest.status == 2) { + return close(1001); + } + if (Protocol.socketRequest.status != 1) { + return -1; + } + Protocol.socket = new BufferedSocket((Socket) Protocol.socketRequest.result, GameShell.signLink); + Protocol.outboundBuffer.offset = 0; + Protocol.socketRequest = null; + local82 = 0; + if (loaded) { + local82 = checksum; + } + Protocol.outboundBuffer.p1(255); + Protocol.outboundBuffer.p4(local82); + Protocol.socket.write(Protocol.outboundBuffer.data, Protocol.outboundBuffer.offset); + if (client.musicChannel != null) { + client.musicChannel.method3571(); + } + if (client.soundChannel != null) { + client.soundChannel.method3571(); + } + local124 = Protocol.socket.read(); + if (client.musicChannel != null) { + client.musicChannel.method3571(); + } + if (client.soundChannel != null) { + client.soundChannel.method3571(); + } + if (local124 != 0) { + return close(local124); + } + step = 2; + } + if (step == 2) { + if (Protocol.socket.available() < 2) { + return -1; + } + bufferLen = Protocol.socket.read(); + bufferLen <<= 0x8; + bufferLen += Protocol.socket.read(); + step = 3; + bufferOff = 0; + buffer = new byte[bufferLen]; + } + if (step != 3) { + return -1; + } + local82 = Protocol.socket.available(); + if (local82 < 1) { + return -1; + } + if (local82 > bufferLen - bufferOff) { + local82 = bufferLen - bufferOff; + } + Protocol.socket.read(bufferOff, local82, buffer); + bufferOff += local82; + if (bufferOff < bufferLen) { + return -1; + } else if (decode(buffer)) { + sorted = new World[size]; + local124 = 0; + for (@Pc(240) int local240 = minId; local240 <= maxId; local240++) { + @Pc(247) World local247 = Static54.getWorld(local240); + if (local247 != null) { + sorted[local124++] = local247; + } + } + Protocol.socket.close(); + Protocol.socket = null; + errors = 0; + step = 0; + buffer = null; + closeTime = MonotonicClock.currentTimeMillis(); + return 0; + } else { + return close(1002); + } + } catch (@Pc(277) IOException local277) { + return close(1003); + } + } + + @OriginalMember(owner = "client!an", name = "a", descriptor = "(BI)I") + public static int close(@OriginalArg(1) int arg0) { + if (Protocol.socket != null) { + Protocol.socket.close(); + Protocol.socket = null; + } + errors++; + if (errors > 4) { + step = 0; + errors = 0; + return arg0; + } + step = 0; + if (client.worldListPort == client.worldListDefaultPort) { + client.worldListPort = client.worldListAlternatePort; + } else { + client.worldListPort = client.worldListDefaultPort; + } + return -1; + } + + @OriginalMember(owner = "client!hi", name = "a", descriptor = "(Lclient!wa;I)V") + public static void decodeWorlds(@OriginalArg(0) Buffer buffer) { + @Pc(9) int countryCount = buffer.gSmart1or2(); + countries = new Class32[countryCount]; + @Pc(14) int i; + for (i = 0; i < countryCount; i++) { + countries[i] = new Class32(); + countries[i].flag = buffer.gSmart1or2(); + countries[i].name = buffer.gjstr2(); + } + minId = buffer.gSmart1or2(); + maxId = buffer.gSmart1or2(); + size = buffer.gSmart1or2(); + worlds = new World[maxId + 1 - minId]; + for (i = 0; i < size; i++) { + @Pc(77) int offset = buffer.gSmart1or2(); + @Pc(85) World world = worlds[offset] = new World(); + world.country = buffer.g1(); + world.flags = buffer.g4(); + world.id = offset + minId; + world.activity = buffer.gjstr2(); + world.hostname = buffer.gjstr2(); + } + checksum = buffer.g4(); + loaded = true; + } + + @OriginalMember(owner = "client!nh", name = "a", descriptor = "(I[B)Z") + public static boolean decode(@OriginalArg(1) byte[] arg0) { + @Pc(13) Buffer local13 = new Buffer(arg0); + @Pc(17) int local17 = local13.g1(); + if (local17 != 1) { + return false; + } + @Pc(33) boolean local33 = local13.g1() == 1; + if (local33) { + decodeWorlds(local13); + } + decodePlayers(local13); + return true; + } + + @OriginalMember(owner = "client!fh", name = "a", descriptor = "(Lclient!wa;I)V") + public static void decodePlayers(@OriginalArg(0) Buffer arg0) { + for (@Pc(7) int local7 = 0; local7 < size; local7++) { + @Pc(18) int local18 = arg0.gSmart1or2(); + @Pc(22) int local22 = arg0.g2(); + if (local22 == 65535) { + local22 = -1; + } + if (worlds[local18] != null) { + worlds[local18].players = local22; + } + } + } +} diff --git a/client/src/main/java/WorldMap.java b/client/src/main/java/WorldMap.java index 434095f..7ad0f15 100644 --- a/client/src/main/java/WorldMap.java +++ b/client/src/main/java/WorldMap.java @@ -4,15 +4,15 @@ 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"); + public static final JagString UNDERLAY = JagString.parse("underlay"); @OriginalMember(owner = "client!vj", name = "m", descriptor = "Lclient!na;") - public static final JagString LABELS = Static28.parse("_labels"); + public static final JagString LABELS = JagString.parse("_labels"); @OriginalMember(owner = "client!ac", name = "m", descriptor = "Lclient!na;") - public static final JagString OVERLAY = Static28.parse("overlay"); + public static final JagString OVERLAY = JagString.parse("overlay"); @OriginalMember(owner = "client!fm", name = "gb", descriptor = "Lclient!na;") - public static final JagString OVERLAY2 = Static28.parse("overlay2"); + public static final JagString OVERLAY2 = JagString.parse("overlay2"); @OriginalMember(owner = "client!df", name = "c", descriptor = "Lclient!na;") - public static final JagString LOC = Static28.parse("loc"); + public static final JagString LOC = JagString.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") @@ -79,6 +79,14 @@ public class WorldMap { public static int[][][] underlayColors; @OriginalMember(owner = "client!uc", name = "d", descriptor = "[[[I") public static int[][][] anIntArrayArrayArray17; + @OriginalMember(owner = "client!bn", name = "N", descriptor = "Lclient!be;") + public static Component component; + @OriginalMember(owner = "client!mc", name = "Q", descriptor = "Lclient!na;") + public static JagString aClass100_724; + @OriginalMember(owner = "client!fi", name = "j", descriptor = "Lclient!qf;") + public static Sprite aClass3_Sub2_Sub1_2; + @OriginalMember(owner = "client!mc", name = "S", descriptor = "Lclient!mm;") + public static SoftwareSprite aClass3_Sub2_Sub1_Sub1_2; @OriginalMember(owner = "client!pa", name = "d", descriptor = "(I)V") public static void method3413() { @@ -298,7 +306,7 @@ public class WorldMap { if (local175 > local114) { local225 = underlays[local114][local203] & 0xFF; if (local225 > 0) { - @Pc(236) FluType local236 = Static199.method3593(local225 - 1); + @Pc(236) FluType local236 = FluTypeList.get(local225 - 1); local183[local203] += local236.weightedHue; local180[local203] += local236.saturation; local186[local203] += local236.lightness; @@ -310,7 +318,7 @@ public class WorldMap { if (local225 >= 0) { local293 = underlays[local225][local203] & 0xFF; if (local293 > 0) { - @Pc(302) FluType local302 = Static199.method3593(local293 - 1); + @Pc(302) FluType local302 = FluTypeList.get(local293 - 1); local183[local203] -= local302.weightedHue; local180[local203] -= local302.saturation; local186[local203] -= local302.lightness; @@ -540,14 +548,14 @@ public class WorldMap { underlayColors[local84][local95] = new int[4096]; } id--; - @Pc(312) LocType local312 = Static271.get(id); + @Pc(312) LocType local312 = LocTypeList.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; + underlayColors[local84][local95][(63 - local155 << 6) + local150] = local312.id + 1; @Pc(353) MapElement element = new MapElement(); element.id = local312.mapElement; element.anInt4307 = local53; @@ -830,4 +838,39 @@ public class WorldMap { } } } + + @OriginalMember(owner = "client!jb", name = "a", descriptor = "(IZ)V") + public static void clear(@OriginalArg(1) boolean arg0) { + aByteArrayArrayArray8 = null; + underlayColors = null; + component = null; + aByteArrayArrayArray3 = null; + overlayColors = null; + aByteArrayArrayArray10 = null; + if (arg0 && currentMap != null) { + aClass100_724 = currentMap.group; + } else { + aClass100_724 = null; + } + aByteArrayArrayArray7 = null; + aByteArrayArrayArray12 = null; + scenery = null; + anIntArrayArrayArray17 = null; + loadPercentage = 0; + currentMap = null; + mapElements.clear(); + labels = null; + anInt4901 = -1; + font22 = null; + font30 = null; + font12 = null; + font26 = null; + font11 = null; + font14 = null; + font17 = null; + font19 = null; + aClass3_Sub2_Sub1_2 = null; + anInt3482 = -1; + aClass3_Sub2_Sub1_Sub1_2 = null; + } } diff --git a/client/src/main/java/client.java b/client/src/main/java/client.java index 4043a68..dc8f221 100644 --- a/client/src/main/java/client.java +++ b/client/src/main/java/client.java @@ -16,6 +16,12 @@ 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!wa", name = "Eb", descriptor = "[Lclient!bg;") + public static final Js5CachedResourceProvider[] js5Providers = new Js5CachedResourceProvider[28]; + @OriginalMember(owner = "client!jm", name = "A", descriptor = "Lclient!na;") + static final JagString aClass100_603 = JagString.parse(""); + @OriginalMember(owner = "client!jm", name = "z", descriptor = "Lclient!na;") + public static JagString mainLoadSecondaryText = aClass100_603; @OriginalMember(owner = "client!sg", name = "k", descriptor = "Lclient!ve;") public static Js5 js5Archive23; @OriginalMember(owner = "client!pb", name = "Q", descriptor = "I") @@ -66,6 +72,114 @@ public final class client extends GameShell { public static FrameBuffer frameBuffer; @OriginalMember(owner = "client!id", name = "f", descriptor = "Z") public static boolean clean = false; + @OriginalMember(owner = "client!bl", name = "P", descriptor = "I") + public static int js5ConnectDelay = 0; + @OriginalMember(owner = "client!wc", name = "c", descriptor = "I") + public static int defaultPort; + @OriginalMember(owner = "client!ee", name = "g", descriptor = "I") + public static int alternatePort; + @OriginalMember(owner = "client!ra", name = "s", descriptor = "I") + public static int port; + @OriginalMember(owner = "client!ud", name = "K", descriptor = "I") + public static int worldListDefaultPort; + @OriginalMember(owner = "client!r", name = "f", descriptor = "I") + public static int worldListPort; + @OriginalMember(owner = "client!v", name = "f", descriptor = "Lclient!al;") + public static Js5MasterIndex js5MasterIndex; + @OriginalMember(owner = "client!re", name = "B", descriptor = "Lclient!ve;") + public static Js5 js5Archive0; + @OriginalMember(owner = "client!ud", name = "J", descriptor = "Lclient!ve;") + public static Js5 js5Archive1; + @OriginalMember(owner = "client!wf", name = "g", descriptor = "Lclient!ve;") + public static Js5 js5Archive2; + @OriginalMember(owner = "client!dc", name = "z", descriptor = "Lclient!ve;") + public static Js5 js5Archive3; + @OriginalMember(owner = "client!uc", name = "c", descriptor = "Lclient!ve;") + public static Js5 js5Archive4; + @OriginalMember(owner = "client!ca", name = "Z", descriptor = "Lclient!ve;") + public static Js5 js5Archive5; + @OriginalMember(owner = "client!kc", name = "w", descriptor = "Lclient!ve;") + public static Js5 js5Archive6; + @OriginalMember(owner = "client!vl", name = "g", descriptor = "Lclient!ve;") + public static Js5 js5Archive7; + @OriginalMember(owner = "client!ra", name = "K", descriptor = "Lclient!ve;") + public static Js5 js5Archive8; + @OriginalMember(owner = "client!pk", name = "Z", descriptor = "Lclient!ve;") + public static Js5 js5Archive9; + @OriginalMember(owner = "client!ol", name = "U", descriptor = "Lclient!ve;") + public static Js5 js5Archive10; + @OriginalMember(owner = "client!rg", name = "z", descriptor = "Lclient!ve;") + public static Js5 js5Archive11; + @OriginalMember(owner = "client!bf", name = "s", descriptor = "Lclient!ve;") + public static Js5 js5Archive12; + @OriginalMember(owner = "client!ve", name = "l", descriptor = "Lclient!ve;") + public static Js5 js5Archive13; + @OriginalMember(owner = "client!kl", name = "r", descriptor = "Lclient!ve;") + public static Js5 js5Archive14; + @OriginalMember(owner = "client!km", name = "Oc", descriptor = "Lclient!ve;") + public static Js5 js5Archive15; + @OriginalMember(owner = "client!wl", name = "s", descriptor = "Lclient!ve;") + public static Js5 js5Archive16; + @OriginalMember(owner = "client!km", name = "Nc", descriptor = "Lclient!ve;") + public static Js5 js5Archive17; + @OriginalMember(owner = "client!nj", name = "l", descriptor = "Lclient!ve;") + public static Js5 js5Archive18; + @OriginalMember(owner = "client!ni", name = "k", descriptor = "Lclient!ve;") + public static Js5 js5Archive19; + @OriginalMember(owner = "client!ui", name = "cb", descriptor = "Lclient!ve;") + public static Js5 js5Archive20; + @OriginalMember(owner = "client!jh", name = "p", descriptor = "Lclient!ve;") + public static Js5 js5Archive21; + @OriginalMember(owner = "client!mf", name = "W", descriptor = "Lclient!ve;") + public static Js5 js5Archive22; + @OriginalMember(owner = "client!uj", name = "J", descriptor = "Lclient!ve;") + public static Js5 js5Archive24; + @OriginalMember(owner = "client!cd", name = "B", descriptor = "Lclient!ve;") + public static Js5 js5Archive25; + @OriginalMember(owner = "client!nd", name = "t", descriptor = "Lclient!ve;") + public static Js5 js5Archive26; + @OriginalMember(owner = "client!sf", name = "b", descriptor = "Lclient!ve;") + public static Js5 js5Archive27; + @OriginalMember(owner = "client!qc", name = "P", descriptor = "I") + public static int mainLoadPercentage = 10; + @OriginalMember(owner = "client!nc", name = "j", descriptor = "I") + public static int mainLoadState = 0; + @OriginalMember(owner = "client!li", name = "l", descriptor = "Lclient!ge;") + public static Cache masterCache; + @OriginalMember(owner = "client!li", name = "v", descriptor = "Lclient!va;") + public static MidiPcmStream musicStream; + @OriginalMember(owner = "client!qi", name = "C", descriptor = "Lclient!ei;") + public static MixerPcmStream soundStream; + @OriginalMember(owner = "client!ef", name = "p", descriptor = "Lclient!vj;") + public static Resampler resampler; + @OriginalMember(owner = "client!t", name = "F", descriptor = "I") + public static int js5PrevErrors = 0; + @OriginalMember(owner = "client!ld", name = "k", descriptor = "Ljava/lang/String;") + public static String worldListHostname; + @OriginalMember(owner = "client!hi", name = "g", descriptor = "I") + public static int worldListAlternatePort; + @OriginalMember(owner = "client!em", name = "v", descriptor = "Ljava/lang/String;") + public static String hostname; + @OriginalMember(owner = "client!vc", name = "db", descriptor = "[S") + public static short[] aShortArray88; + @OriginalMember(owner = "client!f", name = "T", descriptor = "[S") + public static short[] aShortArray19 = new short[256]; + @OriginalMember(owner = "client!sm", name = "l", descriptor = "[S") + public static short[] aShortArray74 = new short[256]; + @OriginalMember(owner = "client!vc", name = "bb", descriptor = "[S") + public static short[] aShortArray87 = new short[256]; + @OriginalMember(owner = "client!cm", name = "f", descriptor = "Lsignlink!im;") + public static PrivilegedRequest js5SocketRequest; + @OriginalMember(owner = "client!qk", name = "g", descriptor = "Lclient!ma;") + public static BufferedSocket js5Socket; + @OriginalMember(owner = "client!ac", name = "c", descriptor = "I") + public static int js5ConnectState = 0; + @OriginalMember(owner = "client!rj", name = "Y", descriptor = "J") + public static long js5ConnectTime; + @OriginalMember(owner = "client!nm", name = "Y", descriptor = "J") + public static long firstGc = 0L; + @OriginalMember(owner = "client!mj", name = "A", descriptor = "J") + public static long prevGc = 0L; @OriginalMember(owner = "client!client", name = "main", descriptor = "([Ljava/lang/String;)V") public static void main(@OriginalArg(0) String[] arg0) { @@ -134,6 +248,197 @@ public final class client extends GameShell { System.exit(1); } + @OriginalMember(owner = "client!re", name = "a", descriptor = "(I)V") + public static void clean() { + FloTypeList.clean(); + FluTypeList.clean(); + IdkTypeList.clean(); + LocTypeList.clean(); + NpcTypeList.clean(); + ObjTypeList.clean(); + SeqTypeList.clean(); + SpotAnimTypeList.clean(); + VarbitTypeList.clean(); + VarpTypeList.clean(); + BasTypeList.clean(); + MsiTypeList.clean(); + LightTypeList.clean(); + CursorTypeList.clean(); + PlayerAppearance.clean(); + Component.clean(); + HintArrowManager.clean(); + ShadowModelList.clean(); + HitBarList.hitBars.clean(5); + FontMetricsList.fontMetrics.clean(5); + } + + @OriginalMember(owner = "client!pl", name = "a", descriptor = "(II)V") + public static void setGameState(@OriginalArg(0) int arg0) { + if (gameState == arg0) { + return; + } + if (gameState == 0) { + LoadingBarAwt.clear(); + } + if (arg0 == 40) { + LoginManager.clear(); + } + @Pc(37) boolean local37 = arg0 == 5 || arg0 == 10 || arg0 == 28; + if (arg0 != 40 && Static233.aClass95_4 != null) { + Static233.aClass95_4.close(); + Static233.aClass95_4 = null; + } + if (arg0 == 25 || arg0 == 28) { + Static271.anInt5804 = 0; + Static230.anInt5150 = 1; + Static233.loadingScreenState = 0; + Static38.anInt1196 = 1; + Static175.mapFilesMissingCount = 0; + WorldMap.clear(true); + } + if (arg0 == 25 || arg0 == 10) { + Static123.topBannerRefresh(); + } + if (arg0 == 5) { + TitleScreen.load(js5Archive8); + } else { + TitleScreen.clear(); + } + @Pc(106) boolean local106 = gameState == 5 || gameState == 10 || gameState == 28; + if (local106 != local37) { + if (local37) { + MusicPlayer.groupId = MusicPlayer.titleSong; + if (Preferences.musicVolume == 0) { + MidiPlayer.method801(); + } else { + MidiPlayer.playFadeOut(MusicPlayer.titleSong, js5Archive6, 255); + } + js5NetQueue.writeLoggedIn(false); + } else { + MidiPlayer.method801(); + js5NetQueue.writeLoggedIn(true); + } + } + if (GlRenderer.enabled && (arg0 == 25 || arg0 == 28 || arg0 == 40)) { + GlRenderer.method4160(); + } + gameState = arg0; + } + + @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 (cacheData != null) { + local7 = new Cache(arg3, cacheData, cacheIndexes[arg3], 1000000); + } + js5Providers[arg3] = js5MasterIndex.getResourceProvider(arg3, masterCache, local7); + if (arg1) { + js5Providers[arg3].prefetchAll(); + } + return new Js5(js5Providers[arg3], arg0, arg2); + } + + @OriginalMember(owner = "client!je", name = "h", descriptor = "(I)V") + public static void method2380() { + FloTypeList.method4301(); + FluTypeList.method3885(); + IdkTypeList.method3342(); + LocTypeList.method3323(); + NpcTypeList.method4001(); + ObjTypeList.method2239(); + SeqTypeList.method3903(); + SpotAnimTypeList.method1441(); + VarbitTypeList.method1694(); + VarpTypeList.method4657(); + BasTypeList.method1172(); + MsiTypeList.method4529(); + LightTypeList.method1882(); + CursorTypeList.method741(); + Static192.method3474(); + Static40.method1019(); + HintArrowManager.method3329(); + ShadowModelList.method4276(); + HitBarList.hitBars.method3103(); + FontMetricsList.fontMetrics.method3103(); + } + + @OriginalMember(owner = "client!rj", name = "f", descriptor = "(B)V") + public static void method3768() { + FloTypeList.method4612(); + FluTypeList.method1308(); + IdkTypeList.method3999(); + LocTypeList.clear(); + NpcTypeList.method3673(); + ObjTypeList.method3302(); + SeqTypeList.method350(); + SpotAnimTypeList.method4249(); + VarbitTypeList.method1295(); + VarpTypeList.method4266(); + BasTypeList.method2433(); + MsiTypeList.method3653(); + LightTypeList.method1695(); + CursorTypeList.method351(); + Static230.method3947(); + Static147.method2764(); + if (modeWhat != 0) { + for (@Pc(54) int local54 = 0; local54 < Static51.aByteArrayArray8.length; local54++) { + Static51.aByteArrayArray8[local54] = null; + } + Static105.anInt2863 = 0; + } + HintArrowManager.clear(); + ShadowModelList.method1857(); + FontMetricsList.fontMetrics.clear(); + if (!GlRenderer.enabled) { + ((Js5GlTextureProvider) Rasteriser.textureProvider).clear(); + } + Static105.aClass54_9.clear(); + js5Archive0.method4499(); + js5Archive1.method4499(); + js5Archive3.method4499(); + js5Archive4.method4499(); + js5Archive5.method4499(); + js5Archive6.method4499(); + js5Archive7.method4499(); + js5Archive8.method4499(); + js5Archive10.method4499(); + js5Archive11.method4499(); + js5Archive12.method4499(); + HitBarList.hitBars.clear(); + } + + @OriginalMember(owner = "client!id", name = "b", descriptor = "(I)V") + public static void audioLoop() { + if (soundChannel != null) { + soundChannel.loop(); + } + if (musicChannel != null) { + musicChannel.loop(); + } + } + + @OriginalMember(owner = "client!la", name = "a", descriptor = "(Lclient!wa;Z)V") + public static void writeUid(@OriginalArg(0) Buffer arg0) { + @Pc(15) byte[] local15 = new byte[24]; + if (uid != null) { + try { + uid.seek(0L); + uid.read(local15); + @Pc(28) int local28; + for (local28 = 0; local28 < 24 && local15[local28] == 0; local28++) { + } + if (local28 >= 24) { + throw new IOException(); + } + } catch (@Pc(55) Exception local55) { + for (@Pc(57) int local57 = 0; local57 < 24; local57++) { + local15[local57] = -1; + } + } + } + arg0.pBytes(local15, 24); + } + @OriginalMember(owner = "client!client", name = "f", descriptor = "(I)V") @Override protected final void mainRedraw() { @@ -187,7 +492,7 @@ public final class client extends GameShell { } } if (gameState == 0) { - LoadingBarAwt.render(null, local158, Static126.mainLoadSecondaryText, Static199.mainLoadPercentage); + LoadingBarAwt.render(null, local158, mainLoadSecondaryText, mainLoadPercentage); } else if (gameState == 5) { LoadingBar.render(false, Fonts.b12Full); } else if (gameState == 10) { @@ -245,7 +550,7 @@ public final class client extends GameShell { } } if (clean) { - Static213.clean(); + clean(); } if (Preferences.safeMode && gameState == 10 && InterfaceList.topLevelInterface != -1) { Preferences.safeMode = false; @@ -394,45 +699,45 @@ public final class client extends GameShell { } 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; + worldListHostname = GlobalConfig.DEFAULT_HOSTNAME; // this.getCodeBase().getHost(); + worldListAlternatePort = GlobalConfig.ALTERNATE_PORT + 1; + worldListDefaultPort = GlobalConfig.DEFAULT_PORT + 1; } else if (modeWhere == 1) { - Static143.worldListHostname = GlobalConfig.DEFAULT_HOSTNAME; // this.getCodeBase().getHost(); - Static97.worldListAlternatePort = GlobalConfig.ALTERNATE_PORT + worldListId; - Static249.worldListDefaultPort = GlobalConfig.DEFAULT_PORT + worldListId; + worldListHostname = GlobalConfig.DEFAULT_HOSTNAME; // this.getCodeBase().getHost(); + worldListAlternatePort = GlobalConfig.ALTERNATE_PORT + worldListId; + worldListDefaultPort = GlobalConfig.DEFAULT_PORT + worldListId; } else if (modeWhere == 2) { - Static143.worldListHostname = GlobalConfig.DEFAULT_HOSTNAME; // "127.0.0.1"; - Static97.worldListAlternatePort = GlobalConfig.ALTERNATE_PORT + worldListId; - Static249.worldListDefaultPort = GlobalConfig.DEFAULT_PORT + worldListId; + worldListHostname = GlobalConfig.DEFAULT_HOSTNAME; // "127.0.0.1"; + worldListAlternatePort = GlobalConfig.ALTERNATE_PORT + worldListId; + worldListDefaultPort = GlobalConfig.DEFAULT_PORT + worldListId; } 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 = PlayerAppearance.aShortArray5; + PlayerAppearance.aShortArrayArray2 = PlayerAppearance.aShortArrayArray4; + PlayerAppearance.aShortArrayArray7 = PlayerAppearance.aShortArrayArray1; + PlayerAppearance.aShortArray65 = PlayerAppearance.aShortArray1; + PlayerAppearance.aShortArray41 = PlayerAppearance.aShortArray5; } else { - Static33.aShortArrayArray2 = Static154.aShortArrayArray6; - Static160.aShortArray41 = Static195.aShortArray64; - Static172.aShortArrayArray7 = SubScript.aShortArrayArray5; - Static200.aShortArray65 = Static260.aShortArray71; + PlayerAppearance.aShortArrayArray2 = PlayerAppearance.aShortArrayArray6; + PlayerAppearance.aShortArray41 = PlayerAppearance.aShortArray64; + PlayerAppearance.aShortArrayArray7 = PlayerAppearance.aShortArrayArray5; + PlayerAppearance.aShortArray65 = PlayerAppearance.aShortArray71; } - Static55.alternatePort = Static97.worldListAlternatePort; - Static271.defaultPort = Static249.worldListDefaultPort; - Static60.hostname = Static143.worldListHostname; - Static208.worldListPort = Static249.worldListDefaultPort; - Static259.aShortArray88 = Static62.aShortArray19 = Static232.aShortArray74 = Static259.aShortArray87 = new short[256]; - Static209.port = Static208.worldListPort; + alternatePort = worldListAlternatePort; + defaultPort = worldListDefaultPort; + hostname = worldListHostname; + worldListPort = worldListDefaultPort; + aShortArray88 = aShortArray19 = aShortArray74 = aShortArray87 = new short[256]; + port = worldListPort; 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 - mouseWheel = Static44.create(); + Keyboard.init(); + Keyboard.start(GameShell.canvas); + Mouse.start(GameShell.canvas); + mouseWheel = MouseWheel.create(); if (mouseWheel != null) { mouseWheel.start(GameShell.canvas); } @@ -444,7 +749,7 @@ public final class client extends GameShell { cacheIndexes[i] = new BufferedFile(GameShell.signLink.cacheIndexes[i], 6000, 0); } cacheMasterIndex = new BufferedFile(GameShell.signLink.cacheMasterIndex, 6000, 0); - Static148.masterCache = new Cache(255, cacheData, cacheMasterIndex, 500000); + masterCache = new Cache(255, cacheData, cacheMasterIndex, 500000); uid = new BufferedFile(GameShell.signLink.uid, 24, 0); GameShell.signLink.cacheIndexes = null; GameShell.signLink.cacheMasterIndex = null; @@ -455,7 +760,7 @@ public final class client extends GameShell { uid = null; cacheData = null; cacheMasterIndex = null; - Static148.masterCache = null; + masterCache = null; } Static278.mainLoadPrimaryText = LocalizedText.GAME0_LOADING; if (modeWhere != 0) { @@ -471,25 +776,26 @@ public final class client extends GameShell { @OriginalMember(owner = "client!client", name = "a", descriptor = "(ZI)V") private void setJs5Response(@OriginalArg(1) int arg0) { js5NetQueue.errors++; - Static37.js5SocketRequest = null; + js5SocketRequest = null; js5NetQueue.response = arg0; - Static206.js5Socket = null; - Static4.js5ConnectState = 0; + js5Socket = null; + js5ConnectState = 0; } @OriginalMember(owner = "client!client", name = "d", descriptor = "(B)V") - private void method943() { - for (Static182.keyQueueSize = 0; Keyboard.nextKey() && Static182.keyQueueSize < 128; Static182.keyQueueSize++) { - Static227.keyCodes[Static182.keyQueueSize] = Keyboard.keyCode; - Static205.keyChars[Static182.keyQueueSize] = Keyboard.keyChar; + private void mainUpdate() { + for (InterfaceList.keyQueueSize = 0; Keyboard.nextKey() && InterfaceList.keyQueueSize < 128; InterfaceList.keyQueueSize++) { + InterfaceList.keyCodes[InterfaceList.keyQueueSize] = Keyboard.keyCode; + InterfaceList.keyChars[InterfaceList.keyQueueSize] = Keyboard.keyChar; } Static178.anInt4247++; if (InterfaceList.topLevelInterface != -1) { Static57.method1320(0, 0, 0, GameShell.canvasWidth, InterfaceList.topLevelInterface, 0, GameShell.canvasHeight); } - Static119.transmitTimer++; + InterfaceList.transmitTimer++; if (GlRenderer.enabled) { - label191: for (@Pc(57) int local57 = 0; local57 < 32768; local57++) { + nextNpc: + for (@Pc(57) int local57 = 0; local57 < 32768; local57++) { @Pc(66) Npc local66 = Static175.npcs[local57]; if (local66 != null) { @Pc(73) byte local73 = local66.type.aByte10; @@ -500,13 +806,13 @@ public final class client extends GameShell { local66.movementQueueSpeed[0] = 1; local66.movementQueueX[0] = local98 + (local66.xFine >> 7); local66.movementQueueZ[0] = local106 + (local66.zFine >> 7); - Static148.collisionMaps[Static55.level].unflagScenery(local66.xFine >> 7, local66.getSize(), false, 0, local66.getSize(), local66.zFine >> 7); - if (local66.movementQueueX[0] >= 0 && local66.movementQueueX[0] <= 104 - local66.getSize() && local66.movementQueueZ[0] >= 0 && local66.movementQueueZ[0] <= 104 - local66.getSize() && Static148.collisionMaps[Static55.level].method3054(local66.zFine >> 7, local66.movementQueueZ[0], local66.movementQueueX[0], local66.xFine >> 7)) { + PathFinder.collisionMaps[Static55.level].unflagScenery(local66.xFine >> 7, local66.getSize(), false, 0, local66.getSize(), local66.zFine >> 7); + if (local66.movementQueueX[0] >= 0 && local66.movementQueueX[0] <= 104 - local66.getSize() && local66.movementQueueZ[0] >= 0 && local66.movementQueueZ[0] <= 104 - local66.getSize() && PathFinder.collisionMaps[Static55.level].method3054(local66.zFine >> 7, local66.movementQueueZ[0], local66.movementQueueX[0], local66.xFine >> 7)) { if (local66.getSize() > 1) { for (@Pc(226) int local226 = local66.movementQueueX[0]; local66.movementQueueX[0] + local66.getSize() > local226; local226++) { for (@Pc(246) int local246 = local66.movementQueueZ[0]; local66.movementQueueZ[0] + local66.getSize() > local246; local246++) { - if ((Static148.collisionMaps[Static55.level].anIntArrayArray30[local226][local246] & 0x12401FF) != 0) { - continue label191; + if ((PathFinder.collisionMaps[Static55.level].anIntArrayArray30[local226][local246] & 0x12401FF) != 0) { + continue nextNpc; } } } @@ -518,13 +824,13 @@ public final class client extends GameShell { Static104.method2247(local66); Static37.method949(local66); Static34.method879(local66); - Static148.collisionMaps[Static55.level].flagScenery(local66.xFine >> 7, false, local66.zFine >> 7, local66.getSize(), local66.getSize()); + PathFinder.collisionMaps[Static55.level].flagScenery(local66.xFine >> 7, false, local66.zFine >> 7, local66.getSize(), local66.getSize()); } } } if (!GlRenderer.enabled) { - Static269.updateFlames(); - } else if (Static184.loginStep == 0 && Static179.accountCreationStep == 0) { + Flames.update(); + } else if (LoginManager.step == 0 && CreateManager.step == 0) { if (Static227.cameraType == 2) { Static125.updateLockedCamera(); } else { @@ -569,7 +875,7 @@ public final class client extends GameShell { if (prioritySource.createdComponentId < 0) { break; } - priorityComponent = Static5.getComponent(prioritySource.layer); + priorityComponent = InterfaceList.getComponent(prioritySource.layer); } while (priorityComponent == null || priorityComponent.createdComponents == null || priorityComponent.createdComponents.length <= prioritySource.createdComponentId || prioritySource != priorityComponent.createdComponents[prioritySource.createdComponentId]); Static82.method1767(priorityRequest); } @@ -578,7 +884,7 @@ public final class client extends GameShell { if (prioritySource.createdComponentId < 0) { break; } - priorityComponent = Static5.getComponent(prioritySource.layer); + priorityComponent = InterfaceList.getComponent(prioritySource.layer); } while (priorityComponent == null || priorityComponent.createdComponents == null || prioritySource.createdComponentId >= priorityComponent.createdComponents.length || prioritySource != priorityComponent.createdComponents[prioritySource.createdComponentId]); Static82.method1767(priorityRequest); } @@ -587,7 +893,7 @@ public final class client extends GameShell { if (prioritySource.createdComponentId < 0) { break; } - priorityComponent = Static5.getComponent(prioritySource.layer); + priorityComponent = InterfaceList.getComponent(prioritySource.layer); } while (priorityComponent == null || priorityComponent.createdComponents == null || priorityComponent.createdComponents.length <= prioritySource.createdComponentId || prioritySource != priorityComponent.createdComponents[prioritySource.createdComponentId]); Static82.method1767(priorityRequest); } @@ -603,15 +909,15 @@ public final class client extends GameShell { @OriginalMember(owner = "client!client", name = "h", descriptor = "(I)V") private void js5Connect() { - if (Static233.js5PrevErrors < js5NetQueue.errors) { - Static22.js5ConnectDelay = 5 * 50 * (js5NetQueue.errors - 1); - if (Static271.defaultPort == Static209.port) { - Static209.port = Static55.alternatePort; + if (js5PrevErrors < js5NetQueue.errors) { + js5ConnectDelay = 5 * 50 * (js5NetQueue.errors - 1); + if (defaultPort == port) { + port = alternatePort; } else { - Static209.port = Static271.defaultPort; + port = defaultPort; } - if (Static22.js5ConnectDelay > 3000) { - Static22.js5ConnectDelay = 3000; + if (js5ConnectDelay > 3000) { + js5ConnectDelay = 3000; } if (js5NetQueue.errors >= 2 && js5NetQueue.response == 6) { this.error("js5connect_outofdate"); @@ -635,53 +941,53 @@ public final class client extends GameShell { return; } } - Static233.js5PrevErrors = js5NetQueue.errors; - if (Static22.js5ConnectDelay > 0) { - Static22.js5ConnectDelay--; + js5PrevErrors = js5NetQueue.errors; + if (js5ConnectDelay > 0) { + js5ConnectDelay--; return; } try { - if (Static4.js5ConnectState == 0) { - Static37.js5SocketRequest = GameShell.signLink.openSocket(Static60.hostname, Static209.port); - Static4.js5ConnectState++; + if (js5ConnectState == 0) { + js5SocketRequest = GameShell.signLink.openSocket(hostname, port); + js5ConnectState++; } - if (Static4.js5ConnectState == 1) { - if (Static37.js5SocketRequest.status == 2) { + if (js5ConnectState == 1) { + if (js5SocketRequest.status == 2) { this.setJs5Response(1000); return; } - if (Static37.js5SocketRequest.status == 1) { - Static4.js5ConnectState++; + if (js5SocketRequest.status == 1) { + js5ConnectState++; } } - if (Static4.js5ConnectState == 2) { - Static206.js5Socket = new BufferedSocket((Socket) Static37.js5SocketRequest.result, GameShell.signLink); + if (js5ConnectState == 2) { + js5Socket = new BufferedSocket((Socket) js5SocketRequest.result, GameShell.signLink); @Pc(194) Buffer buffer = new Buffer(5); buffer.p1(15); buffer.p4(530); - Static206.js5Socket.write(buffer.data, 5); - Static4.js5ConnectState++; - Static217.js5ConnectTime = MonotonicClock.currentTimeMillis(); + js5Socket.write(buffer.data, 5); + js5ConnectState++; + js5ConnectTime = MonotonicClock.currentTimeMillis(); } - if (Static4.js5ConnectState == 3) { - if (gameState == 0 || gameState == 5 || Static206.js5Socket.available() > 0) { - @Pc(258) int response = Static206.js5Socket.read(); + if (js5ConnectState == 3) { + if (gameState == 0 || gameState == 5 || js5Socket.available() > 0) { + @Pc(258) int response = js5Socket.read(); if (response != 0) { this.setJs5Response(response); return; } - Static4.js5ConnectState++; - } else if (MonotonicClock.currentTimeMillis() - Static217.js5ConnectTime > 30000L) { + js5ConnectState++; + } else if (MonotonicClock.currentTimeMillis() - js5ConnectTime > 30000L) { this.setJs5Response(1001); return; } } - if (Static4.js5ConnectState == 4) { + if (js5ConnectState == 4) { @Pc(296) boolean loggedOut = gameState == 5 || gameState == 10 || gameState == 28; - js5NetQueue.loggedOut(!loggedOut, Static206.js5Socket); - Static206.js5Socket = null; - Static37.js5SocketRequest = null; - Static4.js5ConnectState = 0; + js5NetQueue.loggedOut(!loggedOut, js5Socket); + js5Socket = null; + js5SocketRequest = null; + js5ConnectState = 0; } } catch (@Pc(315) IOException ex) { this.setJs5Response(1002); @@ -702,205 +1008,205 @@ public final class client extends GameShell { } @Pc(43) int i; - if (Static166.mainLoadState == 0) { + if (mainLoadState == 0) { @Pc(34) Runtime runtime = Runtime.getRuntime(); i = (int) (0L / 1024L); @Pc(46) long now = MonotonicClock.currentTimeMillis(); - if (Static175.firstGc == 0L) { - Static175.firstGc = now; + if (firstGc == 0L) { + firstGc = now; } - if (i > 16384 && now - Static175.firstGc < 5000L) { - if (now - Static160.prevGc > 1000L) { + if (i > 16384 && now - firstGc < 5000L) { + if (now - prevGc > 1000L) { System.gc(); - Static160.prevGc = now; + prevGc = now; } - Static199.mainLoadPercentage = 5; - Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD0; + mainLoadPercentage = 5; + mainLoadSecondaryText = LocalizedText.MAINLOAD0; } else { - Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD0B; - Static166.mainLoadState = 10; - Static199.mainLoadPercentage = 5; + mainLoadSecondaryText = LocalizedText.MAINLOAD0B; + mainLoadState = 10; + mainLoadPercentage = 5; } return; } @Pc(98) int percentage; - if (Static166.mainLoadState == 10) { + if (mainLoadState == 10) { Static120.method2392(); for (percentage = 0; percentage < 4; percentage++) { - Static148.collisionMaps[percentage] = new CollisionMap(104, 104); + PathFinder.collisionMaps[percentage] = new CollisionMap(104, 104); } - Static199.mainLoadPercentage = 10; - Static166.mainLoadState = 30; - Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD10B; - } else if (Static166.mainLoadState == 30) { - if (Static257.js5MasterIndex == null) { - Static257.js5MasterIndex = new Js5MasterIndex(js5NetQueue, js5CacheQueue); + mainLoadPercentage = 10; + mainLoadState = 30; + mainLoadSecondaryText = LocalizedText.MAINLOAD10B; + } else if (mainLoadState == 30) { + if (js5MasterIndex == null) { + js5MasterIndex = new Js5MasterIndex(js5NetQueue, js5CacheQueue); } - if (Static257.js5MasterIndex.method178()) { - Static213.js5Archive0 = Static9.createJs5(false, true, true, 0); - Static249.js5Archive1 = Static9.createJs5(false, true, true, 1); - Static274.js5Archive2 = Static9.createJs5(true, true, false, 2); - Static41.js5Archive3 = Static9.createJs5(false, true, true, 3); - Static248.js5Archive4 = Static9.createJs5(false, true, true, 4); - Static26.js5Archive5 = Static9.createJs5(true, true, true, 5); - Static130.js5Archive6 = Static9.createJs5(true, false, true, 6); - Static267.js5Archive7 = Static9.createJs5(false, true, true, 7); - Static209.js5Archive8 = Static9.createJs5(false, true, true, 8); - Static195.js5Archive9 = Static9.createJs5(false, true, true, 9); - Static184.js5Archive10 = Static9.createJs5(false, true, true, 10); - Static214.js5Archive11 = Static9.createJs5(false, true, true, 11); - Static16.js5Archive12 = Static9.createJs5(false, true, true, 12); - Static261.js5Archive13 = Static9.createJs5(false, true, true, 13); - Static137.js5Archive14 = Static9.createJs5(false, false, true, 14); - Static138.js5Archive15 = Static9.createJs5(false, true, true, 15); - Static280.js5Archive16 = Static9.createJs5(false, true, true, 16); - Static138.js5Archive17 = Static9.createJs5(false, true, true, 17); - Static172.js5Archive18 = Static9.createJs5(false, true, true, 18); - Static171.js5Archive19 = Static9.createJs5(false, true, true, 19); - Static253.js5Archive20 = Static9.createJs5(false, true, true, 20); - Static122.js5Archive21 = Static9.createJs5(false, true, true, 21); - Static156.js5Archive22 = Static9.createJs5(false, true, true, 22); - 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); - Static226.js5Archive27 = Static9.createJs5(false, true, true, 27); - Static199.mainLoadPercentage = 15; - Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD30B; - Static166.mainLoadState = 40; + if (js5MasterIndex.isReady()) { + js5Archive0 = createJs5(false, true, true, 0); + js5Archive1 = createJs5(false, true, true, 1); + js5Archive2 = createJs5(true, true, false, 2); + js5Archive3 = createJs5(false, true, true, 3); + js5Archive4 = createJs5(false, true, true, 4); + js5Archive5 = createJs5(true, true, true, 5); + js5Archive6 = createJs5(true, false, true, 6); + js5Archive7 = createJs5(false, true, true, 7); + js5Archive8 = createJs5(false, true, true, 8); + js5Archive9 = createJs5(false, true, true, 9); + js5Archive10 = createJs5(false, true, true, 10); + js5Archive11 = createJs5(false, true, true, 11); + js5Archive12 = createJs5(false, true, true, 12); + js5Archive13 = createJs5(false, true, true, 13); + js5Archive14 = createJs5(false, false, true, 14); + js5Archive15 = createJs5(false, true, true, 15); + js5Archive16 = createJs5(false, true, true, 16); + js5Archive17 = createJs5(false, true, true, 17); + js5Archive18 = createJs5(false, true, true, 18); + js5Archive19 = createJs5(false, true, true, 19); + js5Archive20 = createJs5(false, true, true, 20); + js5Archive21 = createJs5(false, true, true, 21); + js5Archive22 = createJs5(false, true, true, 22); + js5Archive23 = createJs5(true, true, true, 23); + js5Archive24 = createJs5(false, true, true, 24); + js5Archive25 = createJs5(false, true, true, 25); + js5Archive26 = createJs5(true, true, true, 26); + js5Archive27 = createJs5(false, true, true, 27); + mainLoadPercentage = 15; + mainLoadSecondaryText = LocalizedText.MAINLOAD30B; + mainLoadState = 40; } else { - Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD30; - Static199.mainLoadPercentage = 12; + mainLoadSecondaryText = LocalizedText.MAINLOAD30; + mainLoadPercentage = 12; } - } else if (Static166.mainLoadState == 40) { + } else if (mainLoadState == 40) { percentage = 0; for (i = 0; i < 28; i++) { - percentage += Static269.js5Providers[i].getIndexPercentageComplete() * Static170.JS5_ARCHIVE_WEIGHTS[i] / 100; + percentage += js5Providers[i].getIndexPercentageComplete() * Static170.JS5_ARCHIVE_WEIGHTS[i] / 100; } if (percentage == 100) { - Static199.mainLoadPercentage = 20; - Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD40B; - Sprites.init(Static209.js5Archive8); - Static167.init(Static209.js5Archive8); - Static81.init(Static209.js5Archive8); - Static166.mainLoadState = 45; + mainLoadPercentage = 20; + mainLoadSecondaryText = LocalizedText.MAINLOAD40B; + Sprites.init(js5Archive8); + TitleScreen.init(js5Archive8); + Flames.init(js5Archive8); + mainLoadState = 45; } else { if (percentage != 0) { - Static126.mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.CHECKING_FOR_UPDATES, Static123.parseInt(percentage), Static49.PERCENT_SIGN}); + mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.CHECKING_FOR_UPDATES, Static123.parseInt(percentage), Static49.PERCENT_SIGN}); } - Static199.mainLoadPercentage = 20; + mainLoadPercentage = 20; } - } else if (Static166.mainLoadState == 45) { + } else if (mainLoadState == 45) { AudioChannel.init(Preferences.stereo); - Static148.musicStream = new MidiPcmStream(); - Static148.musicStream.init(); + musicStream = new MidiPcmStream(); + musicStream.init(); musicChannel = AudioChannel.create(22050, GameShell.signLink, GameShell.canvas, 0); - musicChannel.setStream(Static148.musicStream); - Static34.init(Static148.musicStream, Static138.js5Archive15, Static137.js5Archive14, Static248.js5Archive4); + musicChannel.setStream(musicStream); + MidiPlayer.init(musicStream, js5Archive15, js5Archive14, js5Archive4); soundChannel = AudioChannel.create(2048, GameShell.signLink, GameShell.canvas, 1); - Static204.soundStream = new MixerPcmStream(); - 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 = Fonts.getReady(Static209.js5Archive8, Static261.js5Archive13); - i = Static143.getTotal(); + soundStream = new MixerPcmStream(); + soundChannel.setStream(soundStream); + resampler = new Resampler(22050, Static44.sampleRate); + MusicPlayer.titleSong = js5Archive6.getGroupId(Static1.TITLE_SONG); + mainLoadPercentage = 30; + mainLoadState = 50; + mainLoadSecondaryText = LocalizedText.MAINLOAD45B; + } else if (mainLoadState == 50) { + percentage = Fonts.getReady(js5Archive8, js5Archive13); + i = Fonts.getTotal(); if (percentage >= i) { - Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD50B; - Static199.mainLoadPercentage = 35; - Static166.mainLoadState = 60; + mainLoadSecondaryText = LocalizedText.MAINLOAD50B; + mainLoadPercentage = 35; + mainLoadState = 60; } else { - Static126.mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD50, Static123.parseInt(percentage * 100 / i), Static49.PERCENT_SIGN}); - Static199.mainLoadPercentage = 35; + mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD50, Static123.parseInt(percentage * 100 / i), Static49.PERCENT_SIGN}); + mainLoadPercentage = 35; } - } else if (Static166.mainLoadState == 60) { - percentage = Static150.getReady(Static209.js5Archive8); - i = Static104.getTotal(); + } else if (mainLoadState == 60) { + percentage = TitleScreen.getReady(js5Archive8); + i = TitleScreen.getTotal(); if (i <= percentage) { - Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD60B; - Static166.mainLoadState = 65; - Static199.mainLoadPercentage = 40; + mainLoadSecondaryText = LocalizedText.MAINLOAD60B; + mainLoadState = 65; + mainLoadPercentage = 40; } else { - Static126.mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD60, Static123.parseInt(percentage * 100 / i), Static49.PERCENT_SIGN}); - Static199.mainLoadPercentage = 40; + mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD60, Static123.parseInt(percentage * 100 / i), Static49.PERCENT_SIGN}); + mainLoadPercentage = 40; } - } else if (Static166.mainLoadState == 65) { - Static102.load(Static261.js5Archive13, Static209.js5Archive8); - Static199.mainLoadPercentage = 45; - Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD65B; - Static196.setGameState(5); - Static166.mainLoadState = 70; - } else if (Static166.mainLoadState == 70) { - Static274.js5Archive2.fetchAll(); - percentage = Static274.js5Archive2.getPercentageComplete(); - Static280.js5Archive16.fetchAll(); - percentage += Static280.js5Archive16.getPercentageComplete(); - Static138.js5Archive17.fetchAll(); - percentage += Static138.js5Archive17.getPercentageComplete(); - Static172.js5Archive18.fetchAll(); - percentage += Static172.js5Archive18.getPercentageComplete(); - Static171.js5Archive19.fetchAll(); - percentage += Static171.js5Archive19.getPercentageComplete(); - Static253.js5Archive20.fetchAll(); - percentage += Static253.js5Archive20.getPercentageComplete(); - Static122.js5Archive21.fetchAll(); - percentage += Static122.js5Archive21.getPercentageComplete(); - Static156.js5Archive22.fetchAll(); - percentage += Static156.js5Archive22.getPercentageComplete(); - Static254.js5Archive24.fetchAll(); - percentage += Static254.js5Archive24.getPercentageComplete(); - Static28.js5Archive25.fetchAll(); - percentage += Static28.js5Archive25.getPercentageComplete(); - Static226.js5Archive27.fetchAll(); - percentage += Static226.js5Archive27.getPercentageComplete(); + } else if (mainLoadState == 65) { + Fonts.load(js5Archive13, js5Archive8); + mainLoadPercentage = 45; + mainLoadSecondaryText = LocalizedText.MAINLOAD65B; + setGameState(5); + mainLoadState = 70; + } else if (mainLoadState == 70) { + js5Archive2.fetchAll(); + percentage = js5Archive2.getPercentageComplete(); + js5Archive16.fetchAll(); + percentage += js5Archive16.getPercentageComplete(); + js5Archive17.fetchAll(); + percentage += js5Archive17.getPercentageComplete(); + js5Archive18.fetchAll(); + percentage += js5Archive18.getPercentageComplete(); + js5Archive19.fetchAll(); + percentage += js5Archive19.getPercentageComplete(); + js5Archive20.fetchAll(); + percentage += js5Archive20.getPercentageComplete(); + js5Archive21.fetchAll(); + percentage += js5Archive21.getPercentageComplete(); + js5Archive22.fetchAll(); + percentage += js5Archive22.getPercentageComplete(); + js5Archive24.fetchAll(); + percentage += js5Archive24.getPercentageComplete(); + js5Archive25.fetchAll(); + percentage += js5Archive25.getPercentageComplete(); + js5Archive27.fetchAll(); + percentage += js5Archive27.getPercentageComplete(); if (percentage >= 1100) { - Static226.init(Static274.js5Archive2); - Static199.init(Static274.js5Archive2); - Static91.init(Static274.js5Archive2); - Static125.init(Static267.js5Archive7, Static274.js5Archive2); - Static181.init(Static280.js5Archive16, Static267.js5Archive7); - Static88.init(Static267.js5Archive7, Static172.js5Archive18); - Static241.init(Static171.js5Archive19, Static265.p11FullSoftware, Static267.js5Archive7); - Static58.init(Static274.js5Archive2); - Static141.init(Static249.js5Archive1, Static253.js5Archive20, Static213.js5Archive0); - Static79.init(Static274.js5Archive2); - Static266.init(Static267.js5Archive7, Static122.js5Archive21); - Static180.init(Static156.js5Archive22); - Static230.init(Static274.js5Archive2); - Static3.init(Static261.js5Archive13, Static209.js5Archive8, Static41.js5Archive3, Static267.js5Archive7); - Static119.init(Static274.js5Archive2); - Static85.init(Static138.js5Archive17); - Static59.init(Static28.js5Archive25, Static254.js5Archive24, new Js5QuickChatCommandDecoder()); - Static115.init(Static28.js5Archive25, Static254.js5Archive24); - Static107.init(Static274.js5Archive2); - Static246.init(Static274.js5Archive2, Static209.js5Archive8); - Static180.init(Static274.js5Archive2, Static209.js5Archive8); - Static199.mainLoadPercentage = 50; - Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD70B; - Static58.init(); - Static166.mainLoadState = 80; + ParamTypeList.init(js5Archive2); + FloTypeList.init(js5Archive2); + FluTypeList.init(js5Archive2); + IdkTypeList.init(js5Archive7, js5Archive2); + LocTypeList.init(js5Archive16, js5Archive7); + NpcTypeList.init(js5Archive7, js5Archive18); + ObjTypeList.init(js5Archive19, Fonts.p11FullSoftware, js5Archive7); + StructTypeList.init(js5Archive2); + SeqTypeList.init(js5Archive1, js5Archive20, js5Archive0); + BasTypeList.init(js5Archive2); + SpotAnimTypeList.init(js5Archive7, js5Archive21); + VarbitTypeList.init(js5Archive22); + VarpTypeList.init(js5Archive2); + InterfaceList.init(js5Archive13, js5Archive8, js5Archive3, js5Archive7); + InvTypeList.init(js5Archive2); + EnumTypeList.init(js5Archive17); + QuickChatPhraseTypeList.init(js5Archive25, js5Archive24, new Js5QuickChatCommandDecoder()); + QuickChatCatTypeList.init(js5Archive25, js5Archive24); + LightTypeList.init(js5Archive2); + CursorTypeList.init(js5Archive2, js5Archive8); + MsiTypeList.init(js5Archive2, js5Archive8); + mainLoadPercentage = 50; + mainLoadSecondaryText = LocalizedText.MAINLOAD70B; + Equipment.init(); + mainLoadState = 80; } else { - Static126.mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD70, Static123.parseInt(percentage / 11), Static49.PERCENT_SIGN}); - Static199.mainLoadPercentage = 50; + mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD70, Static123.parseInt(percentage / 11), Static49.PERCENT_SIGN}); + mainLoadPercentage = 50; } - } else if (Static166.mainLoadState == 80) { - percentage = Sprites.getReady(Static209.js5Archive8); - i = Static62.total(); + } else if (mainLoadState == 80) { + percentage = Sprites.getReady(js5Archive8); + i = Sprites.total(); if (i > percentage) { - Static126.mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD80, Static123.parseInt(percentage * 100 / i), Static49.PERCENT_SIGN}); - Static199.mainLoadPercentage = 60; + mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD80, Static123.parseInt(percentage * 100 / i), Static49.PERCENT_SIGN}); + mainLoadPercentage = 60; } else { - Sprites.load(Static209.js5Archive8); - Static166.mainLoadState = 90; - Static199.mainLoadPercentage = 60; - Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD80B; + Sprites.load(js5Archive8); + mainLoadState = 90; + mainLoadPercentage = 60; + 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, !Preferences.highDetailTextures); + } else if (mainLoadState == 90) { + if (js5Archive26.fetchAll()) { + @Pc(951) Js5GlTextureProvider textureProvider = new Js5GlTextureProvider(js5Archive9, js5Archive26, js5Archive8, 20, !Preferences.highDetailTextures); Rasteriser.unpackTextures(textureProvider); if (Preferences.brightness == 1) { Rasteriser.setBrightness(0.9F); @@ -914,82 +1220,82 @@ public final class client extends GameShell { if (Preferences.brightness == 4) { Rasteriser.setBrightness(0.6F); } - Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD90B; - Static166.mainLoadState = 100; - Static199.mainLoadPercentage = 70; + mainLoadSecondaryText = LocalizedText.MAINLOAD90B; + mainLoadState = 100; + mainLoadPercentage = 70; } else { - Static126.mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD90, Static123.parseInt(Static167.js5Archive26.getPercentageComplete()), Static49.PERCENT_SIGN}); - Static199.mainLoadPercentage = 70; + mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD90, Static123.parseInt(js5Archive26.getPercentageComplete()), Static49.PERCENT_SIGN}); + mainLoadPercentage = 70; } - } else if (Static166.mainLoadState == 100) { - if (Static231.isReady(Static209.js5Archive8)) { - Static166.mainLoadState = 110; + } else if (mainLoadState == 100) { + if (Flames.isReady(js5Archive8)) { + mainLoadState = 110; } - } else if (Static166.mainLoadState == 110) { + } else if (mainLoadState == 110) { 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(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; + mainLoadSecondaryText = LocalizedText.MAINLOAD110B; + mainLoadPercentage = 75; + mainLoadState = 120; + } else if (mainLoadState == 120) { + if (js5Archive10.isFileReady(JagString.EMPTY, Static252.HUFFMAN_GROUP)) { + @Pc(1060) HuffmanCodec codec = new HuffmanCodec(js5Archive10.fetchFile(JagString.EMPTY, Static252.HUFFMAN_GROUP)); + WordPack.init(codec); + mainLoadSecondaryText = LocalizedText.MAINLOAD120B; + mainLoadState = 130; + mainLoadPercentage = 80; } else { - Static126.mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD120, Static206.aClass100_899 }); - Static199.mainLoadPercentage = 80; + mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD120, Static206.aClass100_899 }); + mainLoadPercentage = 80; } - } else if (Static166.mainLoadState == 130) { - if (!Static41.js5Archive3.fetchAll()) { - 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 = 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 = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, Static123.parseInt(Static261.js5Archive13.getPercentageComplete() / 20 + 85), Static49.PERCENT_SIGN}); - Static199.mainLoadPercentage = 85; + } else if (mainLoadState == 130) { + if (!js5Archive3.fetchAll()) { + mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, Static123.parseInt(js5Archive3.getPercentageComplete() * 3 / 4), Static49.PERCENT_SIGN}); + mainLoadPercentage = 85; + } else if (!js5Archive12.fetchAll()) { + mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, Static123.parseInt(js5Archive12.getPercentageComplete() / 10 + 75), Static49.PERCENT_SIGN}); + mainLoadPercentage = 85; + } else if (!js5Archive13.fetchAll()) { + mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, Static123.parseInt(js5Archive13.getPercentageComplete() / 20 + 85), Static49.PERCENT_SIGN}); + mainLoadPercentage = 85; } else if (js5Archive23.allFilesComplete(Static165.DETAILS)) { - Static234.method4018(Sprites.mapfunctions, js5Archive23); - Static199.mainLoadPercentage = 95; - Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD130B; - Static166.mainLoadState = 135; + MapList.init(Sprites.mapfunctions, js5Archive23); + mainLoadPercentage = 95; + mainLoadSecondaryText = LocalizedText.MAINLOAD130B; + mainLoadState = 135; } else { - Static126.mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, Static123.parseInt(js5Archive23.getPercentageComplete(Static165.DETAILS) / 10 + 90), Static49.PERCENT_SIGN}); - Static199.mainLoadPercentage = 85; + mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, Static123.parseInt(js5Archive23.getPercentageComplete(Static165.DETAILS) / 10 + 90), Static49.PERCENT_SIGN}); + mainLoadPercentage = 85; } - } else if (Static166.mainLoadState == 135) { - percentage = Static207.fetch(); + } else if (mainLoadState == 135) { + percentage = WorldList.fetch(); if (percentage == -1) { - Static199.mainLoadPercentage = 95; - Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD135; + mainLoadPercentage = 95; + mainLoadSecondaryText = LocalizedText.MAINLOAD135; } else if (percentage == 7 || percentage == 9) { this.error("worldlistfull"); - Static196.setGameState(1000); - } else if (Static61.aBoolean109) { - Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD135B; - Static166.mainLoadState = 140; - Static199.mainLoadPercentage = 96; + setGameState(1000); + } else if (WorldList.loaded) { + mainLoadSecondaryText = LocalizedText.MAINLOAD135B; + mainLoadState = 140; + mainLoadPercentage = 96; } else { this.error("worldlistio_" + percentage); - Static196.setGameState(1000); + setGameState(1000); } - } else if (Static166.mainLoadState == 140) { - Static156.loginScreenId = Static41.js5Archive3.getGroupId(Static138.LOGINSCREEN); - Static26.js5Archive5.discardNames(false); - Static130.js5Archive6.discardNames(true); - Static209.js5Archive8.discardNames(true); - Static261.js5Archive13.discardNames(true); - Static184.js5Archive10.discardNames(true); - Static41.js5Archive3.discardNames(true); - Static199.mainLoadPercentage = 97; - Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD140; - Static166.mainLoadState = 150; + } else if (mainLoadState == 140) { + Static156.loginScreenId = js5Archive3.getGroupId(Static138.LOGINSCREEN); + js5Archive5.discardNames(false); + js5Archive6.discardNames(true); + js5Archive8.discardNames(true); + js5Archive13.discardNames(true); + js5Archive10.discardNames(true); + js5Archive3.discardNames(true); + mainLoadPercentage = 97; + mainLoadSecondaryText = LocalizedText.MAINLOAD140; + mainLoadState = 150; clean = true; - } else if (Static166.mainLoadState == 150) { + } else if (mainLoadState == 150) { Static151.method2807(); if (Preferences.safeMode) { Preferences.windowMode = 0; @@ -1000,10 +1306,10 @@ public final class client extends GameShell { Preferences.safeMode = true; Preferences.write(GameShell.signLink); Static241.setWindowMode(false, Preferences.favoriteWorlds, -1, -1); - Static199.mainLoadPercentage = 100; - Static166.mainLoadState = 160; - Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD150B; - } else if (Static166.mainLoadState == 160) { + mainLoadPercentage = 100; + mainLoadState = 160; + mainLoadSecondaryText = LocalizedText.MAINLOAD150B; + } else if (mainLoadState == 160) { Static73.method1596(true); } } @@ -1021,15 +1327,15 @@ public final class client extends GameShell { Static39.aRandom1.setSeed(Static60.gregorianDateSeed); } this.js5NetworkLoop(); - if (Static257.js5MasterIndex != null) { - Static257.js5MasterIndex.method179(); + if (js5MasterIndex != null) { + js5MasterIndex.method179(); } - Static230.loop(); - Static107.loop(); + MidiPlayer.loop(); + audioLoop(); Keyboard.loop(); - Static111.loop(); + Mouse.loop(); if (GlRenderer.enabled) { - Static63.process(); + GlCleaner.process(); } if (mouseWheel != null) { @Pc(75) int wheelRotation = mouseWheel.getRotation(); @@ -1045,18 +1351,18 @@ public final class client extends GameShell { Static78.rebuildMap(); } if (gameState == 10) { - this.method943(); - Static158.loop(); - Static31.loopAuto(); - Static216.loop(); + this.mainUpdate(); + CreateManager.loop(); + LoginManager.loopAuto(); + LoginManager.loop(); } else if (gameState == 30) { Static81.method1756(); } else if (gameState == 40) { - Static216.loop(); - if (Static266.reply != -3) { - if (Static266.reply == 15) { + LoginManager.loop(); + if (LoginManager.reply != -3) { + if (LoginManager.reply == 15) { Static44.method1146(); - } else if (Static266.reply != 2) { + } else if (LoginManager.reply != 2) { Static278.processLogout(); } }